From b29f1fa5eafb25dd6cf3947cc645b2e1c375f3fc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2020 13:33:45 -0700
Subject: [PATCH] [master] Update dependencies from dotnet/aspnetcore-tooling
 (#20634)

* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200407.1

- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.4.20207.1
- Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.4.20207.1
- Microsoft.CodeAnalysis.Razor - 5.0.0-preview.4.20207.1
- Microsoft.NET.Sdk.Razor - 5.0.0-preview.4.20207.1

Dependency coherency updates

- Microsoft.Net.Compilers.Toolset - 3.6.0-3.20205.2 (parent: Microsoft.Extensions.Logging)

* Install the latest NuGet exe

* Match Compilers.Toolset version used in aspnetcore-tooling build

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Pranav K <prkrishn@hotmail.com>
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
---
 .azure/pipelines/jobs/default-build.yml |  1 +
 eng/Version.Details.xml                 | 26 ++++++++++++-------------
 eng/Versions.props                      | 10 +++++-----
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index f1596a7b10..df5adbe436 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -138,6 +138,7 @@ jobs:
         inputs:
           versionSpec: 10.x
     - ${{ if eq(parameters.agentOs, 'Windows') }}:
+      - task: NuGetToolInstaller@1
       - task: NuGetCommand@2
         displayName: 'Clear NuGet caches'
         condition: succeeded()
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2544db8bae..3e7948051d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,21 +13,21 @@
       <Uri>https://github.com/dotnet/blazor</Uri>
       <Sha>dd7fb4d3931d556458f62642c2edfc59f6295bfb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.4.20206.3">
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.4.20207.1">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>b3ac44798c16fff5b95dbcfe62dea84aa9a1bd72</Sha>
+      <Sha>41aa4887fba81a40c272a18011a32e04e28bbc77</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.4.20206.3">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.4.20207.1">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>b3ac44798c16fff5b95dbcfe62dea84aa9a1bd72</Sha>
+      <Sha>41aa4887fba81a40c272a18011a32e04e28bbc77</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.4.20206.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.4.20207.1">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>b3ac44798c16fff5b95dbcfe62dea84aa9a1bd72</Sha>
+      <Sha>41aa4887fba81a40c272a18011a32e04e28bbc77</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.4.20206.3">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.4.20207.1">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>b3ac44798c16fff5b95dbcfe62dea84aa9a1bd72</Sha>
+      <Sha>41aa4887fba81a40c272a18011a32e04e28bbc77</Sha>
     </Dependency>
     <Dependency Name="dotnet-ef" Version="5.0.0-preview.4.20203.1" Pinned="true">
       <Uri>https://github.com/dotnet/efcore</Uri>
@@ -41,15 +41,15 @@
       <Uri>https://github.com/dotnet/efcore</Uri>
       <Sha>b0636ed8050797d0a9c16da8b98c2eea7d7e1f16</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite"  Version="5.0.0-preview.4.20203.1" Pinned="true">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-preview.4.20203.1" Pinned="true">
       <Uri>https://github.com/dotnet/efcore</Uri>
       <Sha>b0636ed8050797d0a9c16da8b98c2eea7d7e1f16</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer"  Version="5.0.0-preview.4.20203.1" Pinned="true">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-preview.4.20203.1" Pinned="true">
       <Uri>https://github.com/dotnet/efcore</Uri>
       <Sha>b0636ed8050797d0a9c16da8b98c2eea7d7e1f16</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools"  Version="5.0.0-preview.4.20203.1" Pinned="true">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.4.20203.1" Pinned="true">
       <Uri>https://github.com/dotnet/efcore</Uri>
       <Sha>b0636ed8050797d0a9c16da8b98c2eea7d7e1f16</Sha>
     </Dependency>
@@ -312,9 +312,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.6.0-2.20166.2" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.6.0-3.20205.2" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7c35456e3bce4d90e2fd3053ba7b7227b1aec0b6</Sha>
+      <Sha>359f526947e69db7cd153a67eb27c2b8ed372358</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 53b4bfa835..c355b43f2d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -64,7 +64,7 @@
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20201.2</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>3.6.0-2.20166.2</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>3.6.0-3.20205.2</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/runtime -->
     <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.4.20205.13</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.4.20205.13</MicrosoftNETCoreAppInternalPackageVersion>
@@ -137,10 +137,10 @@
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.4.20203.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.4.20203.1</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from dotnet/aspnetcore-tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.4.20206.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.4.20206.3</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.4.20206.3</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.4.20206.3</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.4.20207.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.4.20207.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.4.20207.1</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.4.20207.1</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--