Skip to content

Commit 7625d21

Browse files
authored
Merge pull request #533 from unoplatform/dev/jela/net9
Update to net9
2 parents a8705e4 + a39097e commit 7625d21

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
build_and_deploy_job:
1616
env:
17-
DIST_PATH: src/Uno.Playground.WASM/bin/Release/net8.0/dist
17+
DIST_PATH: src/Uno.Playground.WASM/bin/Release/net9.0/publish/wwwroot
1818

1919
if: (github.event_name == 'pull_request' && github.event.action != 'closed')
2020
runs-on: ubuntu-latest
@@ -41,12 +41,12 @@ jobs:
4141
- name: Setup dotnet
4242
uses: actions/[email protected]
4343
with:
44-
dotnet-version: '8.0.101'
44+
dotnet-version: '9.0.100-rc.2.24474.11'
4545
include-prerelease: true
4646

4747
- run: |
4848
cd src/Uno.Playground.WASM
49-
dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}"
49+
dotnet publish -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}"
5050
name: Build WebAssembly app
5151
5252
- uses: actions/upload-artifact@v4

.vsts-ci.Linux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
displayName: 'Use .NET SDK'
1818
inputs:
1919
packageType: sdk
20-
version: 8.0.100-preview.4.23260.5
20+
version: 9.0.100-rc.2.24474.11
2121
includePreviewVersions: true
2222

2323
- template: build/canary-updater.yml
2424
- template: build/gitversion.yml
2525

2626
- script: |
2727
cd $(build.sourcesdirectory)
28-
dotnet msbuild /r /p:Configuration=Release $(build.sourcesdirectory)/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /bl:$(build.artifactstagingdirectory)/linux.binlog
28+
dotnet publish -c Release $(build.sourcesdirectory)/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /bl:$(build.artifactstagingdirectory)/linux.binlog
2929
3030
env:
3131
GITVERSION_FullSemVer: $(GITVERSION_FullSemVer)
@@ -34,7 +34,7 @@ jobs:
3434
- task: CopyFiles@2
3535
displayName: 'Publish Wasm Binaries'
3636
inputs:
37-
SourceFolder: $(build.sourcesdirectory)/src/Uno.Playground.WASM/bin/Release/net8.0/dist
37+
SourceFolder: $(build.sourcesdirectory)/src/Uno.Playground.WASM/bin/Release/net9.0/publish/wwwroot
3838
Contents: '**/*.*'
3939
TargetFolder: $(build.artifactstagingdirectory)/wasm
4040
CleanTargetFolder: false

.vsts-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
displayName: 'Use .NET SDK'
2525
inputs:
2626
packageType: sdk
27-
version: 8.0.101
27+
version: 9.0.100-rc.2.24474.11
2828
includePreviewVersions: true
2929

3030
- template: build/canary-updater.yml
3131
- template: build/gitversion.yml
3232

3333
- script: |
3434
cd $(build.sourcesdirectory)
35-
dotnet msbuild /r /p:Configuration=Release $(build.sourcesdirectory)/src/Uno.Playground-playground-only.slnf "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /bl:$(build.artifactstagingdirectory)/playground.binlog
35+
dotnet publish -c Release $(build.sourcesdirectory)/src/Uno.Playground-playground-only.slnf "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /bl:$(build.artifactstagingdirectory)/playground.binlog
3636
3737
displayName: 'Build Playground'
3838

src/Uno.Playground.WASM/Uno.Playground.WASM.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<AssemblyName>Uno.Playground.WASM</AssemblyName>
77
<RootNamespace>Uno.Playground.WASM</RootNamespace>
88
<WasmHead>true</WasmHead>
@@ -11,7 +11,7 @@
1111

1212
<!--<UseAOT Condition="$([MSBuild]::IsOsPlatform('Linux')) or ( $([MSBuild]::IsOsPlatform('Windows')) and '$(BUILD_REPOSITORY_PROVIDER)'=='' )">true</UseAOT>-->
1313
<WasmShellMonoRuntimeExecutionMode Condition="'$(UseAOT)'=='true'">InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode>
14-
<!--<WasmShellEnableJiterpreter>true</WasmShellEnableJiterpreter>-->
14+
<WasmShellEnableJiterpreter>true</WasmShellEnableJiterpreter>
1515
<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
1616
<!--<WasmShellDisableSDKCheckSumValidation>true</WasmShellDisableSDKCheckSumValidation>-->
1717
<!--<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>-->
@@ -102,16 +102,16 @@
102102
<PackageReference Include="Uno.Toolkit.WinUI" Version="6.2.0-dev.6" />
103103
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="6.2.0-dev.6" />
104104

105-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.3.90" />
106-
<PackageReference Include="Uno.WinUI.Lottie" Version="5.3.90" />
105+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.6.0-dev.127" />
106+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.6.0-dev.127" />
107107
<PackageReference Include="Uno.Core.Extensions" Version="4.1.1" />
108108
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.1.1" />
109109
<PackageReference Include="Uno.Core" Version="4.1.1" />
110-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.3.90" Condition="'$(Configuration)'=='Debug'" />
111-
<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.3.90" />
112-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.90" />
113-
<PackageReference Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.96" />
114-
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.96" />
110+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.6.0-dev.127" Condition="'$(Configuration)'=='Debug'" />
111+
<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.6.0-dev.127" />
112+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.6.0-dev.127" />
113+
<PackageReference Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.333" />
114+
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.333" />
115115
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
116116
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
117117

0 commit comments

Comments
 (0)