From fa8b2132a6f6f75b294b304c45d3dc0e6f7479a7 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 22 Oct 2024 11:31:59 +0800
Subject: [PATCH 1/5] this

---
 .../SkiaSharp.NativeAssets.WinUI.csproj        | 16 ----------------
 binding/SkiaSharp/SkiaSharp.csproj             |  7 +++++++
 nuget/SkiaSharp.NativeAssets.WinUI.nuspec      | 18 +++++++++---------
 .../SkiaSharp.Views.WinUI.csproj               |  3 ---
 4 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj

diff --git a/binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj b/binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj
deleted file mode 100644
index d11bcaf59e..0000000000
--- a/binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>$(WindowsTargetFrameworks)</TargetFrameworks>
-    <PackagingGroup>SkiaSharp</PackagingGroup>
-    <Title>$(PackagingGroup) - Native Assets for Windows UI (WinUI 3)</Title>
-    <IsWindowsNativeAssets>true</IsWindowsNativeAssets>
-  </PropertyGroup>
-  <ItemGroup>
-    <NativeWindowsPackageFile Include="..\..\output\native\winui\any\*" RuntimeIdentifier="win-x64" />
-    <NativeWindowsPackageFile Include="..\..\output\native\winui\x64\*" RuntimeIdentifier="win-x64" />
-    <NativeWindowsPackageFile Include="..\..\output\native\winui\any\*" RuntimeIdentifier="win-x86" />
-    <NativeWindowsPackageFile Include="..\..\output\native\winui\x86\*" RuntimeIdentifier="win-x86" />
-    <NativeWindowsPackageFile Include="..\..\output\native\winui\any\*" RuntimeIdentifier="win-arm64" />
-    <NativeWindowsPackageFile Include="..\..\output\native\winui\arm64\*" RuntimeIdentifier="win-arm64" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/binding/SkiaSharp/SkiaSharp.csproj b/binding/SkiaSharp/SkiaSharp.csproj
index 96844c9563..d99b375403 100644
--- a/binding/SkiaSharp/SkiaSharp.csproj
+++ b/binding/SkiaSharp/SkiaSharp.csproj
@@ -17,6 +17,13 @@
     <None Include="..\..\output\native\windows\arm64\libSkiaSharp*" Link="nuget\runtimes\win-arm64\native\%(Filename)%(Extension)" />
     <!-- Windows: Nano Server -->
     <None Include="..\..\output\native\nanoserver\x64\libSkiaSharp*" Link="nuget\runtimes\nanoserver-x64\native\%(Filename)%(Extension)" />
+    <!-- Windows: WinUI -->
+    <None Include="..\..\output\native\winui\x86\SkiaSharp.Views.WinUI.Native*" Link="nuget\runtimes\winui-x86\native\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\winui\any\SkiaSharp.Views.WinUI.Native.Projection*" Link="nuget\runtimes\winui-x86\lib\net6.0-windows10.0.19041\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\winui\x64\SkiaSharp.Views.WinUI.Native*" Link="nuget\runtimes\winui-x64\native\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\winui\any\SkiaSharp.Views.WinUI.Native.Projection*" Link="nuget\runtimes\winui-x64\lib\net6.0-windows10.0.19041\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\winui\arm64\SkiaSharp.Views.WinUI.Native*" Link="nuget\runtimes\winui-arm64\native\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\winui\any\SkiaSharp.Views.WinUI.Native.Projection*" Link="nuget\runtimes\winui-arm64\lib\net6.0-windows10.0.19041\%(Filename)%(Extension)" />
     <!-- Linux -->
     <None Include="..\..\output\native\linux\x64\libSkiaSharp*" Link="nuget\runtimes\linux-x64\native\%(Filename)%(Extension)" />
     <None Include="..\..\output\native\linux\x86\libSkiaSharp*" Link="nuget\runtimes\linux-x86\native\%(Filename)%(Extension)" />
diff --git a/nuget/SkiaSharp.NativeAssets.WinUI.nuspec b/nuget/SkiaSharp.NativeAssets.WinUI.nuspec
index 64b57f6aab..7302252d91 100644
--- a/nuget/SkiaSharp.NativeAssets.WinUI.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.WinUI.nuspec
@@ -36,17 +36,17 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file src="runtimes/win-x64/lib/net6.0-windows10.0.19041/SkiaSharp.Views.WinUI.Native.Projection.dll" />
-    <file src="runtimes/win-x64/native/SkiaSharp.Views.WinUI.Native.dll" />
-    <file src="runtimes/win-x64/native/SkiaSharp.Views.WinUI.Native.winmd" />
+    <file src="runtimes/winui-x64/lib/net6.0-windows10.0.19041/SkiaSharp.Views.WinUI.Native.Projection.dll" />
+    <file src="runtimes/winui-x64/native/SkiaSharp.Views.WinUI.Native.dll" />
+    <file src="runtimes/winui-x64/native/SkiaSharp.Views.WinUI.Native.winmd" />
 
-    <file src="runtimes/win-x86/lib/net6.0-windows10.0.19041/SkiaSharp.Views.WinUI.Native.Projection.dll" />
-    <file src="runtimes/win-x86/native/SkiaSharp.Views.WinUI.Native.dll" />
-    <file src="runtimes/win-x86/native/SkiaSharp.Views.WinUI.Native.winmd" />
+    <file src="runtimes/winui-x86/lib/net6.0-windows10.0.19041/SkiaSharp.Views.WinUI.Native.Projection.dll" />
+    <file src="runtimes/winui-x86/native/SkiaSharp.Views.WinUI.Native.dll" />
+    <file src="runtimes/winui-x86/native/SkiaSharp.Views.WinUI.Native.winmd" />
 
-    <file src="runtimes/win-arm64/lib/net6.0-windows10.0.19041/SkiaSharp.Views.WinUI.Native.Projection.dll" />
-    <file src="runtimes/win-arm64/native/SkiaSharp.Views.WinUI.Native.dll" />
-    <file src="runtimes/win-arm64/native/SkiaSharp.Views.WinUI.Native.winmd" />
+    <file src="runtimes/winui-arm64/lib/net6.0-windows10.0.19041/SkiaSharp.Views.WinUI.Native.Projection.dll" />
+    <file src="runtimes/winui-arm64/native/SkiaSharp.Views.WinUI.Native.dll" />
+    <file src="runtimes/winui-arm64/native/SkiaSharp.Views.WinUI.Native.winmd" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net6.0-windows10.0.19041/_._" />
diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
index 70e05c64cf..e7b2392008 100644
--- a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
+++ b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
@@ -20,9 +20,6 @@
     <Compile Include="..\..\SkiaSharp.Views\SkiaSharp.Views.UWP\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" Exclude="..\..\SkiaSharp.Views\SkiaSharp.Views.UWP\bin\**;..\..\SkiaSharp.Views\SkiaSharp.Views.UWP\obj\**" />
     <Compile Remove="..\..\SkiaSharp.Views\SkiaSharp.Views.UWP\Interop\IBufferByteAccess.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
-    <ProjectReference Include="..\..\..\binding\SkiaSharp.NativeAssets.WinUI\SkiaSharp.NativeAssets.WinUI.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="..\..\..\output\native\winui\any\*.dll" />
   </ItemGroup>

From d1d0b2a5f171e28303b704ad111f9bcb4cd32c46 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 22 Oct 2024 17:19:45 +0800
Subject: [PATCH 2/5] get-volume

---
 scripts/azure-templates-stages.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
index 91ef5cf237..e67ede2dc2 100644
--- a/scripts/azure-templates-stages.yml
+++ b/scripts/azure-templates-stages.yml
@@ -685,6 +685,7 @@ stages:
               - pwsh: |
                   $nupkgs = (Get-ChildItem ".\output\nugets*\*.*nupkg")
                   foreach ($nupkg in $nupkgs) {
+                    get-volume
                     $filename = $nupkg.Name.TrimEnd('.nupkg')
                     $dest = ".\output\extracted_nugets\$filename"
                     Write-Host "Extracting '$nupkg' to '$dest'..."

From 1c31a1343ab0a193cf02baddb90608abc4e459f8 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 22 Oct 2024 18:37:10 +0800
Subject: [PATCH 3/5] a new job for extraction

---
 scripts/azure-templates-stages.yml | 39 ++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
index e67ede2dc2..2b483f57c6 100644
--- a/scripts/azure-templates-stages.yml
+++ b/scripts/azure-templates-stages.yml
@@ -682,16 +682,6 @@ stages:
               - pwsh: |
                   Move-Item -Path '$(Build.ArtifactStagingDirectory)\output\nugets-symbols\' -Destination '.\output\'
                 displayName: Prepare the nugets-symbols artifact for publishing
-              - pwsh: |
-                  $nupkgs = (Get-ChildItem ".\output\nugets*\*.*nupkg")
-                  foreach ($nupkg in $nupkgs) {
-                    get-volume
-                    $filename = $nupkg.Name.TrimEnd('.nupkg')
-                    $dest = ".\output\extracted_nugets\$filename"
-                    Write-Host "Extracting '$nupkg' to '$dest'..."
-                    Expand-Archive $nupkg $dest
-                  }
-                displayName: Extract all the .nupkg files for scanning
               - pwsh: |
                   Move-Item -Path '$(Build.ArtifactStagingDirectory)\output\nugets-special\' -Destination '.\output\'
                 displayName: Prepare the nugets-special artifact for publishing
@@ -707,6 +697,35 @@ stages:
                 path: '.\output\nugets-special'
               - name: nuget_symbols
                 path: '.\output\nugets-symbols'
+        - template: /scripts/azure-templates-bootstrapper.yml@self # Scan NuGets
+          parameters:
+            name: scanning_windows
+            displayName: Scan NuGets
+            sdl: ${{ parameters.sdl }}
+            buildPipelineType: ${{ parameters.buildPipelineType }}
+            vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+            skipInstall: true
+            skipSteps: true
+            shouldPublish: false
+            requiredArtifacts:
+              - name: nuget
+                dir: nugets
+              - name: nuget_special
+                dir: nugets-special
+              - name: nuget_symbols
+                dir: nugets-symbols
+            preBuildSteps:
+              - pwsh: |
+                  $nupkgs = (Get-ChildItem ".\output\nugets*\*.*nupkg")
+                  foreach ($nupkg in $nupkgs) {
+                    Get-Volume
+                    $filename = $nupkg.Name.TrimEnd('.nupkg')
+                    $dest = ".\output\extracted_nugets\$filename"
+                    Write-Host "Extracting '$nupkg' to '$dest'..."
+                    Expand-Archive $nupkg $dest
+                    Remove-Item $nupkg -Force -ErrorAction Continue
+                  }
+                displayName: Extract all the .nupkg files for scanning
 
   - ${{ if ne(parameters.buildPipelineType, 'build') }}:
     - stage: api_diff

From 99f2c0cc3ac52e00ba81400096a2dcede9e813ab Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 22 Oct 2024 19:30:00 +0800
Subject: [PATCH 4/5] deps

---
 scripts/azure-templates-stages.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
index 2b483f57c6..4e992587c9 100644
--- a/scripts/azure-templates-stages.yml
+++ b/scripts/azure-templates-stages.yml
@@ -704,6 +704,7 @@ stages:
             sdl: ${{ parameters.sdl }}
             buildPipelineType: ${{ parameters.buildPipelineType }}
             vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+            dependsOn: package_windows
             skipInstall: true
             skipSteps: true
             shouldPublish: false

From e0150a1617a01f9c598f5ea5ac732372209ffd02 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 22 Oct 2024 21:25:34 +0800
Subject: [PATCH 5/5] cleanup

---
 scripts/azure-templates-stages.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
index 4e992587c9..d479bb6267 100644
--- a/scripts/azure-templates-stages.yml
+++ b/scripts/azure-templates-stages.yml
@@ -719,7 +719,6 @@ stages:
               - pwsh: |
                   $nupkgs = (Get-ChildItem ".\output\nugets*\*.*nupkg")
                   foreach ($nupkg in $nupkgs) {
-                    Get-Volume
                     $filename = $nupkg.Name.TrimEnd('.nupkg')
                     $dest = ".\output\extracted_nugets\$filename"
                     Write-Host "Extracting '$nupkg' to '$dest'..."