From ef511c7b7a45947fcdbb1263d45a32d87e1f7a58 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2019 04:41:53 +0000
Subject: [PATCH] [master] Update dependencies from aspnet/Extensions (#16757)

* Update dependencies from https://github.com/aspnet/Extensions build 20190725.4

- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19375.4
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19375.4
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19375.4
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19375.4
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19375.4
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19375.4
- Microsoft.Extensions.Logging - 3.0.0-preview8.19375.4

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-28374-06 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-28374-06 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-28374-06 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-28374-06 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-28374-06 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190725.5

- Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19375.5
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19375.5
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19375.5
- Microsoft.Extensions.Configuration - 3.0.0-preview8.19375.5
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19375.5
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19375.5
- Microsoft.Extensions.Logging - 3.0.0-preview8.19375.5

Dependency coherency updates

- Microsoft.CSharp - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-28375-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview8-28375-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview8-28375-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview8.19375.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Ref - 3.0.0-preview8-28375-11 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview8-28375-11 (parent: Microsoft.Extensions.Logging)
- System.Collections.Immutable - 1.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Add workaround for netstandard2.1 problem in preview7 SDK
- see dotnet/sdk#3463
---
 Directory.Build.targets |  6 +++-
 eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
 eng/Versions.props      | 34 ++++++++++-----------
 3 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 634d40ef8fe..c8f8c7f6b0b 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -17,11 +17,15 @@
       <TargetingPackVersion Condition="'%(TargetFramework)' == 'netstandard2.1'">$(NETStandardLibraryRefPackageVersion)</TargetingPackVersion>
     </KnownFrameworkReference>
 
+    <!-- Workaround for netstandard2.1 projects until we can get a preview 8 SDK containing https://github.com/dotnet/sdk/pull/3463 fix. -->
+    <KnownFrameworkReference Update="NETStandard.Library">
+      <RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>
+    </KnownFrameworkReference>
+
     <!-- Track compiler separately from Arcade.-->
     <PackageReference Include="Microsoft.Net.Compilers.Toolset"
         Version="$(MicrosoftNetCompilersToolsetVersion)"
         PrivateAssets="all"
         IsImplicitlyDefined="true" />
   </ItemGroup>
-
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b9da3ff6abd..97e068b07f0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.CSharp" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.CSharp" Version="4.6.0-preview8.19375.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
+      <Sha>605ff91f856177f52e3fcb76f2e65696e520e41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0-preview8-28373-17" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0-preview8-28375-11" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
+      <Sha>3602cec09a9505b5b97609a68fed0be969753fd1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview8.19375.1">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview8.19375.5">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>03de975e6f30c60a7c58dbeec8f0eee6d9a1e447</Sha>
+      <Sha>4a527b221178bc445aea07bebe2227ac8abdcc35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview8.19375.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview8.19375.5">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>03de975e6f30c60a7c58dbeec8f0eee6d9a1e447</Sha>
+      <Sha>4a527b221178bc445aea07bebe2227ac8abdcc35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview8.19375.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview8.19375.5">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>03de975e6f30c60a7c58dbeec8f0eee6d9a1e447</Sha>
+      <Sha>4a527b221178bc445aea07bebe2227ac8abdcc35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview8.19375.1">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview8.19375.5">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>03de975e6f30c60a7c58dbeec8f0eee6d9a1e447</Sha>
+      <Sha>4a527b221178bc445aea07bebe2227ac8abdcc35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview8.19375.1">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview8.19375.5">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>03de975e6f30c60a7c58dbeec8f0eee6d9a1e447</Sha>
+      <Sha>4a527b221178bc445aea07bebe2227ac8abdcc35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview8-28373-17" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview8-28375-11" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
+      <Sha>3602cec09a9505b5b97609a68fed0be969753fd1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview8.19375.1">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview8.19375.5">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>03de975e6f30c60a7c58dbeec8f0eee6d9a1e447</Sha>
+      <Sha>4a527b221178bc445aea07bebe2227ac8abdcc35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview8.19375.1">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview8.19375.5">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>03de975e6f30c60a7c58dbeec8f0eee6d9a1e447</Sha>
+      <Sha>4a527b221178bc445aea07bebe2227ac8abdcc35</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19375.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
+      <Sha>605ff91f856177f52e3fcb76f2e65696e520e41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview8-28373-17" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview8-28375-11" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
+      <Sha>3602cec09a9505b5b97609a68fed0be969753fd1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview8-28373-17" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview8-28375-11" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
+      <Sha>3602cec09a9505b5b97609a68fed0be969753fd1</Sha>
     </Dependency>
-    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview8-28373-17" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview8-28375-11" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
+      <Sha>3602cec09a9505b5b97609a68fed0be969753fd1</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="1.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="1.6.0-preview8.19375.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
+      <Sha>605ff91f856177f52e3fcb76f2e65696e520e41c</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview8.19375.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
+      <Sha>605ff91f856177f52e3fcb76f2e65696e520e41c</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview8.19375.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
+      <Sha>605ff91f856177f52e3fcb76f2e65696e520e41c</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index c8eab96c6cb..bb963b2446a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,27 +27,27 @@
     <MicrosoftDataSqlClientPackageVersion>1.0.19189.1-Preview</MicrosoftDataSqlClientPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from aspnet/Extensions">
-    <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview8.19375.1</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview8.19375.1</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview8.19375.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview8.19375.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview8.19375.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview8.19375.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview8.19375.1</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview8.19375.5</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview8.19375.5</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview8.19375.5</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview8.19375.5</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview8.19375.5</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview8.19375.5</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview8.19375.5</MicrosoftExtensionsLoggingPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/corefx">
-    <MicrosoftCSharpPackageVersion>4.6.0-preview8.19372.8</MicrosoftCSharpPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview8.19372.8</MicrosoftNETCorePlatformsPackageVersion>
-    <SystemCollectionsImmutablePackageVersion>1.6.0-preview8.19372.8</SystemCollectionsImmutablePackageVersion>
-    <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview8.19372.8</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview8.19372.8</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <MicrosoftCSharpPackageVersion>4.6.0-preview8.19375.8</MicrosoftCSharpPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview8.19375.8</MicrosoftNETCorePlatformsPackageVersion>
+    <SystemCollectionsImmutablePackageVersion>1.6.0-preview8.19375.8</SystemCollectionsImmutablePackageVersion>
+    <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview8.19375.8</SystemComponentModelAnnotationsPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview8.19375.8</SystemDiagnosticsDiagnosticSourcePackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/core-setup">
-    <MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview8-28373-17</MicrosoftDotNetPlatformAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview8-28373-17</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview8-28373-17</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview8-28373-17</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <NETStandardLibraryRefPackageVersion>2.1.0-preview8-28373-17</NETStandardLibraryRefPackageVersion>
+    <MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview8-28375-11</MicrosoftDotNetPlatformAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview8-28375-11</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview8-28375-11</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview8-28375-11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <NETStandardLibraryRefPackageVersion>2.1.0-preview8-28375-11</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/roslyn">
     <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19374-05</MicrosoftNetCompilersToolsetVersion>