Skip to content

Commit 898435b

Browse files
committed
chore: move to net9
1 parent 90f328b commit 898435b

28 files changed

Lines changed: 57 additions & 57 deletions

File tree

.github/workflows/azure-static-app.yml

Lines changed: 1 addition & 1 deletion
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: testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
17+
DIST_PATH: testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/dist
1818

1919
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
2020
runs-on: ubuntu-24.04

build/ci/scripts/wasm-uitest-run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ export UNO_UITEST_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarnes
1313
export UNO_UITEST_LOGFILE=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/wasm/nunit-log.txt
1414
export UNO_UITEST_WASM_SOLUTION=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.sln
1515
export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/TestHarness.csproj
16-
export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist/
16+
export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/dist/
1717
export UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS=" /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false"
1818

1919
cd $BUILD_SOURCESDIRECTORY
2020

2121
dotnet build -c Release $UNO_UITEST_WASM_SOLUTION /p:IsUiAutomationMappingEnabled=True /p:UseWebAssemblyAOT=false /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false /bl:$BIN_LOG_PATH
2222

2323
# Start the server
24-
dotnet run --project $UNO_UITEST_WASM_PROJECT -f net8.0-browserwasm /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false -c Release --no-build &
24+
dotnet run --project $UNO_UITEST_WASM_PROJECT -f net9.0-browserwasm /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false -c Release --no-build &
2525

2626
cd $BUILD_SOURCESDIRECTORY/build
2727

build/ci/stage-build-runtimetests-skia.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
- script: xvfb-run --auto-servernum --server-args='-screen 0 1280x1024x24' dotnet Uno.Extensions.RuntimeTests.dll
4545
displayName: 'Run Runtime Tests'
46-
workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/bin/Debug/net8.0-desktop
46+
workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/bin/Debug/net9.0-desktop
4747
env:
4848
UNO_RUNTIME_TESTS_RUN_TESTS: '{}'
4949
UNO_RUNTIME_TESTS_OUTPUT_PATH: '$(Common.TestResultsDirectory)/skia-runtime-tests-results.xml'

build/ci/stage-build-wasm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- task: CopyFiles@2
2020
displayName: 'Publish Wasm Binaries'
2121
inputs:
22-
SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
22+
SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/dist
2323
Contents: '**/*.*'
2424
TargetFolder: $(build.artifactstagingdirectory)/Wasm
2525
CleanTargetFolder: false

build/tests.runsettings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RunSettings>
33
<TargetPlatform>x86</TargetPlatform>
4-
<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
4+
<TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
55
<TestSessionTimeout>10000</TestSessionTimeout>
66
<TreatNoTestsAsError>true</TreatNoTestsAsError>
77
</RunSettings>

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<_IsNetCore Condition="'$(TargetFramework)'=='net5.0'">true</_IsNetCore>
7979

8080
<_IsNetStd>false</_IsNetStd>
81-
<_IsNetStd Condition="'$(TargetFramework)'=='net8.0' or $(_IsNetCore)">true</_IsNetStd>
81+
<_IsNetStd Condition="'$(TargetFramework)'=='net9.0' or $(_IsNetCore)">true</_IsNetStd>
8282

8383
<_IsUWP>false</_IsUWP>
8484
<_IsUWP Condition="$(TargetFramework.StartsWith('uap'))">true</_IsUWP>

src/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</Otherwise>
7676
</Choose>
7777

78-
<Target Name="AndroidResourceGenWorkaround" BeforeTargets="Build" Condition="'$(AndroidUseIntermediateDesignerFile)'=='True' and $(IsMonoAndroid) and '$(TargetFramework)'!='net8.0-android'">
78+
<Target Name="AndroidResourceGenWorkaround" BeforeTargets="Build" Condition="'$(AndroidUseIntermediateDesignerFile)'=='True' and $(IsMonoAndroid) and '$(TargetFramework)'!='net9.0-android'">
7979
<Message Importance="high" Text="************************* Making Resources DIR" />
8080
<MakeDir Directories="obj\$(TargetFramework)\Resources" />
8181
<WriteLinesToFile File="$(AndroidResgenFile)" Lines="// Empty Content from uno.ui Directory.Build.targets." />

src/Uno.Extensions.Core.Tests/Uno.Extensions.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
77
<CompilerGeneratedFilesOutputPath>obj/g</CompilerGeneratedFilesOutputPath>

src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<None Remove="WasmScripts\**" />
2626
</ItemGroup>
2727

28-
<ItemGroup Condition="'$(IsBrowserWasm)'=='true' or '$(TargetFramework)' == 'net8.0' ">
28+
<ItemGroup Condition="'$(IsBrowserWasm)'=='true' or '$(TargetFramework)' == 'net9.0' ">
2929
<None Remove="WasmScripts\**" />
3030
<EmbeddedResource Include="WasmScripts\**" />
3131
</ItemGroup>

src/Uno.Extensions.Http.Kiota/Uno.Extensions.Http.Kiota.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

0 commit comments

Comments
 (0)