From cad165e731fc0bcc9ab725c718177ebaf0820705 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 22 Jul 2020 02:34:37 +0000
Subject: [PATCH] Merged PR 9237: [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.6 to 3.1.7 (parent: Microsoft.Extensions.Logging)
- **Microsoft.DotNet.PlatformAbstractions**: from 3.1.6 to 3.1.3 (parent: Microsoft.Extensions.Logging)
- **Microsoft.Extensions.DependencyModel**: from 3.1.6 to 3.1.3 (parent: Microsoft.Extensions.Logging)
- **Microsoft.NETCore.App.Internal**: from 3.1.6-servicing.20324.2 to 3.1.7-servicing.20371.4 (parent: Microsoft.Extensions.Logging)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:866e0d8e-b549-4674-92fd-08d795576dcc)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-extensions
- **Subscription**: 866e0d8e-b549-4674-92fd-08d795576dcc
- **Build**: 20200721.8
- **Date Produced**: 7/22/2020 1:01 AM
- **Commit**: 784b0ffaa40779255758ebbb146334da489a4bde
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.Extensions.DependencyInjection**: from 3.1.7 to 3.1.7
  - **Microsoft.Extensions.Configuration.Json**: from 3.1.7 to 3.1.7
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: from 3.1.7 to 3.1.7
  - **Microsoft.Extensions.Configuration**: from 3.1.7 to 3.1.7
  - **Microsoft.Extensions.Caching.Memory**: from 3.1.7 to 3.1.7
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: from 3.1.7-servicing.20366.2 to 3.1.7-servicing.20371.8
  - **Microsoft.Extensions.Logging**: from 3.1.7 to 3.1.7
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.6 to 3.1.7
  - **Microsoft.DotNet.PlatformAbstractions**: from 3.1.6 to 3.1.3
  - **Microsoft.Extensions.DependencyModel**: from 3.1.6 to 3.1.3
  - **Microsoft.NETCore.App.Internal**: from 3.1.6-servicing.20324.2 to 3.1.7-servicing.20371.4

[marker]: <> (End:866e0d8e-b549-4674-92fd-08d795576dcc)
---
 NuGet.config            |  6 ++++--
 eng/Version.Details.xml | 36 ++++++++++++++++++------------------
 eng/Versions.props      | 10 +++++-----
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 5982ed5a6c4..d4b9e61f2b4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,9 +3,11 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <add key="darc-pub-dotnet-core-setup-2d163b8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-2d163b87/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-extensions-085e2dd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-085e2dda/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-core-setup-bed3814" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-bed38147/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-extensions-784b0ff" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-784b0ffa/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-core-setup-fcfdef8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-core-setup-fcfdef8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d/nuget/v3/index.json" />
     <add key="darc-int-dotnet-corefx-059a4a1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-059a4a19/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2548556e3e9..0e9131cca68 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -25,49 +25,49 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" CoherentParentDependency="Microsoft.Extensions.Logging">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
+    <Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.1.3" CoherentParentDependency="Microsoft.Extensions.Logging">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.1.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
+      <Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
+      <Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.1.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
+      <Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration" Version="3.1.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
+      <Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.1.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
+      <Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.6" CoherentParentDependency="Microsoft.Extensions.Logging">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.3" CoherentParentDependency="Microsoft.Extensions.Logging">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.7-servicing.20366.2">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.7-servicing.20371.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
+      <Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
+      <Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.6" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.7" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
+      <Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.6-servicing.20324.2" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.7-servicing.20371.4" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
+      <Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</Sha>
     </Dependency>
     <Dependency Name="System.Collections.Immutable" Version="1.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9a2c39d5cdf..371373fe136 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,7 +37,7 @@
     <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.1.7</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
     <MicrosoftExtensionsConfigurationJsonPackageVersion>3.1.7</MicrosoftExtensionsConfigurationJsonPackageVersion>
     <MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.7</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.7-servicing.20366.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.7-servicing.20371.8</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>3.1.7</MicrosoftExtensionsLoggingPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/corefx">
@@ -52,11 +52,11 @@
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/core-setup">
-    <MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.3</MicrosoftDotNetPlatformAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>3.1.3</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.6-servicing.20324.2</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.7-servicing.20371.4</MicrosoftNETCoreAppInternalPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/roslyn">