From a9d80f0c343ef7672e2ad26b408bdd5f23d44e94 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Sun, 15 Dec 2019 15:36:57 +0000
Subject: [PATCH] Merged PR 4905: [internal/release/3.0] Update dependencies
 from 1 repositories

This pull request updates the following dependencies

[marker]: <> (Begin:84a76f0f-36f1-4cd1-d435-08d76e1d3434)
## From https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling
- **Build**: 20191214.13
- **Date Produced**: 12/15/2019 3:31 AM
- **Commit**: 7dfb8241da14b065a0453b969c570a6736f31b54
- **Branch**: refs/heads/internal/release/3.0
- **Updates**:
  - **Microsoft.NET.Sdk.Razor** -> 3.0.2
  - **Microsoft.CodeAnalysis.Razor** -> 3.0.2
  - **Microsoft.AspNetCore.Razor.Language** -> 3.0.2
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions** -> 3.0.2

[marker]: <> (End:84a76f0f-36f1-4cd1-d435-08d76e1d3434)

[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)

- **System.Drawing.Common** -> 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- **Microsoft.NETCore.Platforms** -> 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[marker]: <> (End:Coherency Updates)
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 32 ++++++++++++++++----------------
 eng/Versions.props      | 12 ++++++------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f16d27e02566..29d97455ba66 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,11 +4,11 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-corefx-e14c43e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-e14c43ea/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
     <add key="darc-int-dotnet-core-setup-a2c3406" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a2c3406f/nuget/v3/index.json" />
     <add key="darc-int-aspnet-Extensions-63e13de" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-Extensions-63e13dee/nuget/v3/index.json" />
     <add key="darc-int-aspnet-EntityFrameworkCore-81030a9" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-EntityFrameworkCore-81030a95/nuget/v3/index.json" />
+    <add key="darc-int-aspnet-AspNetCore-Tooling-7dfb824" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-Tooling-7dfb8241/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" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 677fc139c25a..0d556587a693 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,21 +13,21 @@
       <Uri>https://github.com/aspnet/Blazor</Uri>
       <Sha>23338158154b064321d9d5c418d0fb71264d7bf9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.2-servicing.19604.5">
-      <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>cd54de885d24453291d091012405187d8e52aaed</Sha>
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.2">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling</Uri>
+      <Sha>7dfb8241da14b065a0453b969c570a6736f31b54</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.2-servicing.19604.5">
-      <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>cd54de885d24453291d091012405187d8e52aaed</Sha>
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.2">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling</Uri>
+      <Sha>7dfb8241da14b065a0453b969c570a6736f31b54</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.2-servicing.19604.5">
-      <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>cd54de885d24453291d091012405187d8e52aaed</Sha>
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.2">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling</Uri>
+      <Sha>7dfb8241da14b065a0453b969c570a6736f31b54</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.2-servicing.19604.5">
-      <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>cd54de885d24453291d091012405187d8e52aaed</Sha>
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.2">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling</Uri>
+      <Sha>7dfb8241da14b065a0453b969c570a6736f31b54</Sha>
     </Dependency>
     <Dependency Name="dotnet-ef" Version="3.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore</Uri>
@@ -313,9 +313,9 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="4.6.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Drawing.Common" Version="4.6.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>e14c43ea3f727d1ed8844014aae8b168cc608b22</Sha>
+      <Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
     </Dependency>
     <Dependency Name="System.IO.Pipelines" Version="4.6.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
@@ -409,9 +409,9 @@
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>e14c43ea3f727d1ed8844014aae8b168cc608b22</Sha>
+      <Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
     </Dependency>
     <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.0.2-servicing.19612.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 879c66347e87..5b176b8b2a93 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -77,7 +77,7 @@
     <MicrosoftWin32SystemEventsPackageVersion>4.6.0</MicrosoftWin32SystemEventsPackageVersion>
     <SystemComponentModelAnnotationsPackageVersion>4.6.0</SystemComponentModelAnnotationsPackageVersion>
     <SystemDiagnosticsEventLogPackageVersion>4.6.0</SystemDiagnosticsEventLogPackageVersion>
-    <SystemDrawingCommonPackageVersion>4.6.2</SystemDrawingCommonPackageVersion>
+    <SystemDrawingCommonPackageVersion>4.6.0</SystemDrawingCommonPackageVersion>
     <SystemIOPipelinesPackageVersion>4.6.0</SystemIOPipelinesPackageVersion>
     <SystemNetHttpWinHttpHandlerPackageVersion>4.6.0</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0</SystemNetWebSocketsWebSocketProtocolPackageVersion>
@@ -94,7 +94,7 @@
     <SystemThreadingChannelsPackageVersion>4.6.0</SystemThreadingChannelsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>4.6.0</SystemWindowsExtensionsPackageVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsPackageVersion>3.0.1</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>3.0.0</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from aspnet/Blazor -->
     <MicrosoftAspNetCoreBlazorMonoPackageVersion>3.0.0-preview9.19577.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
     <!-- Packages from aspnet/Extensions -->
@@ -168,10 +168,10 @@
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>3.0.2</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from aspnet/AspNetCore-Tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.2-servicing.19604.5</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.2-servicing.19604.5</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.2-servicing.19604.5</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.2-servicing.19604.5</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.2</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.2</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>3.0.2</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--