diff --git a/externals/skia b/externals/skia index f1c2f7b424..ba482825f4 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit f1c2f7b4246141c6037820dc75d89496ac4aa8b3 +Subproject commit ba482825f49879898fffaecf412d36e4230b2266 diff --git a/native/winui/ANGLE.cake b/native/winui/ANGLE.cake index 5fe7e4285d..966902a6b3 100644 --- a/native/winui/ANGLE.cake +++ b/native/winui/ANGLE.cake @@ -49,17 +49,13 @@ void InitializeAngle(string branch, DirectoryPath ANGLE_PATH, DirectoryPath WINA RunPython(ANGLE_PATH, ANGLE_PATH.CombineWithFilePath("build/util/lastchange.py"), $"-o {lastchange}"); } - if (!FileExists(ANGLE_PATH.CombineWithFilePath("build/toolchain/win/rc/win/rc.exe"))) { - var oldPath = EnvironmentVariable("PATH"); - try { - System.Environment.SetEnvironmentVariable("PATH", DEPOT_PATH.FullPath + System.IO.Path.PathSeparator + oldPath); - - RunPython(ANGLE_PATH, - DEPOT_PATH.CombineWithFilePath("download_from_google_storage.py"), - $"--no_resume --no_auth --bucket chromium-browser-clang/rc -s build/toolchain/win/rc/win/rc.exe.sha1"); - } finally { - System.Environment.SetEnvironmentVariable("PATH", oldPath); - } + var rc_exe = "build/toolchain/win/rc/win/rc.exe"; + var rcPath = ANGLE_PATH.CombineWithFilePath(rc_exe); + if (!FileExists(rcPath)) { + var shaPath = ANGLE_PATH.CombineWithFilePath($"{rc_exe}.sha1"); + var sha = System.IO.File.ReadAllText(shaPath.FullPath); + var url = $"https://storage.googleapis.com/download/storage/v1/b/chromium-browser-clang/o/rc%2F{sha}?alt=media"; + DownloadFile(url, rcPath); } if (!FileExists(ANGLE_PATH.CombineWithFilePath("third_party/llvm-build/Release+Asserts/cr_build_revision"))) { diff --git a/scripts/cake/shared.cake b/scripts/cake/shared.cake index 8e0e84ac6b..315642431f 100644 --- a/scripts/cake/shared.cake +++ b/scripts/cake/shared.cake @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.Text.RegularExpressions; var TARGET = Argument("t", Argument("target", "Default")); -var VERBOSITY = Argument("v", Argument("verbosity", Verbosity.Normal)); +var VERBOSITY = Context.Log.Verbosity; var CONFIGURATION = Argument("c", Argument("configuration", "Release")); var VS_INSTALL = Argument("vsinstall", EnvironmentVariable("VS_INSTALL")); @@ -28,6 +28,7 @@ void RunCake(FilePath cake, string target = null, Dictionary arg var args = Arguments().ToDictionary(a => a.Key, a => a.Value.LastOrDefault()); args["target"] = target; + args["verbosity"] = VERBOSITY.ToString(); if (arguments != null) { foreach (var arg in arguments) { diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index 3f83ca44cf..db4bff6566 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -151,7 +151,7 @@ internal partial class VersionConstants { - +