diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 323e808ea..3e5fa8718 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 - 16efaf8b79a8924f02a8e7500bc7d81d1253007d + 1f8cf263480b63072fc7cf7461c7ea6923122a71 - + https://github.com/dotnet/windowsdesktop - 16efaf8b79a8924f02a8e7500bc7d81d1253007d + 1f8cf263480b63072fc7cf7461c7ea6923122a71 - + https://github.com/dotnet/windowsdesktop - 16efaf8b79a8924f02a8e7500bc7d81d1253007d + 1f8cf263480b63072fc7cf7461c7ea6923122a71 - + https://github.com/dotnet/windowsdesktop - 16efaf8b79a8924f02a8e7500bc7d81d1253007d + 1f8cf263480b63072fc7cf7461c7ea6923122a71 - + https://github.com/dotnet/runtime - b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 + 0f2cf16467dbd376bf4ac3040262699f850a9155 - + https://github.com/dotnet/runtime - b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 + 0f2cf16467dbd376bf4ac3040262699f850a9155 - + https://github.com/dotnet/runtime - b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 + 0f2cf16467dbd376bf4ac3040262699f850a9155 - + https://github.com/dotnet/runtime - b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 + 0f2cf16467dbd376bf4ac3040262699f850a9155 - + https://github.com/dotnet/runtime - b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 + 0f2cf16467dbd376bf4ac3040262699f850a9155 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 + 0f2cf16467dbd376bf4ac3040262699f850a9155 - + https://github.com/dotnet/aspnetcore - 3d83ad986828391652e48ebd037c5f485b4edd26 + e431371c056cdd2f682f45a7909a6078e85b90dd - + https://github.com/dotnet/aspnetcore - 3d83ad986828391652e48ebd037c5f485b4edd26 + e431371c056cdd2f682f45a7909a6078e85b90dd - + https://github.com/dotnet/aspnetcore - 3d83ad986828391652e48ebd037c5f485b4edd26 + e431371c056cdd2f682f45a7909a6078e85b90dd - + https://github.com/dotnet/aspnetcore - 3d83ad986828391652e48ebd037c5f485b4edd26 + e431371c056cdd2f682f45a7909a6078e85b90dd - + https://github.com/dotnet/aspnetcore - 3d83ad986828391652e48ebd037c5f485b4edd26 + e431371c056cdd2f682f45a7909a6078e85b90dd - + https://github.com/dotnet/aspnetcore - 3d83ad986828391652e48ebd037c5f485b4edd26 + e431371c056cdd2f682f45a7909a6078e85b90dd - + https://github.com/dotnet/aspnetcore - 3d83ad986828391652e48ebd037c5f485b4edd26 + e431371c056cdd2f682f45a7909a6078e85b90dd - + https://github.com/dotnet/sdk - fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 + 9709a5aebf08ebae7dfe6937e5e5ffd0c346fb46 - + https://github.com/dotnet/sdk - fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 + 9709a5aebf08ebae7dfe6937e5e5ffd0c346fb46 - + https://github.com/dotnet/sdk - fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 + 9709a5aebf08ebae7dfe6937e5e5ffd0c346fb46 - + https://github.com/dotnet/sdk - fdb372b3219a898aa5f8bb5c135afbfd6b81e8c4 + 9709a5aebf08ebae7dfe6937e5e5ffd0c346fb46 https://github.com/dotnet/test-templates @@ -120,45 +120,45 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://github.com/dotnet/winforms - 9ad5776c2367e8444a9db82a8f10c64ef36ed8ce + ed598f3fe6403aa3aaa7659d21029f5f8924c6f4 - + https://github.com/dotnet/wpf - 3a8376ca92de4c85dd92b05fba8a1c0a49b14cb9 + 2bfc70242c5184c3c44748f232eb3ecafca005b5 - + https://github.com/dotnet/fsharp - 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 + 0ddc4d640200417429be9daa6b0d4e54a27882b8 - + https://github.com/dotnet/fsharp - 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 + 0ddc4d640200417429be9daa6b0d4e54a27882b8 - + https://github.com/microsoft/vstest - 89a55b6ca9270e3e12e3e158104518c225f5ed46 + fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 - + https://github.com/dotnet/runtime - b331f23f3fb62ae355a42d2ec9c8aefdd0da4073 + 0f2cf16467dbd376bf4ac3040262699f850a9155 - + https://github.com/dotnet/roslyn - 17e4696ee6ed0a077650e8cabe6f507e2497a8da + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/msbuild - a9341111228592c25c43ecf6858e7b39e525b5a1 + 221fd2e8790a22ead513eb71630557efc02060e2 - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef @@ -170,15 +170,15 @@ 97568ad0e2120f194df7ac3895e9589fcc8a255b - + https://github.com/dotnet/deployment-tools - 8babbda6fb22b1410c256bfffed9a8041ff87025 + 1d174267bf45dabbadb12602b1170329611fd219 - + https://github.com/dotnet/deployment-tools - 8babbda6fb22b1410c256bfffed9a8041ff87025 + 1d174267bf45dabbadb12602b1170329611fd219 diff --git a/eng/Versions.props b/eng/Versions.props index 0cac0b425..033bf585a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-alpha.1.23431.2 + 9.0.0-alpha.1.23520.4 - 9.0.0-alpha.1.23431.2 + 9.0.0-alpha.1.23520.4 @@ -71,50 +71,50 @@ - 9.0.0-alpha.1.23512.8 - 9.0.0-alpha.1.23512.8 - 9.0.0-alpha.1.23512.8 - 9.0.0-alpha.1.23512.8 - 9.0.0-alpha.1.23512.8 - 9.0.0-alpha.1.23512.8 - 9.0.0-alpha.1.23512.8 + 9.0.0-alpha.1.23522.2 + 9.0.0-alpha.1.23522.2 + 9.0.0-alpha.1.23522.2 + 9.0.0-alpha.1.23522.2 + 9.0.0-alpha.1.23522.2 + 9.0.0-alpha.1.23522.2 + 9.0.0-alpha.1.23522.2 0.2.0 - 9.0.100-alpha.1.23512.21 - 9.0.100-alpha.1.23512.21 - 9.0.100-alpha.1.23512.21 + 9.0.100-alpha.1.23523.12 + 9.0.100-alpha.1.23523.12 + 9.0.100-alpha.1.23523.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23511.8 + 4.9.0-1.23520.1 - 9.0.0-alpha.1.23512.2 + 9.0.0-alpha.1.23523.5 - 9.0.0-alpha.1.23512.2 - 9.0.0-alpha.1.23512.2 - 9.0.0-alpha.1.23512.2 - 9.0.0-alpha.1.23512.2 - 9.0.0-alpha.1.23512.2 + 9.0.0-alpha.1.23523.5 + 9.0.0-alpha.1.23523.5 + 9.0.0-alpha.1.23523.5 + 9.0.0-alpha.1.23523.5 + 9.0.0-alpha.1.23523.5 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23477.3 - 9.0.0-alpha.1.23477.3 - 9.0.0-alpha.1.23477.3 - 9.0.0-alpha.1.23477.3 + 9.0.0-alpha.1.23521.3 + 9.0.0-alpha.1.23521.3 + 9.0.0-alpha.1.23521.3 + 9.0.0-alpha.1.23521.3 @@ -126,11 +126,11 @@ - 6.9.0-preview.1.13 + 6.9.0-preview.1.17 - 2.0.0-preview.1.23478.2 + 2.0.0-preview.1.23509.2 @@ -238,7 +238,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23509-01 + 17.9.0-preview-23519-02 8.0.0-alpha.1.22557.12 8.0.0-preview.23424.2 diff --git a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch deleted file mode 100644 index 7ce4f5dc2..000000000 --- a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 13:05:45 -0500 -Subject: [PATCH] Update Microsoft.Build.Locator to 1.6.10 - -Backport: https://github.com/dotnet/sdk/issues/36219 ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 961660e5..c330813b 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -40,7 +40,7 @@ - - 0.13.5 - 0.13.5 -- 1.5.5 -+ 1.6.10 - 17.4.16 - - diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index d32e82555..9d43d4a29 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -38,14 +38,12 @@ update its path explicitly. If all TFMs match, update DefaultToolTfm --> net9.0 - - net8.0 $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\ - $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(PreviousToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\