diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93aa3ec04..9295b0217 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 https://github.com/dotnet/test-templates @@ -124,54 +124,54 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - e1393ed208a58a6a2f864ac5ae9cd8ae965d236c + 338ec5bd57538304c4cf372c4389b7c9c57cbecd - + https://github.com/dotnet/wpf - 8e3e1a550c591a7732df79f075716b88af692b43 + 4fc9cd4d737f87b4b0604c80961a32aab47feb0b - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + abc2f4620f6749289cafeed7c9a9a80eaeb38e28 - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + 2a234707a663f731e4de93cba4014ed1a8259def https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - f0e25ac1b9cf1df8bbe6e873993ad74ce3ca8d26 + e5721f8f058db60052ff7298d1a5acd69347b5db @@ -195,9 +195,9 @@ bc555088c6b4862ad0b93fbc245ef0628e661256 - + https://github.com/dotnet/symreader - 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 + aa31e333b952f53910dc6bd08d80596eaaf89360 @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://github.com/dotnet/arcade-services @@ -232,17 +232,17 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 229464299759d6667e8b907d9c321d31a8dcc123 + ad274914920e8e51c5269d215a641e592af8182c diff --git a/eng/Versions.props b/eng/Versions.props index b0844a215..0b2f1d577 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23614.6 + 9.0.0-beta.23615.2 @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23605.3 + 9.0.0-alpha.1.23616.1 - 9.0.0-alpha.1.23606.2 + 9.0.0-alpha.1.23616.2 @@ -73,50 +73,50 @@ - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 0.2.0 - 9.0.100-alpha.1.23613.6 - 9.0.100-alpha.1.23613.6 - 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23618.1 + 9.0.100-alpha.1.23618.1 + 9.0.100-alpha.1.23618.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23612.11 + 4.9.0-3.23615.7 - 9.0.0-alpha.1.23612.13 + 9.0.0-alpha.1.23617.4 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23612.1 - 9.0.0-alpha.1.23612.1 - 9.0.0-alpha.1.23612.1 - 9.0.0-alpha.1.23612.1 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 @@ -128,7 +128,7 @@ - 6.9.0-preview.1.52 + 6.9.0-preview.1.64 @@ -246,7 +246,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23610-02 + 17.9.0-preview-23614-02 8.0.0-alpha.1.22557.12 9.0.0-preview.23613.1 @@ -262,7 +262,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23611.2 + 9.0.0-alpha.1.23617.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index 1f3c531b2..0daa2a9e9 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -61,8 +61,6 @@ try { ExitWithExitCode 1 } - # Remove the ROLL FORWARD env var with a future Arcade.Sdk update in Arcade. - $env:DOTNET_ROLL_FORWARD = "Major" Exec-BlockVerbosely { & "$dotnet" $CliToolName trim-assets-version ` --assets-path $InputPath ` diff --git a/global.json b/global.json index 88ad3b49e..88f595d05 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-alpha.1.23613.1", + "dotnet": "9.0.100-alpha.1.23615.4", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23614.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23614.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23615.2" } } diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2efe17577..9d05322e9 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -8,8 +8,6 @@ - - net9.0 netstandard2.0 diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index a1224e436..c56c5085d 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -259,7 +259,12 @@ if [ "$alternateTarget" == "true" ]; then export NUGET_PACKAGES=$NUGET_PACKAGES/smoke-tests "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log" -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else - "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # BuildXPlatTasks uses NetCurrent but that is not set since Arcade isn't used here. + # Bootstrap NetCurrent by deriving it from the installed .NET CLI version. + netCurrent="$($CLI_ROOT/dotnet --version | while IFS='.' read major minor _; do echo "net$major.$minor"; done)" + + "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -p:NetCurrent=$netCurrent -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver "$CLI_ROOT/dotnet" build-server shutdown diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 678cb8a6f..90c6a8ecf 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -174,6 +174,7 @@ function BootstrapArtifacts { # Check for the version of dotnet to install if [ "$installDotnet" == true ]; then echo " Installing dotnet..." + use_installed_dotnet_cli=false (source ./eng/common/tools.sh && InitializeDotNetCli true) # TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 3000c80e8..6cf694f75 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? # missing workload manifests - https://github.com/dotnet/source-build/issues/3242 msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* -msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 434883537..4c2d7775b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -44,14 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json @@ ------------ @@ ./sdk/x.y.z/.version ./sdk/x.y.z/AppHostTemplate/ diff --git a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch deleted file mode 100644 index ac34d9338..000000000 --- a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 12:50:21 -0500 -Subject: [PATCH] Explicitly set TFM to net9.0 - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - perf/dotnet-format.Performance.csproj | 2 +- - src/dotnet-format.csproj | 2 +- - tests/dotnet-format.UnitTests.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj -index 677b7b9a..3e1387d1 100644 ---- a/perf/dotnet-format.Performance.csproj -+++ b/perf/dotnet-format.Performance.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - true - Release -diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj -index 5549fb71..8a77d03f 100644 ---- a/src/dotnet-format.csproj -+++ b/src/dotnet-format.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - Microsoft.CodeAnalysis.Tools - true -diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj -index c4311a1a..5b1bcfb9 100644 ---- a/tests/dotnet-format.UnitTests.csproj -+++ b/tests/dotnet-format.UnitTests.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Microsoft.CodeAnalysis.Tools.Tests - - diff --git a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch deleted file mode 100644 index 295561075..000000000 --- a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 10:58:11 -0500 -Subject: [PATCH] Explicitly set net9.0 TFM - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index bf6754f23..d76f449be 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -66,7 +66,7 @@ - --> - - -- $(NetCurrent) -+ net9.0 - $(DefaultNetCoreTargetFramework) - - diff --git a/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch b/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch deleted file mode 100644 index 631903885..000000000 --- a/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Mon, 4 Dec 2023 11:03:10 -0600 -Subject: [PATCH] Update MSBuild ref dependency - -Backport: https://github.com/dotnet/roslyn/pull/71069 ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 618bcbcbe5b..cc204cbb20c 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -32,7 +32,7 @@ - 17.8.9-preview - 17.8.36711 - -- 16.10.0 -+ 17.3.2 - - 17.5.0 - - - -- $(NetCurrent) -+ net9.0 - - $(NetCurrent) - -diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -index a93852ce..945b1ac2 100644 ---- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -@@ -12,7 +12,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - - -diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -index b8f6849b..b56b993c 100644 ---- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch b/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch deleted file mode 100644 index 4a351587d..000000000 --- a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 30 Oct 2023 22:52:31 +0000 -Subject: [PATCH] Allow override of build tool framework version - -Backport: https://github.com/dotnet/aspnetcore/issues/51753 ---- - eng/common/tools.sh | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a36..343490c 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -312,7 +312,12 @@ function InitializeBuildTool { - # return values - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" - _InitializeBuildToolCommand="msbuild" -- _InitializeBuildToolFramework="netcoreapp3.1" -+ # use override if it exists - commonly set by source-build -+ if [[ -z "${_OverrideArcadeInitializeBuildToolFramework}" ]]; then -+ _InitializeBuildToolFramework="netcoreapp3.1" -+ else -+ _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" -+ fi - } - - # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116