Skip to content

Commit

Permalink
Merge pull request #533 from unoplatform/dev/jela/net9
Browse files Browse the repository at this point in the history
Update to net9
  • Loading branch information
jeromelaban authored Oct 18, 2024
2 parents a8705e4 + a39097e commit 7625d21
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
build_and_deploy_job:
env:
DIST_PATH: src/Uno.Playground.WASM/bin/Release/net8.0/dist
DIST_PATH: src/Uno.Playground.WASM/bin/Release/net9.0/publish/wwwroot

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

- run: |
cd src/Uno.Playground.WASM
dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}"
dotnet publish -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}"
name: Build WebAssembly app
- uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions .vsts-ci.Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
displayName: 'Use .NET SDK'
inputs:
packageType: sdk
version: 8.0.100-preview.4.23260.5
version: 9.0.100-rc.2.24474.11
includePreviewVersions: true

- template: build/canary-updater.yml
- template: build/gitversion.yml

- script: |
cd $(build.sourcesdirectory)
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
dotnet publish -c Release $(build.sourcesdirectory)/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /bl:$(build.artifactstagingdirectory)/linux.binlog
env:
GITVERSION_FullSemVer: $(GITVERSION_FullSemVer)
Expand All @@ -34,7 +34,7 @@ jobs:
- task: CopyFiles@2
displayName: 'Publish Wasm Binaries'
inputs:
SourceFolder: $(build.sourcesdirectory)/src/Uno.Playground.WASM/bin/Release/net8.0/dist
SourceFolder: $(build.sourcesdirectory)/src/Uno.Playground.WASM/bin/Release/net9.0/publish/wwwroot
Contents: '**/*.*'
TargetFolder: $(build.artifactstagingdirectory)/wasm
CleanTargetFolder: false
Expand Down
4 changes: 2 additions & 2 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
displayName: 'Use .NET SDK'
inputs:
packageType: sdk
version: 8.0.101
version: 9.0.100-rc.2.24474.11
includePreviewVersions: true

- template: build/canary-updater.yml
- template: build/gitversion.yml

- script: |
cd $(build.sourcesdirectory)
dotnet msbuild /r /p:Configuration=Release $(build.sourcesdirectory)/src/Uno.Playground-playground-only.slnf "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /bl:$(build.artifactstagingdirectory)/playground.binlog
dotnet publish -c Release $(build.sourcesdirectory)/src/Uno.Playground-playground-only.slnf "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /bl:$(build.artifactstagingdirectory)/playground.binlog
displayName: 'Build Playground'
Expand Down
20 changes: 10 additions & 10 deletions src/Uno.Playground.WASM/Uno.Playground.WASM.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.WebAssembly">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<AssemblyName>Uno.Playground.WASM</AssemblyName>
<RootNamespace>Uno.Playground.WASM</RootNamespace>
<WasmHead>true</WasmHead>
Expand All @@ -11,7 +11,7 @@

<!--<UseAOT Condition="$([MSBuild]::IsOsPlatform('Linux')) or ( $([MSBuild]::IsOsPlatform('Windows')) and '$(BUILD_REPOSITORY_PROVIDER)'=='' )">true</UseAOT>-->
<WasmShellMonoRuntimeExecutionMode Condition="'$(UseAOT)'=='true'">InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode>
<!--<WasmShellEnableJiterpreter>true</WasmShellEnableJiterpreter>-->
<WasmShellEnableJiterpreter>true</WasmShellEnableJiterpreter>
<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
<!--<WasmShellDisableSDKCheckSumValidation>true</WasmShellDisableSDKCheckSumValidation>-->
<!--<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>-->
Expand Down Expand Up @@ -102,16 +102,16 @@
<PackageReference Include="Uno.Toolkit.WinUI" Version="6.2.0-dev.6" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="6.2.0-dev.6" />

<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.3.90" />
<PackageReference Include="Uno.WinUI.Lottie" Version="5.3.90" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.6.0-dev.127" />
<PackageReference Include="Uno.WinUI.Lottie" Version="5.6.0-dev.127" />
<PackageReference Include="Uno.Core.Extensions" Version="4.1.1" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.1.1" />
<PackageReference Include="Uno.Core" Version="4.1.1" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.3.90" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.3.90" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.90" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.96" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.96" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.6.0-dev.127" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.6.0-dev.127" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.6.0-dev.127" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.333" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.333" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />

Expand Down

0 comments on commit 7625d21

Please sign in to comment.