From 87623626ce802a287a1694a86f79fa19c97584dc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 2 Nov 2023 21:44:16 +0000 Subject: [PATCH] Merged PR 35037: [internal/release/8.x] Update dependencies from dnceng/internal/dotnet-installer This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.Dotnet.Sdk.Internal) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.12 (parent: Microsoft.Dotnet.Sdk.Internal) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23531.3 (parent: Microsoft.Dotnet.Sdk.Internal) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:1c3bd82f-70d9-4943-10e4-08dbd53e3775) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-installer - **Subscription**: 1c3bd82f-70d9-4943-10e4-08dbd53e3775 - **Build**: 20231101.15 - **Date Produced**: November 1, 2023 10:43:21 PM UTC - **Commit**: 57efcf1350ab087efe97ced8199ab0b494636adf - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.Sdk.Internal**: [from 8.0.100-rtm.23530.10 to 8.0.100-rtm.23551.15][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0 to 8.0.0][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.0 to 8.0.0][3] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.12][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23531.3][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-installer/branches?baseVersion=GCc5dc5d8e43&targetVersion=GC57efcf1350&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC31739e30e9&targetVersion=GC3f1acb5971&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC17ea9ab3f6&targetVersion=GC5535e31a71&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1c3bd82f-70d9-4943-10e4-08dbd53e3775) --- NuGet.config | 18 ++++++++---------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index b4a9ebfb605..05a8de2ece6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,13 +10,12 @@ - - + + - - - + + @@ -33,13 +32,12 @@ - - + + - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2594d4c70a8..3990cb03a97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,7 +2,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade a57022b44f3ff23de925530ea1d27da9701aed57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-installer - c5dc5d8e438cd1ffdfa5ca3ec7d11b1903c9a26f + 57efcf1350ab087efe97ced8199ab0b494636adf https://github.com/dotnet/arcade @@ -52,15 +52,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 5535e31a712343a63f5d7d796cd874e563e5ac14 diff --git a/eng/Versions.props b/eng/Versions.props index 1f6381c70f4..7ff9cd4e8bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,19 +56,19 @@ 8.0.0-beta.23525.4 8.0.0 - 8.0.0-rtm.23526.11 + 8.0.0-rtm.23531.12 2.0.0-beta4.23407.1 8.0.452401 8.0.452401 - 8.0.100-rtm.23530.10 + 8.0.100-rtm.23551.15 8.0.0-preview.23525.2 8.0.0 - 8.0.0-rtm.23525.7 + 8.0.0-rtm.23531.3 1.0.452301