From 1760351123d39e174e9f2b3faea9211a996cebec Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 20 May 2024 20:21:07 +0800
Subject: [PATCH 1/6] Only process assemblies that exist (#2864)

---
 source/SkiaSharp.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 {
 	<Target Name="_RemoveObsoleteItemsFromReferenceAssembly"
           AfterTargets="CoreCompile"
           Condition="'$(ProduceReferenceAssembly)' == 'true'">
-		<RemoveObsoleteSymbols Assembly="@(IntermediateRefAssembly)" />
+		<RemoveObsoleteSymbols Assembly="@(IntermediateRefAssembly)" Condition="Exists('@(IntermediateRefAssembly)')" />
 	</Target>
 
   <!--

From b6e477b383d663ed01821829dc359e3e8187c6e7 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 28 May 2024 21:35:53 +0200
Subject: [PATCH 2/6] Disable the unused and problematic tools (#2873)

* Disable the unused and problematic tools

The Go modules are all far out of date and some tooling is reporting the
repo as having security issues. We do not use any part of Go, EMSDK or
perfetto in the SkiaSharp project.

In an ideal world we don't have to make changes and there is a special
flag that exists for us to "disable all issues", but that does not exist
and trying to make that flag work only on CI is unnecessary. We can just
delete the few places that are having issues.
---
 externals/skia | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/skia b/externals/skia
index f1c2f7b424..bc5cc589b5 160000
--- a/externals/skia
+++ b/externals/skia
@@ -1 +1 @@
-Subproject commit f1c2f7b4246141c6037820dc75d89496ac4aa8b3
+Subproject commit bc5cc589b582ad2bdff8986de03db8302e7014a7

From 9ff20528f9d3e0019bfe477b5ca864edb7b7d2f6 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 30 May 2024 18:04:30 +0200
Subject: [PATCH 3/6] Remove usage of `gsutil` (#2875)

* Remove the usage of gsutil

The tool brings in dependencies which we don't want, so just use the URI
directly to get the file.

* verbosity pass through
---
 native/winui/ANGLE.cake  | 18 +++++++-----------
 scripts/cake/shared.cake |  3 ++-
 2 files changed, 9 insertions(+), 12 deletions(-)

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<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) {

From 48cefebe885b891001d76a10ba02659fed1e6308 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 31 May 2024 17:43:39 +0200
Subject: [PATCH 4/6] Remove some unused dependencies (#2876)

---
 externals/skia | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/skia b/externals/skia
index bc5cc589b5..212f8a8652 160000
--- a/externals/skia
+++ b/externals/skia
@@ -1 +1 @@
-Subproject commit bc5cc589b582ad2bdff8986de03db8302e7014a7
+Subproject commit 212f8a8652093d90be2eda154fd3bc189e888011

From 6c5db069eee909cf478dfac1e91e8713caddecc2 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 1 Jun 2024 07:08:13 +0200
Subject: [PATCH 5/6] Disable more unused tools (#2880)

---
 externals/skia | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/skia b/externals/skia
index 212f8a8652..ba482825f4 160000
--- a/externals/skia
+++ b/externals/skia
@@ -1 +1 @@
-Subproject commit 212f8a8652093d90be2eda154fd3bc189e888011
+Subproject commit ba482825f49879898fffaecf412d36e4230b2266

From 258a6f62bd4c5ecfb821f401a6bd8e087034de4c Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 3 Jun 2024 13:13:15 +0200
Subject: [PATCH 6/6] Use the new license expressions (#2878)

---
 source/SkiaSharp.NuGet.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/SkiaSharp.NuGet.props b/source/SkiaSharp.NuGet.props
index 9fe3a3f974..0ac8de2938 100644
--- 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>