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

chore: Update to net9 rtm #18773

Merged
merged 8 commits into from
Nov 16, 2024
Merged

chore: Update to net9 rtm #18773

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
bd28a57
chore: Update to net9 rtm
jeromelaban Nov 12, 2024
200ae5e
chore: Bump to pool Windows2022-20241021-1, use vs17.12
jeromelaban Nov 14, 2024
a38648b
chore: Adjust for packages vulnerabilities
jeromelaban Nov 14, 2024
1d3362d
chore: Adjust package inclusion
jeromelaban Nov 14, 2024
dc571fe
chore: Adjust ASN1 package
jeromelaban Nov 14, 2024
b8d8554
chore: Adjust asn1
jeromelaban Nov 14, 2024
2607c44
chore: More explicit package references
jeromelaban Nov 14, 2024
99e1c5e
chore: Update docs image
jeromelaban Nov 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/uwp-autoconvert.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .vsts-ci-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pr:
- legacy/*

variables:
windowsScaledPool: 'Windows2022-20240421'
windowsScaledPool: 'Windows2022-20241021-1'
linuxVMImage: 'ubuntu-latest'

stages:
Expand Down
2 changes: 1 addition & 1 deletion .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions build/ci/net9/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion build/ci/templates/dotnet-mobile-install-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
UnoCheck_Version: '1.26.0-dev.63'
UnoCheck_Version: '1.27.0-dev.8'

steps:

Expand Down
2 changes: 1 addition & 1 deletion build/ci/templates/dotnet-mobile-install-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
UnoCheck_Version: '1.26.0-dev.63'
UnoCheck_Version: '1.27.0-dev.8'

steps:

Expand Down
2 changes: 1 addition & 1 deletion build/ci/templates/dotnet-mobile-install-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
UnoCheck_Version: '1.26.0-dev.63'
UnoCheck_Version: '1.27.0-dev.8'

steps:

Expand Down
6 changes: 6 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
3 changes: 3 additions & 0 deletions src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<!--
Expand Down
5 changes: 5 additions & 0 deletions src/SourceGenerators/Uno.UI.SourceGenerators.Tests/Uno.UI.SourceGenerators.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 3 additions & 0 deletions src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 5 additions & 0 deletions src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading