From d63ec4a166a5c4f40fcbb823873cfa68cfd39eae Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Jun 2020 17:08:43 +0000 Subject: [PATCH] Merged PR 8352: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-extensions 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) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.5 to 3.1.6 (parent: Microsoft.Extensions.Logging) - **Microsoft.Extensions.DependencyModel**: from 3.1.5 to 3.1.6 (parent: Microsoft.Extensions.Logging) - **Microsoft.NETCore.App.Internal**: from 3.1.5-servicing.20270.5 to 3.1.6-servicing.20316.4 (parent: Microsoft.Extensions.Logging) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:69367bda-f465-40d4-e1e9-08d79559e508) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - **Subscription**: 69367bda-f465-40d4-e1e9-08d79559e508 - **Build**: 20200616.5 - **Date Produced**: 6/17/2020 7:08 AM - **Commit**: be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5 - **Microsoft.AspNetCore.Testing**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5 - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5 - **Microsoft.Extensions.NonCapturingTimer.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5 - **Microsoft.Extensions.HashCodeCombiner.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5 - **Microsoft.Extensions.Logging**: from 3.1.5 to 3.1.6 - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.5 to 3.1.6 - **Microsoft.Extensions.DependencyModel**: from 3.1.5 to 3.1.6 - **Microsoft.NETCore.App.Internal**: from 3.1.5-servicing.20270.5 to 3.1.6-servicing.20316.4 [marker]: <> (End:69367bda-f465-40d4-e1e9-08d79559e508) --- NuGet.config | 3 +++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index f035748677d..a6ec461eacd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f22ced5c251..18614944fa8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -45,13 +45,13 @@ https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3acd9b0cd16596bad450c82be08780875a73c05c @@ -62,9 +62,9 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3acd9b0cd16596bad450c82be08780875a73c05c diff --git a/eng/Versions.props b/eng/Versions.props index 6738068a828..b62e5ec455e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,16 +47,16 @@ --> - 3.1.5-servicing.20270.9 - 3.1.5-servicing.20270.9 - 3.1.5-servicing.20270.9 - 3.1.5 - 3.1.5-servicing.20270.9 - 3.1.5 - 3.1.5-servicing.20270.9 + 3.1.6-servicing.20316.5 + 3.1.6-servicing.20316.5 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6-servicing.20316.5 3.1.0 - 3.1.5 - 3.1.5-servicing.20270.5 + 3.1.6 + 3.1.6-servicing.20316.4 3.1.1 4.7.2 4.7.1