Skip to content

Commit f8e015d

Browse files
authored
Merge pull request CommunityToolkit#639 from CommunityToolkit/fix/multitarget/winui/checks/ci/matrix/packaging
Add support for requesting WinUI 0 (non-WinUI) components be build. For use by packaging CI matrix.
2 parents f664523 + e09a242 commit f8e015d

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ jobs:
213213
strategy:
214214
fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
215215
matrix:
216-
winui: [2, 3]
216+
winui: [0, 2, 3]
217217

218218
env:
219219
VERSION_PROPERTY: ${{ github.ref == 'refs/heads/main' && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }}
@@ -256,20 +256,10 @@ jobs:
256256
uses: microsoft/setup-msbuild@v2
257257
with:
258258
vs-version: '[17.9,)'
259-
260-
- name: Define excluded MultiTargets (WinUI 2)
261-
if: ${{ matrix.winui == '2' }}
262-
run: |
263-
echo "EXCLUDED_MULTITARGETS=wasdk" >> $env:GITHUB_ENV
264-
265-
- name: Define excluded MultiTargets (WinUI 3)
266-
if: ${{ matrix.winui == '3' }}
267-
run: |
268-
echo "EXCLUDED_MULTITARGETS=uwp" >> $env:GITHUB_ENV
269259

270260
# Build and pack component nupkg
271261
- name: Build and pack component packages
272-
run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -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
262+
run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -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
273263

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

tooling

0 commit comments

Comments
 (0)