|
60 | 60 | strategy: |
61 | 61 | fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion. |
62 | 62 | 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 |
65 | 65 | exclude: |
66 | 66 | # WinUI 2 not supported on wasdk |
67 | 67 | - winui: 2 |
@@ -135,7 +135,7 @@ jobs: |
135 | 135 | # Generate full solution with all projects (sample gallery heads, components, tests) |
136 | 136 | - name: Generate solution with ${{ matrix.multitarget }} gallery, components and tests |
137 | 137 | 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 |
139 | 139 |
|
140 | 140 | # Build solution |
141 | 141 | - name: MSBuild (With diagnostics) |
@@ -214,7 +214,7 @@ jobs: |
214 | 214 | strategy: |
215 | 215 | fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion. |
216 | 216 | matrix: |
217 | | - winui: [2] |
| 217 | + winui: [2, 3] # Temporary until we can get Uno/Wasm working |
218 | 218 |
|
219 | 219 | env: |
220 | 220 | 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: |
270 | 270 | |
271 | 271 | # Build and pack component nupkg |
272 | 272 | - 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 |
274 | 274 |
|
275 | 275 | - name: Validate package names |
276 | 276 | if: ${{ env.VERSION_PROPERTY != '' }} |
|
0 commit comments