chore: move to net9

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

@@ -14,22 +14,22 @@ on:
 jobs:
   build_and_deploy_job:
     env:
-      DIST_PATH: testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
+      DIST_PATH: testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/wwwroot
 
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-24.04
     container: 'unoplatform/wasm-build:3.0'
     name: Build and Deploy Job
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0 # Required for gitversion
           submodules: true
 
-      - name: Setup dotnet 8.0.301
-        uses: actions/setup-dotnet@v3
+      - name: Setup dotnet 9.0.308
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.301'
+          dotnet-version: '9.0.308'
 
       - uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
         id: nbgv

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

@@ -13,15 +13,15 @@ export UNO_UITEST_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarnes
 export UNO_UITEST_LOGFILE=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/wasm/nunit-log.txt
 export UNO_UITEST_WASM_SOLUTION=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.sln
 export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/TestHarness.csproj
-export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist/
+export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/dist/
 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"
 
 cd $BUILD_SOURCESDIRECTORY
 
 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
 
 # Start the server
-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 &
+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 &
 
 cd $BUILD_SOURCESDIRECTORY/build
 

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

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

build/ci/stage-build-uitests-wasm.yml

@@ -36,6 +36,7 @@ jobs:
       testResultsFormat: 'NUnit'
       testResultsFiles: '$(build.sourcesdirectory)/build/TestResult.xml'
       failTaskOnFailedTests: true
+      failTaskOnMissingResultsFile: true
 
   - task: PublishBuildArtifacts@1
     condition: always()

build/ci/stage-build-wasm.yml

@@ -19,7 +19,7 @@ jobs:
   - task: CopyFiles@2
     displayName: 'Publish Wasm Binaries'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
+      SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net9.0-browserwasm/wwwroot
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/Wasm
       CleanTargetFolder: false

build/tests.runsettings

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
 	<TargetPlatform>x86</TargetPlatform>
-	<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
+	<TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
 	<TestSessionTimeout>10000</TestSessionTimeout>
 	<TreatNoTestsAsError>true</TreatNoTestsAsError>
 </RunSettings>

global.json

@@ -2,6 +2,6 @@
   "msbuild-sdks": {
     "MSBuild.Sdk.Extras": "3.0.44",
     "Uno.Sdk": "6.0.67",
-    "Uno.Sdk.Private": "6.0.465"
+    "Uno.Sdk.Private": "6.4.43"
   }
 }

samples/Directory.Packages.props

@@ -1,36 +1,25 @@
 <Project ToolsVersion="15.0">
 	<PropertyGroup>
-		<!-- <UnoVersion>6.0.465</UnoVersion> -->
-		<UnoExtensionsVersion>5.3.8</UnoExtensionsVersion>
-		<UnoToolkitVersion>7.0.7</UnoToolkitVersion>
-		<UnoThemesVersion>5.5.1</UnoThemesVersion>
-		<UnoCSharpMarkupVersion>6.0.15</UnoCSharpMarkupVersion>
-		<UnoWasmBootstrapVersion>8.0.23</UnoWasmBootstrapVersion>
-		<UnoLoggingVersion>1.7.0</UnoLoggingVersion>
-		<UnoCoreLoggingSingletonVersion>4.1.1</UnoCoreLoggingSingletonVersion>
-		<UnoUniversalImageLoaderVersion>1.9.37</UnoUniversalImageLoaderVersion>
-		<UnoDspTasksVersion>1.4.0</UnoDspTasksVersion>
-		<UnoResizetizerVersion>1.8.1</UnoResizetizerVersion>
-		<SkiaSharpVersion>3.119.0-preview.1.2</SkiaSharpVersion>
+		<SkiaSharpVersion>3.119.1</SkiaSharpVersion>
 		<SvgSkiaVersion>3.0.2</SvgSkiaVersion>
-		<WinAppSdkVersion>1.7.250513003</WinAppSdkVersion>
-		<WinAppSdkBuildToolsVersion>10.0.26100.4188</WinAppSdkBuildToolsVersion>
-		<MicrosoftLoggingVersion>8.0.1</MicrosoftLoggingVersion>
+		<WinAppSdkVersion>1.7.250909003</WinAppSdkVersion>
+		<WinAppSdkBuildToolsVersion>10.0.26100.4948</WinAppSdkBuildToolsVersion>
+		<MicrosoftLoggingVersion>9.0.9</MicrosoftLoggingVersion>
 		<WindowsCompatibilityVersion>8.0.15</WindowsCompatibilityVersion>
 		<MicrosoftIdentityClientVersion>4.70.2</MicrosoftIdentityClientVersion>
 		<CommunityToolkitMvvmVersion>8.4.0</CommunityToolkitMvvmVersion>
 		<PrismVersion>9.0.537</PrismVersion>
-		<AndroidMaterialVersion>1.12.0.2</AndroidMaterialVersion>
-		<AndroidXLegacySupportV4Version>1.0.0.23</AndroidXLegacySupportV4Version>
+		<AndroidMaterialVersion>1.12.0.3</AndroidMaterialVersion>
+		<AndroidXLegacySupportV4Version>1.0.0.33</AndroidXLegacySupportV4Version>
 		<AndroidXSplashScreenVersion>1.0.1.14</AndroidXSplashScreenVersion>
-		<AndroidXAppCompatVersion>1.7.0.5</AndroidXAppCompatVersion>
-		<AndroidXRecyclerViewVersion>1.3.2.10</AndroidXRecyclerViewVersion>
-		<AndroidXActivityVersion>1.9.3.2</AndroidXActivityVersion>
-		<AndroidXBrowserVersion>1.8.0.8</AndroidXBrowserVersion>
-		<AndroidXSwipeRefreshLayoutVersion>1.1.0.24</AndroidXSwipeRefreshLayoutVersion>
-		<AndroidXNavigationVersion>2.8.5.1</AndroidXNavigationVersion>
-		<AndroidXCollectionVersion>1.4.5.2</AndroidXCollectionVersion>
-		<MauiVersion>8.0.100</MauiVersion>
+		<AndroidXAppCompatVersion>1.7.1.1</AndroidXAppCompatVersion>
+		<AndroidXRecyclerViewVersion>1.4.0.3</AndroidXRecyclerViewVersion>
+		<AndroidXActivityVersion>1.10.1.3</AndroidXActivityVersion>
+		<AndroidXBrowserVersion>1.8.0.9</AndroidXBrowserVersion>
+		<AndroidXSwipeRefreshLayoutVersion>1.1.0.27</AndroidXSwipeRefreshLayoutVersion>
+		<AndroidXNavigationVersion>2.8.9.1</AndroidXNavigationVersion>
+		<AndroidXCollectionVersion>1.5.0.3</AndroidXCollectionVersion>
+		<MauiVersion>9.0.120</MauiVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -59,6 +48,12 @@
 		<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="$(AndroidXCollectionVersion)" />
 		<PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="$(AndroidXCollectionVersion)" />
 
+		<PackageVersion Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="$(AndroidXSwipeRefreshLayoutVersion)" />
+		<PackageVersion Include="Xamarin.AndroidX.RecyclerView" Version="$(AndroidXRecyclerViewVersion)" />
+		<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="$(AndroidXAppCompatVersion)" />
+		<PackageVersion Include="Xamarin.AndroidX.Activity" Version="$(AndroidXActivityVersion)" />
+
+
 		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(WinAppSdkBuildToolsVersion)" />
 		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WinAppSdkVersion)" />
 	</ItemGroup>

samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj

@@ -39,7 +39,7 @@
 			This causes the buidl to fail as we 2 different references to the WebView2Loader.dll.
 			By setting this property, we force the Uno.Sdk[.Private] to use the same version as the one used when building the extension packages.
 		-->
-		<WinAppSdkVersion>1.7.250513003</WinAppSdkVersion>
+		<WinAppSdkVersion>1.7.250909003</WinAppSdkVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

samples/Playground/Playground/Playground.csproj

@@ -40,7 +40,7 @@
 			This causes the buidl to fail as we 2 different references to the WebView2Loader.dll.
 			By setting this property, we force the Uno.Sdk[.Private] to use the same version as the one used when building the extension packages.
 		-->
-		<WinAppSdkVersion>1.7.250513003</WinAppSdkVersion>
+		<WinAppSdkVersion>1.7.250909003</WinAppSdkVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

src/Directory.Build.props

@@ -78,7 +78,7 @@
 		<_IsNetCore Condition="'$(TargetFramework)'=='net5.0'">true</_IsNetCore>
 
 		<_IsNetStd>false</_IsNetStd>
-		<_IsNetStd Condition="'$(TargetFramework)'=='net8.0' or $(_IsNetCore)">true</_IsNetStd>
+		<_IsNetStd Condition="'$(TargetFramework)'=='net9.0' or $(_IsNetCore)">true</_IsNetStd>
 
 		<_IsUWP>false</_IsUWP>
 		<_IsUWP Condition="$(TargetFramework.StartsWith('uap'))">true</_IsUWP>

src/Directory.Build.targets

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

src/Directory.Packages.props

@@ -7,7 +7,7 @@
     <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageVersion Include="FluentAssertions" Version="6.7.0" />
     <PackageVersion Include="Duende.IdentityModel.OidcClient" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.9" />
     <PackageVersion Include="Microsoft.Kiota.Abstractions" Version="1.16.4" />
     <PackageVersion Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.16.4" />
     <PackageVersion Include="Microsoft.Kiota.Serialization.Form" Version="1.16.4" />
@@ -18,22 +18,22 @@
     <PackageVersion Include="MSTest.TestFramework" Version="2.2.9" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
     <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.61.3" />
     <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.61.3" />
-    <PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.100" />
-    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.100" />
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.120" />
+    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.2.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
-    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.2.0" />
+    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
     <PackageVersion Include="Moq" Version="4.17.2" />
     <PackageVersion Include="Refit" Version="7.2.22" />
     <PackageVersion Include="Refit.HttpClientFactory" Version="7.2.22" />

src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs

@@ -4,6 +4,9 @@
 using Uno.Extensions.Logging;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 #if UNO_EXT_MSAL
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 using MsalCacheHelper = Microsoft.Identity.Client.Extensions.Msal.MsalCacheHelper;
 #endif
 
@@ -246,7 +249,7 @@ private ValueTask<AuthenticationResult> AcquireInteractiveTokenAsync(IDispatcher
 		try
 		{
 			Logger.LogInformation("Attempting to perform silent sign in . . .");
-			Logger.LogInformation($"Authentication Scopes: {JsonSerializer.Serialize(_scopes)}");
+			Logger.LogInformation($"Authentication Scopes: {ToJson(_scopes)}");
 
 			Logger.LogInformation($"Account Name: {firstAccount.Username}");
 
@@ -268,5 +271,24 @@ private ValueTask<AuthenticationResult> AcquireInteractiveTokenAsync(IDispatcher
 
 		return default;
 	}
+
+	static string? ToJson (string[]? values)
+	{
+		if (values == null)
+		{
+			return null;
+		}
+
+		return JsonSerializer.Serialize(values, StringArrayJsonSerializerContext.Default.StringArray);
+	}
+
 #endif
 }
+
+#if UNO_EXT_MSAL
+[JsonSourceGenerationOptions]
+[JsonSerializable(typeof(string[]))]
+internal sealed partial class StringArrayJsonSerializerContext : JsonSerializerContext
+{
+}
+#endif  // UNO_EXT_MSAL

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
 		<CompilerGeneratedFilesOutputPath>obj/g</CompilerGeneratedFilesOutputPath>

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

@@ -25,7 +25,7 @@
 		<None Remove="WasmScripts\**" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(IsBrowserWasm)'=='true' or '$(TargetFramework)' == 'net8.0' ">
+	<ItemGroup Condition="'$(IsBrowserWasm)'=='true' or '$(TargetFramework)' == 'net9.0' ">
 		<None Remove="WasmScripts\**" />
 		<EmbeddedResource Include="WasmScripts\**" />
 	</ItemGroup>

src/Uno.Extensions.Hosting.UI/UnoHost.cs

@@ -1,4 +1,6 @@
-namespace Uno.Extensions.Hosting;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Uno.Extensions.Hosting;
 
 /// <summary>
 /// Contains helpers to create a HostBuilder that is tailored to multiple target platforms.
@@ -59,7 +61,7 @@ public static IHostBuilder CreateDefaultBuilder(Assembly applicationAssembly, st
 	{
 		PlatformHelper.SetAppAssembly(applicationAssembly);
 		applicationAssembly = PlatformHelper.GetAppAssembly()!;
-		return new HostBuilder()
+		var builder = new HostBuilder()
 			.ConfigureCustomDefaults(args)
 			.ConfigureAppConfiguration((ctx, appConfig) =>
 			{
@@ -102,7 +104,15 @@ public static IHostBuilder CreateDefaultBuilder(Assembly applicationAssembly, st
 						config.AddInMemoryCollection(queryDict);
 					}
 				})
-			.ConfigureServices((ctx, services) => services.Configure<HostConfiguration>(ctx.Configuration.GetSection(nameof(HostConfiguration))))
 			.UseStorage();
+		return ConfigureHostConfigurationServices(builder);
+
+		[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "🤷‍♂️")]
+		static IHostBuilder ConfigureHostConfigurationServices(IHostBuilder builder)
+		{
+			builder
+				.ConfigureServices((ctx, services) => services.Configure<HostConfiguration>(ctx.Configuration.GetSection(nameof(HostConfiguration))));
+			return builder;
+		}
 	}
 }

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>