From 5e3ba2b04a471f4f55ad6490930603250fe7c789 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 15 May 2024 15:51:43 -0500 Subject: [PATCH] [build] fix code-flow from dotnet/installer, .NET 9.0.100-preview.5.24262.2 Context: https://github.com/dotnet/installer/pull/19707 Changes: https://github.com/dotnet/installer/compare/fa261b95...1741345c Changes: https://github.com/dotnet/runtime/compare/4326eb7e...84b33395 Changes: https://github.com/dotnet/cecil/compare/4abe3e63...7a4a59f9 dotnet/installer is no longer producing a `Microsoft.Dotnet.Sdk.Internal` "package" for the SDK. This is causing the maestro code-flow to fail, such as: > darc update-dependencies --id 225276 Looking up build with BAR id 225276 Checking for coherency updates... Using 'Strict' coherency mode. If this fails, a second attempt utilizing 'Legacy' Coherency mode will be made. Found no dependencies to update. We use `Microsoft.Dotnet.Sdk.Internal` to provision the .NET SDK, similar to: ./dotnet-install.sh --version $(MicrosoftDotnetSdkInternalPackageVersion) Where `eng/Versions.props` is updated by the Maestro bot for the version number. Looking for the `Microsoft.Dotnet.Sdk.Internal` dependency, such as: > darc gather-drop --id 225276 -o drop --dry-run | grep Microsoft.Dotnet.Sdk.Internal Root build - Build number 20240512.2 of https://dev.azure.com/dnceng/internal/_git/dotnet-installer @ 1741345c6399ae203d8f259fb12fb873dac5129d But we can find the package for .NET 9 Preview 4: > darc gather-drop --id 225611 -o drop --dry-run | grep Microsoft.Dotnet.Sdk.Internal Root build - Build number 20240515.4 of https://dev.azure.com/dnceng/internal/_git/dotnet-installer @ df80b5eb607242b1d8ded158ec97a25e5d5e5e05 Skipping non-shipping asset Microsoft.Dotnet.Sdk.Internal@9.0.100-preview.4.24265.4 For now, we can use `VS.Tools.Net.Core.SDK.Resolver` instead, as this is a component inserted into Visual Studio that contains the same version number. We may have to change this again in the future, as dotnet/installer is in the process of merging and/or moving to dotnet/sdk. MS employees can see more details in the [MS Teams thread][0]. [0]: https://teams.microsoft.com/l/message/19:afba3d1545dd45d7b79f34c1821f6055@thread.skype/1715789991637?tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47&groupId=4d73664c-9f2f-450d-82a5-c2f02756606d&parentMessageId=1715789991637&teamName=.NET%20Core%20Eng%20Services%20Partners&channelName=First%20Responders&createdTime=1715789991637 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 10 ++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c9c8982a94..eba2bd4320e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - fa261b952d702c6bd604728fcbdb58ac071a22b1 + 1741345c6399ae203d8f259fb12fb873dac5129d - + https://github.com/dotnet/runtime - 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/runtime - 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c + 84b33395057737db3ea342a5151feb6b90c1b6f6 https://github.com/dotnet/emsdk 53288f87c588907e8ff01f129786820fe998573c - + https://github.com/dotnet/cecil - 4abe3e63a5d4653ca098c633644432c1395411c1 + 7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8 diff --git a/eng/Versions.props b/eng/Versions.props index 71ef362497f..210084f8a72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,17 @@ - 9.0.100-preview.5.24253.16 - 9.0.0-preview.4.24251.3 - 9.0.0-preview.4.24251.3 + + 9.0.100-preview.5.24262.2 + $(VSToolsNetCoreSDKResolverPackageVersion) + 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24256.1 7.0.0-beta.22103.1 8.0.0-beta.24225.1 9.0.0-preview.5.24223.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.24222.1 + 0.11.4-alpha.24230.1 $(MicrosoftNETCoreAppRefPackageVersion)