Merge branch 'main' into dev/jela/winui-xamlroot

mono · Jun 3, 2024 · 29d46f6 · 29d46f6
2 parents 52fcab5 + 258a6f6
commit 29d46f6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/externals/skia b/externals/skia
diff --git 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
@@ -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<string, string> 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
@@ -151,7 +151,7 @@ internal partial class VersionConstants {
 	<Target Name="_RemoveObsoleteItemsFromReferenceAssembly"
           AfterTargets="CoreCompile"
           Condition="'$(ProduceReferenceAssembly)' == 'true'">
-		<RemoveObsoleteSymbols Assembly="@(IntermediateRefAssembly)" />
+		<RemoveObsoleteSymbols Assembly="@(IntermediateRefAssembly)" Condition="Exists('@(IntermediateRefAssembly)')" />
 	</Target>
 
   <!--

diff --git a/source/SkiaSharp.NuGet.props b/source/SkiaSharp.NuGet.props
@@ -18,7 +18,7 @@
     <Authors>Microsoft</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
     <NoWarn>$(NoWarn);NU5125;NU5048</NoWarn>