Skip to content

Commit c074d03

Browse files
committed
Adjust CI to build all Uno.Sdk targets
1 parent 71679cb commit c074d03

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,20 @@ jobs:
145145
fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
146146
matrix:
147147
winui: [2, 3]
148-
multitarget: ['uwp', 'wasdk', 'wasm']
148+
multitarget: ['uwp', 'wasdk', 'wasm', 'unosdk']
149149
exclude:
150150
# WinUI 2 not supported on wasdk
151151
- winui: 2
152152
multitarget: wasdk
153153
# WinUI 3 not supported on uwp
154154
- winui: 3
155155
multitarget: uwp
156+
# Uno SDK is WinUI 3 only
157+
- winui: 2
158+
multitarget: unosdk
159+
# WinUI 3 wasm is covered by the unosdk entry
160+
- winui: 3
161+
multitarget: wasm
156162

157163
env:
158164
HEADS_DIRECTORY: tooling/ProjectHeads
@@ -183,8 +189,8 @@ jobs:
183189
global-json-file: tooling/global.json
184190

185191
- name: Install .NET workloads
186-
if: ${{ matrix.multitarget == 'wasm' }}
187-
run: dotnet workload install wasm-tools
192+
if: ${{ matrix.multitarget == 'wasm' || matrix.multitarget == 'unosdk' }}
193+
run: dotnet workload install wasm-tools ${{ matrix.multitarget == 'unosdk' && 'android ios maui' || '' }}
188194

189195
- name: .NET Info (if diagnostics)
190196
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
@@ -221,26 +227,21 @@ jobs:
221227
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
222228
run: >-
223229
${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1
224-
-MultiTargets ${{ matrix.multitarget }}
230+
-MultiTargets ${{ matrix.multitarget == 'unosdk' && 'wasm' || matrix.multitarget }}
225231
-winui ${{ matrix.winui }}
226232
-componentPath "${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}"
227-
${{ matrix.multitarget == 'wasm' && matrix.winui == 3 && ' -IncludeUnoSdkHead' || '' }}
233+
${{ matrix.multitarget == 'unosdk' && ' -IncludeUnoSdkHead' || '' }}
228234
${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
229235
230236
- name: MSBuild
231-
if: ${{ matrix.multitarget != 'wasm' || matrix.winui == 2 }}
237+
if: ${{ matrix.multitarget != 'unosdk' }}
232238
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
233239
run: msbuild.exe ${{ env.TEST_PROJECT_NAME }}.sln /restore /nowarn:MSB4011 -p:Configuration=Release
234240

235-
- name: Build Uno head (browserwasm)
236-
if: ${{ matrix.multitarget == 'wasm' && matrix.winui == 3 }}
237-
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
238-
run: dotnet build heads/Uno/${{ env.TEST_PROJECT_NAME }}.Uno.csproj -f net9.0-browserwasm -p:Configuration=Release
239-
240-
- name: Build Uno head (desktop)
241-
if: ${{ matrix.multitarget == 'wasm' && matrix.winui == 3 }}
241+
- name: Build Uno head
242+
if: ${{ matrix.multitarget == 'unosdk' }}
242243
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
243-
run: dotnet build heads/Uno/${{ env.TEST_PROJECT_NAME }}.Uno.csproj -f net9.0-desktop -p:Configuration=Release
244+
run: dotnet build heads/Uno/${{ env.TEST_PROJECT_NAME }}.Uno.csproj -p:Configuration=Release
244245

245246
# Run tests
246247
- name: Setup VSTest Path

0 commit comments

Comments
 (0)