Skip to content

Commit 248a440

Browse files
authored
Merge branch 'main' into check,ci/runner,images,github,actions/improvement/windows-2025,upgrade,windows-sdks/5.12.2026,arlodotexe
2 parents d0c1e8e + 2c6819d commit 248a440

3 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ jobs:
191191
copy ./tooling/.config/dotnet-tools.json ./.config/dotnet-tools.json
192192
mkdir ./components
193193
194+
- name: Install Windows SDKs
195+
shell: pwsh
196+
run: ./tooling/Install-WindowsSdk.ps1
197+
194198
- name: Add msbuild to PATH
195199
uses: microsoft/setup-msbuild@v2
196200

@@ -221,7 +225,7 @@ jobs:
221225
uses: darenm/setup-vstest@3a16d909a1f3bbc65b52f8270d475d905e7d3e44
222226

223227
- name: Install Testspace Module
224-
uses: testspace-com/setup-testspace@v1
228+
uses: testspace-com/setup-testspace@v1.0.8
225229
with:
226230
domain: ${{ github.repository_owner }}
227231

‎Install-WindowsSdk.ps1‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
$WinSdkTempDir = "C:\WinSdkTemp\"
3+
$WinSdkSetupExe = "C:\WinSdkTemp\" + "WinSdkSetup.exe"
4+
5+
mkdir $WinSdkTempDir
6+
7+
$client = [System.Net.WebClient]::new()
8+
$client.DownloadFile("https://go.microsoft.com/fwlink/p/?linkid=870807", $WinSdkSetupExe)
9+
10+
Start-Process -Wait $WinSdkSetupExe "/features OptionId.UWPCpp /q"

‎ProjectHeads/App.Head.Wasm.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@
44
<TargetFramework>$(WasmHeadTargetFramework.Split(';')[0])</TargetFramework>
55
</PropertyGroup>
66

7+
<!--
8+
TargetFramework is set late (above), so NuGet's net9.0-conditional import of
9+
Uno.*.Runtime.WebAssembly.props is skipped and UnoRuntimeIdentifier never gets set. Without it
10+
Uno deploys the reference Uno.UI.dll (no embedded JS) instead of the WebAssembly runtime build,
11+
so the app stalls on the splash. Set it explicitly so the runtime-assembly swap runs.
12+
-->
13+
<PropertyGroup>
14+
<UnoRuntimeIdentifier>WebAssembly</UnoRuntimeIdentifier>
15+
<UnoIsWebAssemblyBrowserHead>true</UnoIsWebAssemblyBrowserHead>
16+
</PropertyGroup>
17+
718
<Import Project="$(MSBuildThisFileDirectory)\App.Head.Uno.props" />
819

920
<PropertyGroup Condition="'$(Configuration)'=='Release'">

0 commit comments

Comments
 (0)