diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af50f9c24..b93e09ed8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop cd813382efc14c011d79679a654d77f5743d7769 - + https://github.com/dotnet/runtime - b4ec422386bd358602c7693ff4ab28c96a806ec0 + 2874d26cb343fc55be295a628b3ee474e19ff95e - + https://github.com/dotnet/runtime - b4ec422386bd358602c7693ff4ab28c96a806ec0 + 2874d26cb343fc55be295a628b3ee474e19ff95e - + https://github.com/dotnet/runtime - b4ec422386bd358602c7693ff4ab28c96a806ec0 + 2874d26cb343fc55be295a628b3ee474e19ff95e - + https://github.com/dotnet/runtime - b4ec422386bd358602c7693ff4ab28c96a806ec0 + 2874d26cb343fc55be295a628b3ee474e19ff95e - + https://github.com/dotnet/runtime - b4ec422386bd358602c7693ff4ab28c96a806ec0 + 2874d26cb343fc55be295a628b3ee474e19ff95e @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b4ec422386bd358602c7693ff4ab28c96a806ec0 + 2874d26cb343fc55be295a628b3ee474e19ff95e https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 252ad5d3be61ea4aa4bfb2453e0d22f52f56ad09 - + https://github.com/dotnet/sdk - d6bbcd8dd36b30316ad887435565e1234dc90f09 + 83b808f63ad5e19f4655778cb23e493292f8d757 - + https://github.com/dotnet/sdk - d6bbcd8dd36b30316ad887435565e1234dc90f09 + 83b808f63ad5e19f4655778cb23e493292f8d757 - + https://github.com/dotnet/sdk - d6bbcd8dd36b30316ad887435565e1234dc90f09 + 83b808f63ad5e19f4655778cb23e493292f8d757 - + https://github.com/dotnet/sdk - d6bbcd8dd36b30316ad887435565e1234dc90f09 + 83b808f63ad5e19f4655778cb23e493292f8d757 https://github.com/dotnet/test-templates @@ -146,18 +146,18 @@ aef3d5fbe837aef3f7cc54bba375b744db9ed8e6 - + https://github.com/dotnet/runtime - b4ec422386bd358602c7693ff4ab28c96a806ec0 + 2874d26cb343fc55be295a628b3ee474e19ff95e https://github.com/dotnet/roslyn 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/msbuild - 7f5b7a942e7efb44f59a2451b13795972539521d + 8215fb194d24cba1971476188ad97e5498fd2dfb @@ -195,13 +195,13 @@ 2054f99a5685034a4ea4755b3cc2984fb2a5e4a8 - + https://github.com/dotnet/command-line-api - a045dd54a4c44723c215d992288160eb1401bb7f + 27035e88527f555a3806ae7d63af7501b41ea5d5 - + https://github.com/dotnet/command-line-api - a045dd54a4c44723c215d992288160eb1401bb7f + 27035e88527f555a3806ae7d63af7501b41ea5d5 diff --git a/eng/Versions.props b/eng/Versions.props index 430806f05..d9111b88e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.24059.1 - 9.0.100-alpha.1.24059.1 - 9.0.100-alpha.1.24059.1 + 9.0.100-alpha.1.24059.29 + 9.0.100-alpha.1.24059.29 + 9.0.100-alpha.1.24059.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,15 +99,15 @@ - 9.0.0-alpha.1.24058.10 + 9.0.0-alpha.1.24059.2 - 9.0.0-alpha.1.24058.10 - 9.0.0-alpha.1.24058.10 - 9.0.0-alpha.1.24058.10 - 9.0.0-alpha.1.24058.10 - 9.0.0-alpha.1.24058.10 + 9.0.0-alpha.1.24059.2 + 9.0.0-alpha.1.24059.2 + 9.0.0-alpha.1.24059.2 + 9.0.0-alpha.1.24059.2 + 9.0.0-alpha.1.24059.2 2.1.0 diff --git a/src/SourceBuild/patches/command-line-api/0001-Allow-override-of-build-tool-framework-version.patch b/src/SourceBuild/patches/command-line-api/0001-Allow-override-of-build-tool-framework-version.patch deleted file mode 100644 index e79bb7f50..000000000 --- a/src/SourceBuild/patches/command-line-api/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:45:58 +0000 -Subject: [PATCH] Allow override of build tool framework version - -Backport: https://github.com/dotnet/command-line-api/pull/2283 ---- - 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 2f27d745..422e711d 100644 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -312,7 +312,12 @@ function InitializeBuildTool { - # return values - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" - _InitializeBuildToolCommand="msbuild" -- _InitializeBuildToolFramework="net7.0" -+ # use override if it exists - commonly set by source-build -+ if [[ -z "${_OverrideArcadeInitializeBuildToolFramework}" ]]; then -+ _InitializeBuildToolFramework="net7.0" -+ else -+ _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" -+ fi - } - - # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116