Merge pull request #18773 from unoplatform/dev/jela/net9rtm

chore: Update to net9 rtm
unoplatform · Nov 16, 2024 · 13eea97 · 13eea97
2 parents 19f1ce5 + 99e1c5e
commit 13eea97
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 10 deletions.
diff --git a/.github/workflows/uwp-autoconvert.yml b/.github/workflows/uwp-autoconvert.yml
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  UnoCheck_Version: '1.26.0-dev.63'
+  UnoCheck_Version: '1.27.0-dev.8'
 
 jobs:
   build:

diff --git a/.vsts-ci-docs.yml b/.vsts-ci-docs.yml
@@ -17,7 +17,7 @@ pr:
       - legacy/*
 
 variables:
-  windowsScaledPool: 'Windows2022-20240421'
+  windowsScaledPool: 'Windows2022-20241021-1'
   linuxVMImage: 'ubuntu-latest'
 
 stages:

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -53,7 +53,7 @@ variables:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   windows2019HostedVMImage: 'windows-2019'
   windows2022HostedVMImage: 'windows-2022'
-  windowsScaledPool: 'Windows2022-20240421'
+  windowsScaledPool: 'Windows2022-20241021-1'
   linuxVMImage: 'ubuntu-latest'
   linuxScaledPool: 'Ubuntu2204-20230918'
   macOSVMImage: 'macOS-15'

diff --git a/build/ci/net9/global.json b/build/ci/net9/global.json
@@ -1,11 +1,11 @@
 {
 	"sdk": {
-		"version": "9.0.100-rc.2.24474.11",
+		"version": "9.0.100",
 		"allowPrerelease": true,
 		"rollForward": "disable"
 	},
 	"tools": {
-		"dotnet": "9.0.100-rc.2.24474.11"
+		"dotnet": "9.0.100"
 	},
 	"msbuild-sdks": {
 		"MSBuild.Sdk.Extras": "3.0.44",

diff --git a/build/ci/templates/dotnet-mobile-install-linux.yml b/build/ci/templates/dotnet-mobile-install-linux.yml
@@ -1,5 +1,5 @@
 parameters:
-  UnoCheck_Version: '1.26.0-dev.63'
+  UnoCheck_Version: '1.27.0-dev.8'
 
 steps:
 

diff --git a/build/ci/templates/dotnet-mobile-install-mac.yml b/build/ci/templates/dotnet-mobile-install-mac.yml
@@ -1,5 +1,5 @@
 parameters:
-  UnoCheck_Version: '1.26.0-dev.63'
+  UnoCheck_Version: '1.27.0-dev.8'
 
 steps:
 

diff --git a/build/ci/templates/dotnet-mobile-install-windows.yml b/build/ci/templates/dotnet-mobile-install-windows.yml
@@ -1,5 +1,5 @@
 parameters:
-  UnoCheck_Version: '1.26.0-dev.63'
+  UnoCheck_Version: '1.27.0-dev.8'
 
 steps:
 

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -96,6 +96,12 @@
 		<PackageReference Update="Xamarin.UITest" Version="4.3.5" />
 		<PackageReference Update="Xamarin.TestCloud.Agent" Version="0.23.2" />
 		<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
+		<PackageReference Update="System.Private.Uri" Version="4.3.2" />
+		<PackageReference Update="System.Net.Http" Version="4.3.4" />
+		<PackageReference Update="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Update="NuGet.Packaging" Version="6.3.4" />
+		<PackageReference Update="System.Formats.Asn1" Version="8.0.1" />
+		<PackageReference Update="System.Text.Json" Version="8.0.5" />
 
 		<PackageReference Update="SkiaSharp.Views" Version="$(SkiaSharpVersion)" />
 		<PackageReference Update="SkiaSharp.Views.Uno" Version="$(SkiaSharpVersion)" />

diff --git a/src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj b/src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj
@@ -49,6 +49,9 @@
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
 		<Manifest Include="$(ApplicationManifest)" />
+
+		<!-- https://github.com/NuGet/Home/issues/7344 -->
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 	</ItemGroup>
 
 	<!--

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/Uno.UI.SourceGenerators.Tests.csproj b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/Uno.UI.SourceGenerators.Tests.csproj
@@ -47,6 +47,11 @@
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest" Version="1.1.2-beta1.23578.3" Condition="'$(UNO_UWP_BUILD)'=='false'" />
 		<PackageReference Include="FluentAssertions" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Condition="'$(UNO_UWP_BUILD)'=='false'" />
+		<PackageReference Include="NuGet.Packaging" Version="6.3.4" />
+		<PackageReference Include="System.Text.Json" Version="8.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<Reference Include="$(NuGetPackageRoot)\communitytoolkit.mvvm\$(CommunityToolkitMvvmVersion)\analyzers\dotnet\roslyn4.3\cs\CommunityToolkit.Mvvm.SourceGenerators.dll" Condition="'$(UNO_UWP_BUILD)'=='false'" />
 	</ItemGroup>
 

diff --git a/src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj b/src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj
@@ -20,6 +20,9 @@
 		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" ExcludeAssets="runtime" />
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" ExcludeAssets="runtime" />
 		<PackageReference Include="Mono.Cecil" Version="0.11.4" />
+
+		<!-- https://github.com/NuGet/Home/issues/7344 -->
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj b/src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj
@@ -25,6 +25,11 @@
 		<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(CodeAnalysisVersionForAnalyzersTests)" />
 
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.2-beta1.23578.3" />
+
+		<PackageReference Include="NuGet.Packaging" Version="6.0.2" />
+		<PackageReference Include="System.Formats.Asn1" Version="6.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json b/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json
@@ -1,11 +1,11 @@
 {
 	"sdk": {
-		"version": "9.0.100-rc.2.24474.11",
+		"version": "9.0.100",
 		"allowPrerelease": true,
 		"rollForward": "latestFeature"
 	},
 	"tools": {
-		"dotnet": "9.0.100-rc.2.24474.11"
+		"dotnet": "9.0.100"
 	},
 	"msbuild-sdks": {
 		"MSBuild.Sdk.Extras": "3.0.44"

diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj
@@ -64,6 +64,11 @@
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
 
+		<!-- https://github.com/NuGet/Home/issues/7344 -->
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+		<!-- https://github.com/NuGet/Home/issues/7344 -->
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+
 		<!-- We remove Unit tests imported from MUX on UAP as they are usualy heavily relying on internal classes.-->
 		<Compile Remove="$(MSBuildThisFileDirectory)MUX\Microsoft_UI_XAML_Controls\**\*.cs" />
 	</ItemGroup>

diff --git a/src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj b/src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj
@@ -38,6 +38,11 @@
 		<PackageReference Include="FluentAssertions" />
 		<PackageReference Include="Moq" Version="4.17.2" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" PrivateAssets="all" />
+
+		<!-- https://github.com/NuGet/Home/issues/7344 -->
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<!-- https://github.com/NuGet/Home/issues/7344 -->
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 	</ItemGroup>
 
 	<ItemGroup>