File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4949 & "${{ steps.vs.outputs.MSBUILD }}" src/CompositionCollectionView/CompositionCollectionView.csproj `
5050 /t:Build /p:Configuration=Release /p:Platform=AnyCPU
5151
52- - name : Restore & Build WinAppSdk library
52+ - name : Resolve AppxMSBuildToolsPath
53+ id : appx
5354 shell : pwsh
5455 run : |
5556 # dotnet build has .NET 10 but not VS's PRI task DLLs. We just need AppxMSBuildToolsPath.
@@ -61,13 +62,27 @@ jobs:
6162 $appxPath = "$($vsVerDir.FullName)\AppxPackage"
6263 Write-Host "AppxMSBuildToolsPath: $appxPath"
6364 Write-Host "PRI DLL exists: $(Test-Path "$appxPath\Microsoft.Build.Packaging.Pri.Tasks.dll")"
64-
65+ "APPX_PATH=$appxPath" >> $env:GITHUB_OUTPUT
66+
67+ - name : Restore & Build WinAppSdk library (x64)
68+ shell : pwsh
69+ run : |
6570 dotnet restore src/CompositionCollectionView.WinAppSdk/CompositionCollectionView.WinAppSdk.csproj -p:Platform=x64
6671 dotnet build src/CompositionCollectionView.WinAppSdk/CompositionCollectionView.WinAppSdk.csproj `
6772 -c Release `
6873 --no-restore `
6974 -p:Platform=x64 `
70- "-p:AppxMSBuildToolsPath=$appxPath\"
75+ "-p:AppxMSBuildToolsPath=${{ steps.appx.outputs.APPX_PATH }}\"
76+
77+ - name : Restore & Build WinAppSdk library (ARM64)
78+ shell : pwsh
79+ run : |
80+ dotnet restore src/CompositionCollectionView.WinAppSdk/CompositionCollectionView.WinAppSdk.csproj -p:Platform=ARM64
81+ dotnet build src/CompositionCollectionView.WinAppSdk/CompositionCollectionView.WinAppSdk.csproj `
82+ -c Release `
83+ --no-restore `
84+ -p:Platform=ARM64 `
85+ "-p:AppxMSBuildToolsPath=${{ steps.appx.outputs.APPX_PATH }}\"
7186
7287 - name : Pack NuGet
7388 shell : pwsh
Original file line number Diff line number Diff line change 2626 <file src =" src\CompositionCollectionView\bin\Release\CompositionCollectionView.pri" target =" lib\uap10.0.19041" />
2727 <file src =" src\CompositionCollectionView\bin\Release\CompositionCollectionView\**" target =" lib\uap10.0.19041\CompositionCollectionView" />
2828
29- <!-- WinUI 3 / Windows App SDK (net10.0-windows10.0.19041.0) -->
29+ <!-- WinUI 3 / Windows App SDK – compile reference + resources (net10.0-windows10.0.19041.0) -->
3030 <file src =" src\CompositionCollectionView.WinAppSdk\bin\x64\Release\net10.0-windows10.0.19041.0\CompositionCollectionView.dll" target =" lib\net10.0-windows10.0.19041.0" />
3131 <file src =" src\CompositionCollectionView.WinAppSdk\bin\x64\Release\net10.0-windows10.0.19041.0\CompositionCollectionView.xml" target =" lib\net10.0-windows10.0.19041.0" />
3232 <file src =" src\CompositionCollectionView.WinAppSdk\bin\x64\Release\net10.0-windows10.0.19041.0\CompositionCollectionView.pri" target =" lib\net10.0-windows10.0.19041.0" />
3333 <file src =" src\CompositionCollectionView.WinAppSdk\bin\x64\Release\net10.0-windows10.0.19041.0\CompositionCollectionView\**" target =" lib\net10.0-windows10.0.19041.0\CompositionCollectionView" />
34+
35+ <!-- WinUI 3 / Windows App SDK – x64 runtime -->
36+ <file src =" src\CompositionCollectionView.WinAppSdk\bin\x64\Release\net10.0-windows10.0.19041.0\CompositionCollectionView.dll" target =" runtimes\win-x64\lib\net10.0-windows10.0.19041.0" />
37+
38+ <!-- WinUI 3 / Windows App SDK – ARM64 runtime -->
39+ <file src =" src\CompositionCollectionView.WinAppSdk\bin\ARM64\Release\net10.0-windows10.0.19041.0\CompositionCollectionView.dll" target =" runtimes\win-arm64\lib\net10.0-windows10.0.19041.0" />
3440 </files >
3541</package >
You can’t perform that action at this time.
0 commit comments