Skip to content

Commit ec018ef

Browse files
committed
Enable WinUI 3, fix GenerateSingleSampleHeads script invocation
1 parent cf30a64 commit ec018ef

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
strategy:
6161
fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
6262
matrix:
63-
winui: [2] # Temporary until we can get Uno/Wasm working
64-
multitarget: ['uwp'] # Temporary until we can get Uno/Wasm working
63+
winui: [2, 3] # Temporary until we can get Uno/Wasm working
64+
multitarget: ['uwp', 'wasdk'] # Temporary until we can get Uno/Wasm working
6565
exclude:
6666
# WinUI 2 not supported on wasdk
6767
- winui: 2
@@ -135,7 +135,7 @@ jobs:
135135
# Generate full solution with all projects (sample gallery heads, components, tests)
136136
- name: Generate solution with ${{ matrix.multitarget }} gallery, components and tests
137137
working-directory: ./components/DependencyPropertyGenerator
138-
run: powershell -version 5.1 -command "./GenerateSingleSampleHeads.ps1 -MultiTargets ${{ matrix.multitarget }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} -WinUIMajorVersion ${{ matrix.winui }}" -ErrorAction Stop
138+
run: powershell -version 5.1 -command "../../tooling/ProjectHeads/GenerateSingleSampleHeads.ps1 -MultiTargets ${{ matrix.multitarget }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} -WinUIMajorVersion ${{ matrix.winui }}" -ErrorAction Stop
139139

140140
# Build solution
141141
- name: MSBuild (With diagnostics)
@@ -214,7 +214,7 @@ jobs:
214214
strategy:
215215
fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
216216
matrix:
217-
winui: [2]
217+
winui: [2, 3] # Temporary until we can get Uno/Wasm working
218218

219219
env:
220220
VERSION_PROPERTY: ${{ github.ref == 'refs/heads/main' && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }}
@@ -270,7 +270,7 @@ jobs:
270270
271271
# Build and pack component nupkg
272272
- name: Build and pack component packages
273-
run: ./tooling/Build-Toolkit-Components.ps1 -Components DependencyPropertyGenerator -MultiTargets uwp -ExcludeMultiTargets ${{ env.EXCLUDED_MULTITARGETS }} -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release
273+
run: ./tooling/Build-Toolkit-Components.ps1 -Components DependencyPropertyGenerator -MultiTargets uwp,wasdk -ExcludeMultiTargets ${{ env.EXCLUDED_MULTITARGETS }} -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release
274274

275275
- name: Validate package names
276276
if: ${{ env.VERSION_PROPERTY != '' }}

0 commit comments

Comments
 (0)