Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add CsWinRT projection #9976

Draft
wants to merge 26 commits into
base: release/2.8
Choose a base branch
from
Draft

Add CsWinRT projection #9976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5e3ea2e
Merged PR 11109364: Update to ESRP CodeSigning task V5
kythant Jul 17, 2024
79cc514
WIP: projection
May 10, 2024
fa0ab7f
WIP: temporarily include WUX and CoreWebView2
May 10, 2024
65550cb
projection nupkg
May 13, 2024
a708494
nuget 6.9.1
kmahone May 13, 2024
0ee6d57
usedotnet
kmahone May 14, 2024
08578a4
dotnet 6 only for build
kmahone May 14, 2024
bef47fd
sign appx. plus fixes
kmahone May 14, 2024
0d718fe
bump version
May 14, 2024
c57245a
CsWinRT and SDK versions
Jul 25, 2024
1df3784
webview
Jul 25, 2024
2deb781
use -prerelease
Jul 25, 2024
d7bb8a8
net8
Jul 25, 2024
1345b0a
cleanup and update versions
Sep 10, 2024
4966008
Update symbol publish process
Sep 10, 2024
8a3ec85
Remove localpackages from nuget.config (#9967)
kmahone Sep 10, 2024
38415f6
Move to shine-oss Azure DevOps project (#9929)
kmahone Aug 29, 2024
4e5a8e7
update WebView2 to 1.0.2739.15
Sep 10, 2024
d78e417
fix pipspager import
Sep 10, 2024
51482d1
dotnet 8
Sep 10, 2024
44f46d9
win10 to win
kmahone Sep 11, 2024
b6506e6
dotnet again
kmahone Sep 11, 2024
f59e2b9
dotnet 3 for release test
Sep 11, 2024
c933a37
fix indent
Sep 11, 2024
52c176f
CR feedback
Sep 11, 2024
af2489b
IsAotCompatible
Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/tsaoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [ "uxpct@microsoft.com" ],
"ignoreBranchName": true,
Expand Down
738 changes: 325 additions & 413 deletions MUXControls.sln
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -64,10 +70,15 @@ steps:
artifactName: nativecodeanalysis

- ${{ if eq( parameters.signOutput, true) }}:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
displayName: 'CodeSign'
inputs:
ConnectedServiceName: WinUISigning
ConnectedServiceName: $(WinUI2SigningConnectedServiceName)
AppRegistrationClientId: $(WinUI2SigningAppRegistrationClientId)
AppRegistrationTenantId: $(WinUI2SigningAppRegistrationTenantId)
AuthAKVName: $(WinUI2SigningAuthAKVName)
AuthCertName: $(WinUI2SigningAuthCertName)
AuthSignCertName: $(WinUI2SigningAuthSignCertName)
FolderPath: '$(buildOutputDir)/$(buildConfiguration)/$(buildPlatform)/Microsoft.UI.Xaml'
# Recursively finds files matching these patterns:
Pattern: |
Expand Down
5 changes: 5 additions & 0 deletions build/AzurePipelinesTemplates/MUX-BuildProject-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
23 changes: 9 additions & 14 deletions build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -55,10 +55,15 @@ jobs:
displayName: 'build-nupkg.ps1'

- ${{ if eq( parameters.signOutput, true) }}:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
displayName: 'CodeSign (nupkg)'
inputs:
ConnectedServiceName: WinUISigning
ConnectedServiceName: $(WinUI2SigningConnectedServiceName)
AppRegistrationClientId: $(WinUI2SigningAppRegistrationClientId)
AppRegistrationTenantId: $(WinUI2SigningAppRegistrationTenantId)
AuthAKVName: $(WinUI2SigningAuthAKVName)
AuthCertName: $(WinUI2SigningAuthCertName)
AuthSignCertName: $(WinUI2SigningAuthSignCertName)
FolderPath: '${{ parameters.nupkgdir }}'
Pattern: |
**/Microsoft.UI.Xaml*.nupkg
Expand Down Expand Up @@ -88,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
2 changes: 1 addition & 1 deletion build/AzurePipelinesTemplates/MUX-InstallDotNetSDK-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
dotNetVersion: 3.1.415
dotNetVersion: 6.0.414

steps:
- task: UseDotNet@2
Expand Down
2 changes: 1 addition & 1 deletion build/AzurePipelinesTemplates/MUX-InstallNuget-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
nugetVersion: 5.8.0
nugetVersion: 6.9.1

steps:
- task: NuGetToolInstaller@0
Expand Down
9 changes: 7 additions & 2 deletions build/AzurePipelinesTemplates/MUX-MakeFrameworkPackages-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ steps:
displayName: 'Make FrameworkPackages'

- ${{ if eq( parameters.signOutput, true) }}:
- task: EsrpCodeSigning@1
- task: EsrpCodeSigning@5
displayName: First Party StoreSign Framework Package
inputs:
ConnectedServiceName: WinUISigning
ConnectedServiceName: $(WinUI2SigningConnectedServiceName)
AppRegistrationClientId: $(WinUI2SigningAppRegistrationClientId)
AppRegistrationTenantId: $(WinUI2SigningAppRegistrationTenantId)
AuthAKVName: $(WinUI2SigningAuthAKVName)
AuthCertName: $(WinUI2SigningAuthCertName)
AuthSignCertName: $(WinUI2SigningAuthSignCertName)
FolderPath: '${{ parameters.buildOutputDir }}\$(buildConfiguration)\$(buildPlatform)\FrameworkPackage'
Pattern: |
*.appx
Expand Down
20 changes: 18 additions & 2 deletions build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.

Expand All @@ -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: |
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions build/AzurePipelinesTemplates/MUX-RunTestsOnPipeline-Job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions build/CopyFilesToStagingDir.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions build/MUX-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ 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
timeoutInMinutes: 120
Expand Down
7 changes: 4 additions & 3 deletions build/MUX-PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/MUX-SimpleBuildAndTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions build/NuSpecs/MUXControls-Nuget-Native.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 3 additions & 1 deletion build/NuSpecs/MUXControls.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<iconUrl>https://aka.ms/winui_icon</iconUrl>

<dependencies>
<dependency id="Microsoft.Web.WebView2" version="[1.0.1264.42,)" />
<dependency id="Microsoft.Web.WebView2" version="[1.0.2739.15,)" />
</dependencies>
</metadata>
<files>
Expand All @@ -28,6 +28,8 @@
<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" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to pack a few more things here. This is what the package looks like now:

image

We also need:

  • The Generic.xaml file, in the same subfolder but under the new TFM
  • The generated .xml file for the projections .dll

Not entirely sure what that Design.dll file is? Is it for the XAML Designer? I assume we need that one too?


<file target="runtimes" src="$RUNTIMESDIR$\**\*.*"/>

<file target="tools" src="VisualStudioToolsManifest.xml"/>
Expand Down
4 changes: 3 additions & 1 deletion build/NuSpecs/MUXControlsFrameworkPackage.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<iconUrl>https://aka.ms/winui_icon</iconUrl>

<dependencies>
<dependency id="Microsoft.Web.WebView2" version="[1.0.1264.42,)" />
<dependency id="Microsoft.Web.WebView2" version="[1.0.2739.15,)" />
</dependencies>
</metadata>
<files>
Expand All @@ -30,6 +30,8 @@

<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="tools" src="$TOOLSDIR$\**\*.*"/>

<file target="tools" src="VisualStudioToolsManifest.xml"/>
Expand Down
25 changes: 13 additions & 12 deletions build/NuSpecs/build-nupkg.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)`""

Expand Down
Loading
Loading