From a34e3e6193bd7d9d501ce9b1de0ba1d1ac0e2b9b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 20 Mar 2023 15:14:07 -0500 Subject: [PATCH] Bump to dotnet/installer/main@c373093 8.0.100-preview.3.23170.5 Context: https://github.com/dotnet/runtime/blob/059898f8c0dbea2c6d0ed2ff30bc1b584af6b439/eng/Version.Details.xml#L88-L92 Context: https://github.com/dotnet/emsdk/pull/308 Changes: https://github.com/dotnet/installer/compare/cddf8e6...c373093 Changes: https://github.com/dotnet/runtime/compare/a92ed6e...2aec381 Changes: https://github.com/dotnet/emsdk/compare/4c1f185...25d9f7a Maestro was failing to update with: > darc update-dependencies --id 171040 Looking up build with BAR id 171040 Updating 'Microsoft.Dotnet.Sdk.Internal': '8.0.100-preview.3.23163.4' => '8.0.100-preview.3.23170.5' (from build '20230320.5' of 'https://github.com/dotnet/installer') Checking for coherency updates... Using 'Strict' coherency mode. If this fails, a second attempt utilizing 'Legacy' Coherency mode will be made. Coherency updates failed for the following dependencies: Unable to update Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.3 to have coherency with Microsoft.NETCore.App.Ref: https://github.com/dotnet/runtime @ 2aec3816f9bbc0eda3261daa335a05ea0df31b9c does not contain dependency Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.3 I got the latest dotnet/installer build number from: https://maestro-prod.westus2.cloudapp.azure.com/3074/https:%2F%2Fgithub.com%2Fdotnet%2Finstaller/latest/graph It appears this pack was renamed: Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.3 To become: Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport After manually fixing things, I could do: > darc update-dependencies --id 171040 Looking up build with BAR id 171040 Updating 'Microsoft.Dotnet.Sdk.Internal': '8.0.100-preview.3.23163.4' => '8.0.100-preview.3.23170.5' (from build '20230320.5' of 'https://github.com/dotnet/installer') Checking for coherency updates... Using 'Strict' coherency mode. If this fails, a second attempt utilizing 'Legacy' Coherency mode will be made. Updating 'Microsoft.NETCore.App.Ref': '8.0.0-preview.3.23159.4' => '8.0.0-preview.3.23168.2' to ensure coherency with Microsoft.Dotnet.Sdk.Internal@8.0.100-preview.3.23170.5 Updating 'Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport': '' => '8.0.0-preview.3.23167.1' to ensure coherency with Microsoft.NETCore.App.Ref@8.0.0-preview.3.23159.4 Updating 'Microsoft.NET.ILLink.Tasks': '8.0.0-preview.3.23159.4' => '8.0.0-preview.3.23168.2' to ensure coherency with Microsoft.Dotnet.Sdk.Internal@8.0.100-preview.3.23170.5 Updating 'Microsoft.DotNet.Cecil': '0.11.4-alpha.23156.1' => '0.11.4-alpha.23163.1' to ensure coherency with Microsoft.NET.ILLink.Tasks@8.0.0-preview.3.23159.4 This is nice because we shouldn't have to keep manually fixing this for every future .NET 8 preview. --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c601c831ce9..2da0a978559 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - cddf8e60e12dc484fd551d18e0c37bf1412e7ec2 + c3730935bc3a06db5d51e8f3f36d88b8056a2cb5 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/emsdk - 4c1f185a78249c6974c1f6c248dad189fe70497b + 25d9f7a5e38a2d61b94ff341bc0d32135fcb15f9 - + https://github.com/dotnet/cecil - b126490cd618d6066ed44e0369b4585e845cf9ab + f32e148d67dbf348685c3076a37e8bc68ab3a30f diff --git a/eng/Versions.props b/eng/Versions.props index 54a8f170887..8c0b943ddcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 8.0.100-preview.3.23163.4 - 8.0.0-preview.3.23159.4 - 8.0.0-preview.3.23159.4 + 8.0.100-preview.3.23170.5 + 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23168.2 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-preview.3.23156.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview3Version) + 8.0.0-preview.3.23167.1 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23156.1 + 0.11.4-alpha.23163.1 $(MicrosoftNETCoreAppRefPackageVersion)