From 22cbd8fe91ced00c9c82d38c7ffc1ed654aef99a Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Tue, 8 Oct 2024 18:39:53 +0100 Subject: [PATCH 1/2] Update .NET SDKs Update .NET 8 and 9 SDKs to their latest versions. --- nuget/Dockerfile | 4 ++-- nuget/helpers/lib/NuGetUpdater/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nuget/Dockerfile b/nuget/Dockerfile index b7fcb693a5d..c79edc9296f 100644 --- a/nuget/Dockerfile +++ b/nuget/Dockerfile @@ -26,8 +26,8 @@ RUN ARCH=$([ $TARGETARCH = "arm64" ] && echo "arm64" || echo "x64") \ && pwsh --version # Install .NET SDK -ARG DOTNET_LTS_SDK_VERSION=8.0.402 -ARG DOTNET_STS_SDK_VERSION=9.0.100-rc.1.24452.12 +ARG DOTNET_LTS_SDK_VERSION=8.0.403 +ARG DOTNET_STS_SDK_VERSION=9.0.100-rc.2.24474.11 ARG DOTNET_SDK_INSTALL_URL=https://dot.net/v1/dotnet-install.sh ENV DOTNET_INSTALL_DIR=/usr/local/dotnet/current ENV DOTNET_INSTALL_SCRIPT_PATH=/tmp/dotnet-install.sh diff --git a/nuget/helpers/lib/NuGetUpdater/global.json b/nuget/helpers/lib/NuGetUpdater/global.json index 32ee2b04c85..2c2ec83c24c 100644 --- a/nuget/helpers/lib/NuGetUpdater/global.json +++ b/nuget/helpers/lib/NuGetUpdater/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100-rc.1.24452.12", + "version": "9.0.100-rc.2.24474.11", "rollForward": "latestMinor" } } \ No newline at end of file From fbc198744934842628a5acd98cc1d7c2d9a367ea Mon Sep 17 00:00:00 2001 From: martincostello Date: Wed, 9 Oct 2024 15:38:52 +0100 Subject: [PATCH 2/2] Fix test Bump Microsoft.Windows.SDK.NET.Ref version. --- .../Update/UpdateWorkerTests.PackageReference.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackageReference.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackageReference.cs index 0181432b693..7eb737c53c2 100644 --- a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackageReference.cs +++ b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackageReference.cs @@ -310,7 +310,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"), MockNuGetPackage.CreateSimplePackage("Some.Package", "13.0.1", "net8.0"), // necessary for the `net8.0-windows10.0.19041.0` TFM - new("Microsoft.Windows.SDK.NET.Ref", "10.0.19041.34", Files: + new("Microsoft.Windows.SDK.NET.Ref", "10.0.19041.45", Files: [ ("data/FrameworkList.xml", Encoding.UTF8.GetBytes("""