Skip to content

Commit 5f96820

Browse files
committed
Adjust CI
1 parent 2db3bdd commit 5f96820

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125

126126
- name: Add project heads to ProjectTemplate
127127
working-directory: ./${{ env.PROJECT_DIRECTORY }}
128-
run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
128+
run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} -IncludeUnoSdkHead
129129

130130
# Build and use template for creating new experiments
131131
- name: Build ProjectTemplate
@@ -212,7 +212,7 @@ jobs:
212212

213213
- name: Add project heads to ${{ env.TEST_PROJECT_NAME }}
214214
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
215-
run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -MultiTargets ${{ matrix.multitarget }} -winui ${{ matrix.winui }} -componentPath "${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}"
215+
run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -MultiTargets ${{ matrix.multitarget }} -winui ${{ matrix.winui }} -componentPath "${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}"${{ matrix.multitarget == 'wasm' && ' -IncludeUnoSdkHead' || '' }}
216216

217217
- name: MSBuild
218218
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
@@ -248,6 +248,7 @@ jobs:
248248
runs-on: ubuntu-latest
249249
env:
250250
HEADS_DIRECTORY: tooling/ProjectHeads
251+
PROJECT_DIRECTORY: tooling/ProjectTemplate
251252
TEST_PROJECT_NAME: CiTestExp
252253

253254
steps:
@@ -292,7 +293,7 @@ jobs:
292293
- name: Generate solution
293294
shell: pwsh
294295
working-directory: ./
295-
run: ./tooling/GenerateAllSolution.ps1${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} -MultiTargets wasm
296+
run: ./tooling/GenerateAllSolution.ps1${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} -MultiTargets wasm -IncludeUnoSdkHead
296297

297298
- name: dotnet build
298299
shell: pwsh

ProjectHeads/AllComponents/Uno/CommunityToolkit.App.Uno.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<!-- Uno app dependencies (from App.Head.Uno.WinUI.Dependencies.props) -->
6565
<ItemGroup>
6666
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Interactivity.WinUI" Version="3.0.3" />
67-
<PackageReference Include="Uno.WinUI.Lottie" Version="6.0.465" />
67+
<PackageReference Include="Uno.WinUI.Lottie" Version="6.4.229" />
6868
</ItemGroup>
6969

7070
<!-- Sample doc content inclusion (from App.Head.props) -->

ProjectHeads/GenerateSingleSampleHeads.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ Param (
4343
[string]$componentPath,
4444

4545
[Parameter(HelpMessage = "Add extra diagnostic output to slngen generator.")]
46-
[switch]$UseDiagnostics = $false
46+
[switch]$UseDiagnostics = $false,
47+
48+
[switch]$IncludeUnoSdkHead = $false
4749
)
4850

4951
# Use & and a separate script path variable to avoid issues with parameter passing
5052
$scriptPath = "$PSScriptRoot/../GenerateSingleSolution.ps1"
51-
& $scriptPath -MultiTargets $MultiTargets -ExcludeMultiTargets $ExcludeMultiTargets -WinUIMajorVersion $WinUIMajorVersion -UseDiagnostics:$UseDiagnostics -componentPath $componentPath
53+
& $scriptPath -MultiTargets $MultiTargets -ExcludeMultiTargets $ExcludeMultiTargets -WinUIMajorVersion $WinUIMajorVersion -UseDiagnostics:$UseDiagnostics -IncludeUnoSdkHead:$IncludeUnoSdkHead -componentPath $componentPath

ProjectHeads/SingleComponent/Uno/ProjectTemplate.Uno.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</ItemGroup>
5050
<ItemGroup>
5151
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Interactivity.WinUI" Version="3.0.3" />
52-
<PackageReference Include="Uno.WinUI.Lottie" Version="6.0.465" />
52+
<PackageReference Include="Uno.WinUI.Lottie" Version="6.4.229" />
5353
</ItemGroup>
5454

5555
<!-- Content inclusion (single component variant) -->

0 commit comments

Comments
 (0)