Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to net9 #533

Merged
merged 8 commits into from
Oct 18, 2024
Merged

Update to net9 #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5cbbcab
chore: Bump to net9
jeromelaban Sep 20, 2024
717ca88
chore: Adjust .NET version
jeromelaban Sep 20, 2024
c7c4c41
chore: Adjust .NET SDK
jeromelaban Sep 20, 2024
3d6fc3d
chore: Update to latest bootstrapper
jeromelaban Oct 17, 2024
49d9fb5
chore: Enable jiterepreter
jeromelaban Oct 18, 2024
2504628
chore: rc2 build
jeromelaban Oct 18, 2024
452cef6
chore: Update to latest uno
jeromelaban Oct 18, 2024
a39097e
chore: Adjust gha netcore
jeromelaban Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading