From e218ba880664c5e2e472b806bb69df7afdbc6a12 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 14 Aug 2020 00:36:41 +0000
Subject: [PATCH] [release/3.1] Update dependencies from
 dotnet/aspnetcore-tooling dotnet/efcore (#24820)

[release/3.1] Update dependencies from dotnet/aspnetcore-tooling dotnet/efcore
- Updates:
  - Microsoft.AspNetCore.Razor.Language: from 3.1.6 to 3.1.8
  - Microsoft.CodeAnalysis.Razor: from 3.1.6 to 3.1.8
  - Microsoft.NET.Sdk.Razor: from 3.1.6 to 3.1.8
  - Microsoft.AspNetCore.Mvc.Razor.Extensions: from 3.1.6 to 3.1.8

- Coherency Updates:
  - Microsoft.Extensions.DependencyModel: from 3.1.6 to 3.1.3 (parent: Microsoft.Extensions.Logging)

- Updates:
  - Microsoft.EntityFrameworkCore.Tools: from 3.1.7 to 3.1.8
  - Microsoft.EntityFrameworkCore.InMemory: from 3.1.7 to 3.1.8
  - Microsoft.EntityFrameworkCore: from 3.1.7 to 3.1.8
  - Microsoft.EntityFrameworkCore.Relational: from 3.1.7 to 3.1.8
  - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.7 to 3.1.8
  - dotnet-ef: from 3.1.7 to 3.1.8
  - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.7 to 3.1.8
  - Microsoft.Extensions.DependencyModel: from 3.1.6 to 3.1.3

 - Merge branch 'release/3.1' into darc-release/3.1-7744003f-eff2-4bed-a56b-e0b85640660a
---
 NuGet.config            |  7 ++---
 eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
 eng/Versions.props      | 24 +++++++--------
 3 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 2323cdac01..d9f3de74c5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,10 +3,8 @@
   <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-pub-dotnet-corefx-66409e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-66409e39/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-blazor-cc44960" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-blazor-cc449601/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-efcore-af3fee7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-af3fee79/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-aspnetcore-tooling-f9ccbc7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-f9ccbc71/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" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -14,4 +12,5 @@
     <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
+  <disabledPackageSources />
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7072fce607..600172236d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,49 +17,49 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>66409e392d64ed96e5d3a5fda712d9baf51196ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri>
-      <Sha>1c22292bc7fca352074d8862cf39fbdb8647f208</Sha>
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.8">
+      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
+      <Sha>f9ccbc7177ef0423143a6c31292a30b4624fdf53</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri>
-      <Sha>1c22292bc7fca352074d8862cf39fbdb8647f208</Sha>
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.8">
+      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
+      <Sha>f9ccbc7177ef0423143a6c31292a30b4624fdf53</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri>
-      <Sha>1c22292bc7fca352074d8862cf39fbdb8647f208</Sha>
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.1.8">
+      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
+      <Sha>f9ccbc7177ef0423143a6c31292a30b4624fdf53</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri>
-      <Sha>1c22292bc7fca352074d8862cf39fbdb8647f208</Sha>
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.8">
+      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
+      <Sha>f9ccbc7177ef0423143a6c31292a30b4624fdf53</Sha>
     </Dependency>
-    <Dependency Name="dotnet-ef" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>cad165e731fc0bcc9ab725c718177ebaf0820705</Sha>
+    <Dependency Name="dotnet-ef" Version="3.1.8">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>af3fee79e0aeccfb19e12a0b752417a8c4bb46a9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>cad165e731fc0bcc9ab725c718177ebaf0820705</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.8">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>af3fee79e0aeccfb19e12a0b752417a8c4bb46a9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>cad165e731fc0bcc9ab725c718177ebaf0820705</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>af3fee79e0aeccfb19e12a0b752417a8c4bb46a9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>cad165e731fc0bcc9ab725c718177ebaf0820705</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>af3fee79e0aeccfb19e12a0b752417a8c4bb46a9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>cad165e731fc0bcc9ab725c718177ebaf0820705</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>af3fee79e0aeccfb19e12a0b752417a8c4bb46a9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>cad165e731fc0bcc9ab725c718177ebaf0820705</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.8">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>af3fee79e0aeccfb19e12a0b752417a8c4bb46a9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.7">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>cad165e731fc0bcc9ab725c718177ebaf0820705</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.8">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>af3fee79e0aeccfb19e12a0b752417a8c4bb46a9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.7-servicing.20371.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
@@ -377,7 +377,7 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.6" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9b5a0a1ca2..16780619d9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -68,7 +68,7 @@
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
-    <MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>3.1.3</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftNETCoreAppInternalPackageVersion>3.1.7-servicing.20371.4</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
@@ -163,18 +163,18 @@
     <MicrosoftInternalExtensionsRefsPackageVersion>3.1.0-rtm.19565.4</MicrosoftInternalExtensionsRefsPackageVersion>
     <MicrosoftJSInteropPackageVersion>3.1.7</MicrosoftJSInteropPackageVersion>
     <!-- Packages from aspnet/EntityFrameworkCore -->
-    <dotnetefPackageVersion>3.1.7</dotnetefPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.1.7</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.1.7</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.1.7</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.1.7</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.1.7</MicrosoftEntityFrameworkCoreToolsPackageVersion>
-    <MicrosoftEntityFrameworkCorePackageVersion>3.1.7</MicrosoftEntityFrameworkCorePackageVersion>
+    <dotnetefPackageVersion>3.1.8</dotnetefPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.1.8</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.1.8</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.1.8</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.1.8</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.1.8</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>3.1.8</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from aspnet/AspNetCore-Tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.1.7</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.7</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>3.1.7</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.1.7</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.1.8</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.8</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>3.1.8</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>3.1.8</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--