From 9fa02e063d58664f350f78448e61afa3a9591483 Mon Sep 17 00:00:00 2001 From: dotnet-sb-bot Date: Thu, 12 Dec 2024 15:12:34 +0000 Subject: [PATCH 01/20] Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24612.1 --- src/SourceBuild/content/eng/Version.Details.xml | 4 ++-- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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..eae714869a2a 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ 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 + 10.0.100-alpha.1.24612.1 + 10.0.100-alpha.1.24612.1 0.1.0-10.0.100-6 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" } } From ad020fe565aa1db336e70a741a512ac4d69698d7 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Dec 2024 15:26:25 -0600 Subject: [PATCH 02/20] Update SB prebuilts tarball reference --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index eae714869a2a..ef967f7d3b16 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -25,7 +25,7 @@ --> 10.0.100-alpha.1.24612.1 10.0.100-alpha.1.24612.1 - 0.1.0-10.0.100-6 + 0.1.0-10.0.100-7 2.0.0-beta4.24126.1 From 2ad8387818f1bad64af2bd4aa3a69f6cb6f74c93 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Dec 2024 15:26:54 -0600 Subject: [PATCH 03/20] Workaround for https://github.com/dotnet/source-build/issues/4807 --- src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 95e5a308e993..3b65afe73967 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" /> From f0cda56ea41e751d8489a4eb3d91c2ad3f89f398 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Dec 2024 15:41:13 -0600 Subject: [PATCH 04/20] Update arcade patch to reflect merged PR content --- ... 10 SDK and TFM to net10.0 in arcade.patch | 126 ++++++++++++++---- 1 file changed, 103 insertions(+), 23 deletions(-) diff --git a/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch b/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch index 4b49c0b4ed4e..50ede8b12d7a 100644 --- a/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch +++ b/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch @@ -1,54 +1,113 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a0d0705b27c50a0975ff825215723243d5a813c3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 6 Nov 2024 16:43:26 +0000 Subject: [PATCH] Update to .NET 10 SDK and TFM to net10.0 in arcade Backport: https://github.com/dotnet/arcade/pull/15221 --- - Directory.Build.props | 5 +++++ - global.json | 4 ++-- - .../src/build/Packaging.targets | 4 ++++ - .../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +- - .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- - .../Microsoft.DotNet.XliffTasks.csproj | 4 ---- - tests/UnitTests.proj | 5 +++-- - 7 files changed, 16 insertions(+), 10 deletions(-) + Directory.Build.props | 5 +++++ + global.json | 4 ++-- + src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj | 2 +- + .../tools/TargetFrameworkDefaults.props | 12 +++++------- + .../src/build/Packaging.targets | 4 ++++ + .../src/Misc/msi.csproj | 2 +- + .../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +- + .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- + .../Microsoft.DotNet.XliffTasks.csproj | 4 ---- + tests/UnitTests.proj | 5 +++-- + 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 9d84f1dc6..b25de0091 100644 +index 9d84f1dc6..b4e468bdf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -17,4 +17,9 @@ +@@ -16,6 +16,11 @@ + https://github.com/dotnet/arcade $(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904 -+ ++ + net10.0 + net9.0 + $(NetCurrent) + $(NetToolCurrent) + diff --git a/global.json b/global.json -index af88ae5bf..904f8d03d 100644 +index af88ae5bf..be8040610 100644 --- a/global.json +++ b/global.json -@@ -1,9 +1,9 @@ +@@ -1,10 +1,10 @@ { "sdk": { - "version": "9.0.100", -+ "version": "10.0.100-alpha.1.24551.9", ++ "version": "10.0.100-alpha.1.24573.1", "rollForward": "latestFeature" }, "tools": { - "dotnet": "9.0.100" -+ "dotnet": "10.0.100-alpha.1.24551.9" ++ "dotnet": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1", +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj +index 913496c50..75ef481b2 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj ++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj +@@ -100,7 +100,7 @@ + SNBinaryPath="$(SNBinaryPath)" + MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)" + WixToolsPath="$(WixInstallPath)" +- TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net9.0\any\Microsoft.Dotnet.Tar.dll" ++ TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net10.0\any\Microsoft.Dotnet.Tar.dll" + RepackParallelism="$(SignToolRepackParallelism)" + MaximumParallelFileSize="$(SignToolRepackMaximumParallelFileSize)" /> + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props +index bd83cda60..33c2fea4e 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props ++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props +@@ -11,21 +11,19 @@ + + + +- net9.0 ++ net10.0 + + +- ++ net9.0 + +- ++ + net8.0 + + + net481 + +- ++ + net462 + + +@@ -33,7 +31,7 @@ + +- net9.0 ++ net10.0 + $(NetCurrent) + + diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets index 0ae8d1482..9312e2672 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets -@@ -3,5 +3,5 @@ +@@ -2,7 +2,7 @@ + - net9.0 + net10.0 netcoreapp2.0 + 2.9.2 diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj index 1059c3bc4..165a4a7d5 100644 --- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj +++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj -@@ -2,8 +2,4 @@ +@@ -1,10 +1,6 @@ + - $(NetToolMinimum);$(NetFrameworkToolCurrent) true + true diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index 910ccf3b0..ad85e4bac 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj -@@ -117,8 +117,9 @@ +@@ -116,9 +116,10 @@ + - From 12c338b21a4cfc03a22d78cbf7bce063b01f2818 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Dec 2024 15:53:30 -0600 Subject: [PATCH 05/20] msbuild patch --- ...eference-for-ExceptionHandling-class.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch diff --git a/src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch b/src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch new file mode 100644 index 000000000000..2579c05f8b50 --- /dev/null +++ b/src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch @@ -0,0 +1,35 @@ +From cb75812d7f5c0860824b86f7a22bf99bee564959 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Dec 2024 15:46:24 -0600 +Subject: [PATCH] Fix ambiguous reference for ExceptionHandling class + +Backport: https://github.com/dotnet/msbuild/pull/11173 +--- + src/Build/BackEnd/BuildManager/BuildManager.cs | 1 + + src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Build/BackEnd/BuildManager/BuildManager.cs b/src/Build/BackEnd/BuildManager/BuildManager.cs +index e3aa23a478..c4a13d02dc 100644 +--- a/src/Build/BackEnd/BuildManager/BuildManager.cs ++++ b/src/Build/BackEnd/BuildManager/BuildManager.cs +@@ -37,6 +37,7 @@ using Microsoft.Build.Logging; + using Microsoft.Build.Shared; + using Microsoft.Build.Shared.Debugging; + using Microsoft.NET.StringTools; ++using ExceptionHandling = Microsoft.Build.Shared.ExceptionHandling; + using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; + using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; + +diff --git a/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs b/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs +index 446f5ef644..bd1cb0fd8d 100644 +--- a/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs ++++ b/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs +@@ -22,6 +22,7 @@ using Microsoft.Build.Framework; + using Microsoft.Build.Graph; + using Microsoft.Build.Internal; + using Microsoft.Build.Shared; ++using ExceptionHandling = Microsoft.Build.Shared.ExceptionHandling; + + namespace Microsoft.Build.Experimental.ProjectCache + { From 02f6436bc97ed14ace34423ea0be79a659228b31 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Dec 2024 16:04:35 -0600 Subject: [PATCH 06/20] roslyn patch --- ...y-target-NetCurrent-for-source-build.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch 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..b3c9e9c6860b --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch @@ -0,0 +1,32 @@ +From 37a6ada39e591ff0a96e1d3cbd0a5a0b84d56cbe 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 + +Backport: https://github.com/dotnet/roslyn/pull/76505 +--- + 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 728de8b627d..f413faf43c9 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) + $(NetCurrent) + $(NetCurrent) From 98f2eda3152063712a98fc7ca5c4580da0e0ad67 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Dec 2024 16:06:47 -0600 Subject: [PATCH 07/20] Target NetCurrent for layout sources --- src/Layout/redist/targets/GenerateLayout.targets | 2 +- src/Layout/tool_fsharp/tool_fsc.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 84838632c10f..b240a5467505 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -178,7 +178,7 @@ BeforeTargets="Build"> netcoreapp3.1 - net9.0 + $(NetCurrent) $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj index d0e032fef721..6228bf0ddff7 100644 --- a/src/Layout/tool_fsharp/tool_fsc.csproj +++ b/src/Layout/tool_fsharp/tool_fsc.csproj @@ -32,7 +32,7 @@ Shipping Release - net9.0 + $(NetCurrent) Date: Wed, 18 Dec 2024 16:12:31 -0600 Subject: [PATCH 08/20] symreader patch --- .../0001-Target-NetCurrent-property.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/SourceBuild/patches/symreader/0001-Target-NetCurrent-property.patch diff --git a/src/SourceBuild/patches/symreader/0001-Target-NetCurrent-property.patch b/src/SourceBuild/patches/symreader/0001-Target-NetCurrent-property.patch new file mode 100644 index 000000000000..e82d85bf9b36 --- /dev/null +++ b/src/SourceBuild/patches/symreader/0001-Target-NetCurrent-property.patch @@ -0,0 +1,22 @@ +From bd21b3e221f2085af2d660e04c6dff186e372454 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Dec 2024 16:10:00 -0600 +Subject: [PATCH] Target NetCurrent property + +Backport: https://github.com/dotnet/symreader/pull/331 +--- + src/Microsoft.DiaSymReader/Microsoft.DiaSymReader.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Microsoft.DiaSymReader/Microsoft.DiaSymReader.csproj b/src/Microsoft.DiaSymReader/Microsoft.DiaSymReader.csproj +index c635aee..b920f9c 100644 +--- a/src/Microsoft.DiaSymReader/Microsoft.DiaSymReader.csproj ++++ b/src/Microsoft.DiaSymReader/Microsoft.DiaSymReader.csproj +@@ -1,6 +1,6 @@ +  + +- netstandard2.0;net9.0 ++ netstandard2.0;$(NetCurrent) + true + true + true From bc33357f9228c54c4b472e85547e6fac3cbf4a56 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Dec 2024 08:33:06 -0600 Subject: [PATCH 09/20] arcade patch --- .../0002-Upgrade-System.Memory-to-4.6.0.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch 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 From 7fa31c96b8ec1af71a8ca71737ae5a632912a944 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Dec 2024 10:55:26 -0600 Subject: [PATCH 10/20] Fix fsharp layout TFM --- src/Layout/tool_fsharp/tool_fsc.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj index 6228bf0ddff7..63c2c9b056bf 100644 --- a/src/Layout/tool_fsharp/tool_fsc.csproj +++ b/src/Layout/tool_fsharp/tool_fsc.csproj @@ -32,7 +32,8 @@ Shipping Release - $(NetCurrent) + net9.0 + $(NetCurrent) Date: Thu, 19 Dec 2024 11:05:19 -0600 Subject: [PATCH 11/20] fsharp patch --- .../0001-Upgrade-some-runtime-packages.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/SourceBuild/patches/fsharp/0001-Upgrade-some-runtime-packages.patch 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 From e26d57b32e9a1d6647c4946c9f81b0d228209968 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Dec 2024 13:48:57 -0600 Subject: [PATCH 12/20] Delete obsolete msbuild patch --- ...eference-for-ExceptionHandling-class.patch | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch diff --git a/src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch b/src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch deleted file mode 100644 index 2579c05f8b50..000000000000 --- a/src/SourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cb75812d7f5c0860824b86f7a22bf99bee564959 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Dec 2024 15:46:24 -0600 -Subject: [PATCH] Fix ambiguous reference for ExceptionHandling class - -Backport: https://github.com/dotnet/msbuild/pull/11173 ---- - src/Build/BackEnd/BuildManager/BuildManager.cs | 1 + - src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Build/BackEnd/BuildManager/BuildManager.cs b/src/Build/BackEnd/BuildManager/BuildManager.cs -index e3aa23a478..c4a13d02dc 100644 ---- a/src/Build/BackEnd/BuildManager/BuildManager.cs -+++ b/src/Build/BackEnd/BuildManager/BuildManager.cs -@@ -37,6 +37,7 @@ using Microsoft.Build.Logging; - using Microsoft.Build.Shared; - using Microsoft.Build.Shared.Debugging; - using Microsoft.NET.StringTools; -+using ExceptionHandling = Microsoft.Build.Shared.ExceptionHandling; - using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; - using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; - -diff --git a/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs b/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs -index 446f5ef644..bd1cb0fd8d 100644 ---- a/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs -+++ b/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs -@@ -22,6 +22,7 @@ using Microsoft.Build.Framework; - using Microsoft.Build.Graph; - using Microsoft.Build.Internal; - using Microsoft.Build.Shared; -+using ExceptionHandling = Microsoft.Build.Shared.ExceptionHandling; - - namespace Microsoft.Build.Experimental.ProjectCache - { From de45ae35333d6bcc902ce4655d7168ec448e2171 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Dec 2024 13:58:23 -0600 Subject: [PATCH 13/20] Update layout --- src/Layout/redist/targets/GenerateLayout.targets | 3 ++- src/Layout/tool_fsharp/tool_fsc.csproj | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index b240a5467505..3160feb51095 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -178,7 +178,8 @@ BeforeTargets="Build"> netcoreapp3.1 - $(NetCurrent) + $(NetCurrent) + net9.0 $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj index 63c2c9b056bf..3131d245407b 100644 --- a/src/Layout/tool_fsharp/tool_fsc.csproj +++ b/src/Layout/tool_fsharp/tool_fsc.csproj @@ -33,7 +33,7 @@ Shipping Release net9.0 - $(NetCurrent) + $(NetCurrent) Date: Thu, 19 Dec 2024 16:08:08 -0600 Subject: [PATCH 14/20] scenario-tests TFM workaround --- src/SourceBuild/content/repo-projects/scenario-tests.proj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj index ea2150209de3..2bf89ec6dcfd 100644 --- a/src/SourceBuild/content/repo-projects/scenario-tests.proj +++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj @@ -8,6 +8,10 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests')) $([MSBuild]::NormalizePath('$(SrcDir)', 'sdk', 'NuGet.config')) $(ScenarioTestsArtifactsDir)NuGet.config + + + $(BuildArgs) /p:NetCurrent=$(NetCurrent) + $(TestCommand) /p:NetCurrent=$(NetCurrent) From e09dba9e173e7b0563f7e2e31ad7d01af2ebf7d8 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Dec 2024 18:36:15 -0600 Subject: [PATCH 15/20] Rebase roslyn patch --- .../0002-Only-target-NetCurrent-for-source-build.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 index b3c9e9c6860b..7a1b11ae5b5f 100644 --- 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 @@ -1,15 +1,14 @@ -From 37a6ada39e591ff0a96e1d3cbd0a5a0b84d56cbe Mon Sep 17 00:00:00 2001 +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 -Backport: https://github.com/dotnet/roslyn/pull/76505 --- 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 728de8b627d..f413faf43c9 100644 +index 2dddaff1560..724f64b50b1 100644 --- a/eng/targets/TargetFrameworks.props +++ b/eng/targets/TargetFrameworks.props @@ -40,7 +40,7 @@ @@ -28,5 +27,5 @@ index 728de8b627d..f413faf43c9 100644 - $(NetCurrent);$(NetPrevious) + $(NetCurrent) $(NetCurrent);$(NetPrevious) - $(NetCurrent) + $(NetPrevious) $(NetCurrent) From 086b884ef5f7016e754e37dc4f2c17e667438589 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Dec 2024 20:40:50 -0600 Subject: [PATCH 16/20] try a newer build --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index ef967f7d3b16..7601ef0fcc5c 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ 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.24612.1 - 10.0.100-alpha.1.24612.1 + 10.0.100-alpha.1.24619.1 + 10.0.100-alpha.1.24619.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 86ca740c5b0e..99eb437fd0e2 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.24611.6" + "dotnet": "10.0.100-alpha.1.24618.18" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", From 4a1b7ea19385f01945660efb266a6bce1ae39486 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 20 Dec 2024 07:13:27 -0600 Subject: [PATCH 17/20] Revert "try a newer build" This reverts commit 086b884ef5f7016e754e37dc4f2c17e667438589. --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 7601ef0fcc5c..ef967f7d3b16 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ 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.24619.1 - 10.0.100-alpha.1.24619.1 + 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 99eb437fd0e2..86ca740c5b0e 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.24618.18" + "dotnet": "10.0.100-alpha.1.24611.6" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", From 10d474169f79d6cf689ffa6754fa319194407486 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 20 Dec 2024 08:30:28 -0600 Subject: [PATCH 18/20] Update Roslyn patch --- ...y-target-NetCurrent-for-source-build.patch | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) 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 index 7a1b11ae5b5f..7a637a421688 100644 --- 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 @@ -1,31 +1,27 @@ -From d5e9441491ee711dd04add052c7e3e39a3314361 Mon Sep 17 00:00:00 2001 +From 3e23c76f9f26e0b559096d9349d0abadb092d704 Mon Sep 17 00:00:00 2001 From: Matt Thalman -Date: Wed, 18 Dec 2024 15:57:56 -0600 +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 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + 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..724f64b50b1 100644 +index 2dddaff1560..04eecc62df9 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 @@ +@@ -53,9 +53,9 @@ $(NetCurrent) - $(NetCurrent);$(NetPrevious) +- $(NetCurrent);$(NetPrevious) +- $(NetPrevious) + $(NetCurrent) - $(NetCurrent);$(NetPrevious) - $(NetPrevious) ++ $(NetCurrent) ++ $(NetCurrent) $(NetCurrent) + + From fe062cf7c3f42c618940936daada256de9f9476c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 20 Dec 2024 17:58:56 +0100 Subject: [PATCH 19/20] Upgrade System.Memory to version 4.6.0 --- .../patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 54d9237ff20a..d11594a30a5e 100644 --- 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 @@ -17,7 +17,8 @@ index 7de3fec4c..ddb6a9658 100644 1.1.1 - 4.5.5 -+ 4.6.0 ++ 4.6.0 ++ 4.5.5 4.3.0 2.0.0-preview.1.24305.1 From 83d9229b2d1b4b7f745e32afe67fecd1b67e2f97 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 20 Dec 2024 12:42:11 -0600 Subject: [PATCH 20/20] fix corrupt arcade patch --- .../arcade/0002-Upgrade-System.Memory-to-4.6.0.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 index d11594a30a5e..c6b884dcacdc 100644 --- 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 @@ -1,18 +1,18 @@ -From e34d52334b4418b2229f631cc525d024e34d3e27 Mon Sep 17 00:00:00 2001 +From da982568108371f51afb30cc8c32eab01653bd62 Mon Sep 17 00:00:00 2001 From: Matt Thalman -Date: Thu, 19 Dec 2024 08:19:09 -0600 +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 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + eng/Versions.props | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props -index 7de3fec4c..ddb6a9658 100644 +index a00db9a77..ad3e2a9f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -18,7 +18,7 @@ +@@ -18,7 +18,8 @@ 2.0.0-beta4.24126.1 1.1.1