diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index ea94169d60f6..c9caa8761041 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 1818ed2babf890a1cd62fa96a1f03abdada2d003 + 4f2968fce08735a7e22fca6bd4c99d003221d716 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 0f0784c94bf6..68b832736abc 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,9 +23,9 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 10.0.100-alpha.1.24556.1 - 10.0.100-alpha.1.24556.1 - 0.1.0-10.0.100-6 + 10.0.100-alpha.1.24620.1 + 10.0.100-alpha.1.24620.1 + 0.1.0-10.0.100-7 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 0cef1ca7ad9d..7f4d3e7ecd09 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.24555.54" + "dotnet": "10.0.100-alpha.1.24619.18" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24617.2" } } diff --git a/src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch b/src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch new file mode 100644 index 000000000000..54d9237ff20a --- /dev/null +++ b/src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch @@ -0,0 +1,23 @@ +From e34d52334b4418b2229f631cc525d024e34d3e27 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Thu, 19 Dec 2024 08:19:09 -0600 +Subject: [PATCH] Upgrade System.Memory to 4.6.0 + +Backport: https://github.com/dotnet/arcade/pull/15353 +--- + eng/Versions.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 7de3fec4c..ddb6a9658 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -18,7 +18,7 @@ + 2.0.0-beta4.24126.1 + + 1.1.1 +- 4.5.5 ++ 4.6.0 + 4.3.0 + + 2.0.0-preview.1.24305.1 diff --git a/src/SourceBuild/patches/fsharp/0001-Upgrade-some-runtime-packages.patch b/src/SourceBuild/patches/fsharp/0001-Upgrade-some-runtime-packages.patch new file mode 100644 index 000000000000..c12d61eb6c7d --- /dev/null +++ b/src/SourceBuild/patches/fsharp/0001-Upgrade-some-runtime-packages.patch @@ -0,0 +1,33 @@ +From 192a16dca94744c82ca456d6cfb7a2a30be1d84f Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Thu, 19 Dec 2024 11:00:01 -0600 +Subject: [PATCH] Upgrade some runtime packages + +Backport: https://github.com/dotnet/fsharp/pull/18166 +--- + eng/Versions.props | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index cd72f8599..1f711df8f 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -76,15 +76,15 @@ + + 8.0.0 +- 4.5.1 ++ 4.6.0 + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) +- 4.5.5 ++ 4.6.0 + 4.7.0 + $(SystemPackageVersionVersion) +- 6.0.0 ++ 6.1.0 + $(SystemPackageVersionVersion) + 4.5.0 + 1.6.0 diff --git a/src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch b/src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch new file mode 100644 index 000000000000..7a1b11ae5b5f --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch @@ -0,0 +1,31 @@ +From d5e9441491ee711dd04add052c7e3e39a3314361 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Dec 2024 15:57:56 -0600 +Subject: [PATCH] Only target NetCurrent for source build + +--- + eng/targets/TargetFrameworks.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props +index 2dddaff1560..724f64b50b1 100644 +--- a/eng/targets/TargetFrameworks.props ++++ b/eng/targets/TargetFrameworks.props +@@ -40,7 +40,7 @@ + + $(NetMinimum) + $(NetPrevious) +- $(NetCurrent);$(NetPrevious) ++ $(NetCurrent) + $(NetCurrent);$(NetPrevious) + $(NetPrevious) + $(NetPrevious) +@@ -53,7 +53,7 @@ + + + $(NetCurrent) +- $(NetCurrent);$(NetPrevious) ++ $(NetCurrent) + $(NetCurrent);$(NetPrevious) + $(NetPrevious) + $(NetCurrent)