Merge branch 'dev/jela/issue2999-2x' of https://github.com/nventive/S…

…kiaSharp into dev/jela/issue2999-2x
mono · Oct 23, 2024 · ffc0f32 · ffc0f32
2 parents c269f11 + eb12c1c
commit ffc0f32
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 37 deletions.
diff --git a/binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj b/binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj
diff --git 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
@@ -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/any/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/any/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/any/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/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
@@ -682,15 +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) {
-                    $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
@@ -706,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}}
+            dependsOn: package_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) {
+                    $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

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
@@ -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>