Merged PR 11831004: Add a dotnet projection dll for Microsoft.UI.Xaml…

….dll This PR includes a new projection dll for Microsoft.UI.Xaml.dll - Microsoft.UI.Xaml.Projection.dll so that it can be used by .net 8+ apps. As part of this, we update to the latest version of Microsoft.Web.WebView2. We update the .nuspec to include this new dll and updated dependencies. Included in this PR are also a bunch of changes unrelated to this new dll, specifically changes to the build pipeline to get the release branch working again after a number of changes in the build system occurred: Changed ADO path for tsaoptions. Updates to the service connection used for signing. Dependencies feed moved to shine-oss AzDO instance. Update to how we publish symbols to symbol server. Some fixes in C++ code due to new warnings in latest msvc compiler Related work items: #49255260
microsoft · Nov 18, 2024 · f5ec16b · f5ec16b
1 parent 5e3ea2e
commit f5ec16b
Show file tree

Hide file tree

Showing 44 changed files with 587 additions and 500 deletions.
diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
@@ -1,7 +1,7 @@
 {
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "os",
-    "areaPath": "OS\\Windows Client and Services\\ADEPT\\OWL (Open Windows pLatform)\\Controls",
+    "areaPath": "OS\\Windows Client and Services\\ADEPT\\NEON\\WinUIX",
     "iterationPath": "OS",
     "notificationAliases": [ "[email protected]" ],
     "ignoreBranchName": true,

diff --git a/MUXControls.sln b/MUXControls.sln
diff --git a/build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml b/build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml
@@ -5,6 +5,12 @@ steps:
 
   - template: MUX-InstallDotNetSDK-Steps.yml
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET 8 SDK'
+    inputs:
+      packageType: sdk
+      version: '8.x'
+
   - template: MUX-InstallWindowsSDK-Steps.yml
 
   - template: MUX-InstallNuget-Steps.yml

diff --git a/build/AzurePipelinesTemplates/MUX-BuildProject-Steps.yml b/build/AzurePipelinesTemplates/MUX-BuildProject-Steps.yml
@@ -20,6 +20,11 @@ steps:
     inputs:
       filename: 'set'
 
+  - powershell: |
+      Get-Volume
+    displayName: 'Display disk space'
+    continueOnError: true
+
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
     displayName: 'NuGet restore ${{ parameters.solutionPath }}'
     inputs:

diff --git a/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml b/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml
@@ -13,9 +13,9 @@ parameters:
 jobs:
 - job: ${{ parameters.jobName }}
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
 
   steps:
@@ -93,13 +93,3 @@ jobs:
     inputs:
       PathtoPublish: '${{ parameters.nupkgdir }}'
       artifactName: 'drop'
-
-# To publish the package to vsts feed, set queue time variable NuGetFeed = d62f8eac-f05c-4c25-bccb-21f98b95c95f
-# This is the magic GUID from the pipeline visual designer for this feed: https://dev.azure.com/ms/microsoft-ui-xaml/_packaging?_a=feed&feed=MUX-CI
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    condition: and(ne(variables['NuGetFeed'], ''), ne(variables['Build.Reason'], 'Manual'))
-    displayName: 'NuGet push to $(NuGetFeed)'
-    inputs:
-      command: push
-      publishVstsFeed: $(NuGetFeed)
-      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
diff --git a/build/AzurePipelinesTemplates/MUX-InstallNuget-Steps.yml b/build/AzurePipelinesTemplates/MUX-InstallNuget-Steps.yml
@@ -1,5 +1,5 @@
 parameters:
-  nugetVersion: 5.8.0
+  nugetVersion: 6.9.1
 
 steps:
   - task: NuGetToolInstaller@0

diff --git a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
@@ -34,9 +34,9 @@ jobs:
       - ${{ parameters.dependsOn }}
 
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
     demands: ImageOverride -equals WinDevVS16-9
   strategy:
@@ -85,6 +85,8 @@ jobs:
 
       $newVersion = $candidateNupkgs[0].Name.Replace("Microsoft.UI.Xaml.", "").Replace(".nupkg", "")
       Write-Host "New version: $newVersion"
+      Write-Host "##vso[task.setvariable variable=muxVersion]$newVersion"
+
       .\test\MUXControlsReleaseTest\updateUsedNugetPackageVersion.ps1 $newVersion
     displayName: Update proj files to use candidate nupkg.
 
@@ -93,6 +95,8 @@ jobs:
   - template: MUX-InstallNuget-Steps.yml
 
   - template: MUX-InstallDotNetSDK-Steps.yml
+    parameters:
+      dotNetVersion: 3.1.415
 
   # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
   - script: |
@@ -106,11 +110,23 @@ jobs:
       echo ##vso[task.setvariable variable=VCToolsRedistDir]%VCToolsRedistDir%
     displayName: 'Retrieve VC tools directory'
 
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'nuget add '
+    inputs:
+      command: custom
+      arguments: add $(localPackagesPath)\Microsoft.UI.Xaml.$(muxVersion).nupkg -Expand -Source $(Build.SourcesDirectory)\packages
+
   - template: MUX-BuildProject-Steps.yml
     parameters:
       solutionPath: test\MUXControlsReleaseTest\RuntimeComponentThatUsesMUX\RuntimeComponentThatUsesMUX.sln
       artifactName: ${{ parameters.buildArtifactName }}
 
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'nuget add '
+    inputs:
+      command: custom
+      arguments: add $(localPackagesPath)\RuntimeComponentThatUsesMUX.1.0.0.nupkg -Expand -Source $(Build.SourcesDirectory)\packages
+
   - template: MUX-BuildProject-Steps.yml
     parameters:
       solutionPath: $(solutionPath)

diff --git a/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml b/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml
@@ -23,9 +23,9 @@ jobs:
   dependsOn: ${{ parameters.dependsOn }}
   condition: ${{ parameters.condition }}
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
   timeoutInMinutes: 120
   strategy:

diff --git a/build/AzurePipelinesTemplates/MUX-RunTestsOnPipeline-Job.yml b/build/AzurePipelinesTemplates/MUX-RunTestsOnPipeline-Job.yml
@@ -14,9 +14,9 @@ jobs:
   dependsOn: ${{ parameters.dependsOn }}
   condition: not(failed())
   pool:
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-Test
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-Test
     demands: ImageOverride -equals ${{ parameters.testOS }}
 

diff --git a/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml b/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml
@@ -19,9 +19,9 @@ jobs:
 - job: ${{ parameters.name }}
   dependsOn: ${{ parameters.dependsOn }}
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-S
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-S
   strategy:
     maxParallel: 10

diff --git a/build/CopyFilesToStagingDir.ps1 b/build/CopyFilesToStagingDir.ps1
@@ -35,6 +35,7 @@ PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll $
 PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri $FullPublishDir\Microsoft.UI.Xaml\
 PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml\sdk\Microsoft.UI.Xaml.winmd $FullPublishDir\Microsoft.UI.Xaml\sdk\
 PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml\Generic.xaml $FullPublishDir\Microsoft.UI.Xaml\
+PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\Microsoft.UI.Xaml.Projection\Microsoft.UI.Xaml.Projection.dll $FullPublishDir\Microsoft.UI.Xaml.Projection\
 PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml.Design\Microsoft.UI.Xaml.Design.dll $FullPublishDir\Microsoft.UI.Xaml.Design\
 PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\Microsoft.UI.Xaml.FrameworkPackagePRI\Microsoft.UI.Xaml.pri $FullPublishDir\Microsoft.UI.Xaml.FrameworkPackagePRI\
 PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\MUXControls.Test.TAEF\*.dll $FullPublishDir\Test\

diff --git a/build/MUX-CI.yml b/build/MUX-CI.yml
@@ -8,11 +8,12 @@ stages:
   jobs:
   - job: Build
     pool: 
-      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPoolOSS-L
-      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPool-L
-      demands: ImageOverride -equals WinDevVS17-latest
+      demands: 
+      - ImageOverride -equals WinDevVS17-latest
     timeoutInMinutes: 120
     strategy:
       maxParallel: 10

diff --git a/build/MUX-PR.yml b/build/MUX-PR.yml
@@ -26,11 +26,12 @@ stages:
   - job: Build
     condition: eq(variables['useBuildOutputFromBuildId'],'')
     pool: 
-      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPoolOSS-L
-      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+      ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
         name: WinDevPool-L
-      demands: ImageOverride -equals WinDevVS17-latest
+      demands: 
+        - ImageOverride -equals WinDevVS17-latest
     timeoutInMinutes: 120
     strategy:
       maxParallel: 10

diff --git a/build/MUX-SimpleBuildAndTest.yml b/build/MUX-SimpleBuildAndTest.yml
@@ -11,9 +11,9 @@ jobs:
   condition:
     eq(variables['useBuildOutputFromBuildId'],'') 
   pool: 
-    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPoolOSS-L
-    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
+    ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/shine-oss/') }}:
       name: WinDevPool-L
     demands: ImageOverride -equals WinDevVS17-latest
   timeoutInMinutes: 120

diff --git a/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props b/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
@@ -37,7 +37,7 @@
     </AppxPackageRegistration>
   </ItemGroup>
   <!-- Add a dependency for the app against VCLibs since we need it but the consuming app might be .NET only. -->
-  <ItemGroup Condition="('$(OutputType)' == 'AppContainerExe')">
+  <ItemGroup Condition="('$(OutputType)' == 'AppContainerExe' OR ('$(OutputType)' == 'WinExe' AND '$(UseUwpTools)' == 'true'))">
     <SDKReference Include="Microsoft.VCLibs, Version=14.0" />
   </ItemGroup>
 </Project>
diff --git a/build/NuSpecs/MUXControls-Nuget-Native.targets b/build/NuSpecs/MUXControls-Nuget-Native.targets
@@ -9,8 +9,8 @@
     <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.UI.Xaml.winmd">
       <Implementation>Microsoft.UI.Xaml.dll</Implementation>
     </Reference>
-    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native\Microsoft.UI.Xaml.dll" />
-    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native\Microsoft.UI.Xaml.pri" />
+    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(Native-Platform)\native\Microsoft.UI.Xaml.dll" />
+    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(Native-Platform)\native\Microsoft.UI.Xaml.pri" />
   </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.UI.Xaml.targets"/>
 </Project>
diff --git a/build/NuSpecs/MUXControls.nuspec b/build/NuSpecs/MUXControls.nuspec
@@ -15,8 +15,21 @@
     <iconUrl>https://aka.ms/winui_icon</iconUrl>
 
     <dependencies>
-      <dependency id="Microsoft.Web.WebView2" version="[1.0.1264.42,)" />
-    </dependencies>  
+      <group targetFramework="native">
+        <dependency id="Microsoft.Web.WebView2" version="[1.0.2849.39,)" />
+      </group>
+      <group targetFramework="net8.0-windows10.0.22621.0">
+        <dependency id="Microsoft.Web.WebView2" version="[1.0.2849.39,)" />
+      </group>
+      <group targetFramework="uap10.0">
+        <dependency id="Microsoft.Web.WebView2" version="[1.0.2849.39,)" />
+      </group>
+    </dependencies>
+    <frameworkReferences>
+      <group targetFramework="net8.0-windows10.0.22621.0">
+        <frameworkReference name="Microsoft.Windows.SDK.NET.Ref.Xaml" />
+      </group>
+    </frameworkReferences>
   </metadata>
   <files>
     <file src="readme.txt"/>
@@ -28,6 +41,10 @@
     <file target="lib\uap10.0\Microsoft.UI.Xaml\Themes" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Generic.xaml"/>
     <file target="lib\uap10.0\Design" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml.Design\Microsoft.UI.Xaml.design.dll"/>
 
+    <file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml.Projection.dll" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml.Projection\Microsoft.UI.Xaml.Projection.dll" />
+    <file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml\Themes" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Generic.xaml"/>
+    <file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml.Projection.xml" src="Intellisense\Microsoft.UI.Xaml.xml"/>
+
     <file target="runtimes" src="$RUNTIMESDIR$\**\*.*"/>
 
     <file target="tools" src="VisualStudioToolsManifest.xml"/>

diff --git a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
@@ -15,8 +15,21 @@
     <iconUrl>https://aka.ms/winui_icon</iconUrl>
 
     <dependencies>
-      <dependency id="Microsoft.Web.WebView2" version="[1.0.1264.42,)" />
-    </dependencies>  
+      <group targetFramework="native">
+        <dependency id="Microsoft.Web.WebView2" version="[1.0.2849.39,)" />
+      </group>
+      <group targetFramework="net8.0-windows10.0.22621.0">
+        <dependency id="Microsoft.Web.WebView2" version="[1.0.2849.39,)" />
+      </group>
+      <group targetFramework="uap10.0">
+        <dependency id="Microsoft.Web.WebView2" version="[1.0.2849.39,)" />
+      </group>
+    </dependencies>
+    <frameworkReferences>
+      <group targetFramework="net8.0-windows10.0.22621.0">
+        <frameworkReference name="Microsoft.Windows.SDK.NET.Ref.Xaml" />
+      </group>
+    </frameworkReferences>
   </metadata>
   <files>
     <file src="readme.txt"/>
@@ -30,6 +43,10 @@
 
     <file target="lib\uap10.0\Microsoft.UI.Xaml\Themes" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Generic.xaml"/>
 
+    <file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml.Projection.dll" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml.Projection\Microsoft.UI.Xaml.Projection.dll" />
+    <file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml\Themes" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Generic.xaml"/>
+    <file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml.Projection.xml" src="Intellisense\Microsoft.UI.Xaml.xml"/>
+
     <file target="tools" src="$TOOLSDIR$\**\*.*"/>
 
     <file target="tools" src="VisualStudioToolsManifest.xml"/>

diff --git a/build/NuSpecs/build-nupkg.ps1 b/build/NuSpecs/build-nupkg.ps1
@@ -111,18 +111,19 @@ Write-Verbose "TempDir = $($TempDir.FullName)"
 $runtimesDir = "$($TempDir.FullName)\runtimes"
 $toolsDir = "$($TempDir.FullName)\tools"
 
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win10-x86\native"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win10-x86\native"
-Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win10-x86\native\Microsoft.UI.Xaml\Assets"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win10-x64\native"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win10-x64\native"
-Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win10-x64\native\Microsoft.UI.Xaml\Assets"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win10-arm\native"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win10-arm\native"
-Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win10-arm\native\Microsoft.UI.Xaml\Assets"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win10-arm64\native"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win10-arm64\native"
-Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win10-arm64\native\Microsoft.UI.Xaml\Assets"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win-x86\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win-x86\native"
+Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win-x86\native\Microsoft.UI.Xaml\Assets"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win-x64\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win-x64\native"
+Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win-x64\native\Microsoft.UI.Xaml\Assets"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win-arm\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win-arm\native"
+Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win-arm\native\Microsoft.UI.Xaml\Assets"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.dll "$runtimesDir\win-arm64\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.UI.Xaml\Microsoft.UI.Xaml.pri "$runtimesDir\win-arm64\native"
+Copy-IntoNewDirectory -IfExists ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png "$runtimesDir\win-arm64\native\Microsoft.UI.Xaml\Assets"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\AnyCPU\Microsoft.UI.Xaml.Projection\Microsoft.UI.Xaml.Projection.dll "$BuildOutput\$BuildFlavor\$BuildArch\Microsoft.UI.Xaml.Projection"
 
 $CommonNugetArgs = "-properties `"BuildOutput=$BuildOutput``;ID=$nupkgtitle``;RUNTIMESDIR=$runtimesDir`;TOOLSDIR=$toolsDir`;BUILDFLAVOR=$($BuildFlavor)`;BUILDARCH=$($BuildArch)`""