diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index ea94169d60f6..876705d94e26 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 + 45d845e04c05fbe5da9838c454bbc3af1df6be81 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 0f0784c94bf6..ef967f7d3b16 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.24612.1 + 10.0.100-alpha.1.24612.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..86ca740c5b0e 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.24611.6" }, "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.24604.4" } } diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index c554a1082169..bb29224dbc4e 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -300,7 +300,7 @@ - <_PrebuiltSourceBuiltAssetManifests Include="$(PrebuiltSourceBuiltPackagesPath)VerticalManifest.xml" /> + <_PrebuiltSourceBuiltAssetManifests Include="$(PrebuiltSourceBuiltPackagesPath)*.xml" /> 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..c6b884dcacdc --- /dev/null +++ b/src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch @@ -0,0 +1,24 @@ +From da982568108371f51afb30cc8c32eab01653bd62 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Fri, 20 Dec 2024 12:40:34 -0600 +Subject: [PATCH] Upgrade System.Memory to 4.6.0 + +Backport: https://github.com/dotnet/arcade/pull/15353 +--- + eng/Versions.props | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index a00db9a77..ad3e2a9f9 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -18,7 +18,8 @@ + 2.0.0-beta4.24126.1 + + 1.1.1 +- 4.5.5 ++ 4.6.0 ++ 4.5.5 + 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..7a637a421688 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch @@ -0,0 +1,27 @@ +From 3e23c76f9f26e0b559096d9349d0abadb092d704 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Fri, 20 Dec 2024 08:28:35 -0600 +Subject: [PATCH] Only target NetCurrent for source build + +Backport: https://github.com/dotnet/roslyn/pull/76505 +--- + eng/targets/TargetFrameworks.props | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props +index 2dddaff1560..04eecc62df9 100644 +--- a/eng/targets/TargetFrameworks.props ++++ b/eng/targets/TargetFrameworks.props +@@ -53,9 +53,9 @@ + + + $(NetCurrent) +- $(NetCurrent);$(NetPrevious) +- $(NetCurrent);$(NetPrevious) +- $(NetPrevious) ++ $(NetCurrent) ++ $(NetCurrent) ++ $(NetCurrent) + $(NetCurrent) + +