From 324cf99ce3fcc63ae5c596efe41ed9902253d39c Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 17 Feb 2021 20:43:45 +0000
Subject: [PATCH] Merged PR 12929: [internal/release/5.0] Update dependencies
 from dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:d7d10d70-26ab-4663-2902-08d89c6af29b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: d7d10d70-26ab-4663-2902-08d89c6af29b
- **Build**: 20210216.14
- **Date Produced**: 2/16/2021 11:36 PM
- **Commit**: f27d33729518f5aa478aa818b7b4f54a4d50bef1
- **Branch**: refs/heads/internal/release/5.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **System.Drawing.Common**: [from 5.0.2 to 5.0.2][1]
  - **Microsoft.NETCore.App.Internal**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.4 to 5.0.4][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1]
  - **System.Text.Encodings.Web**: [from 5.0.0 to 5.0.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC10fccb8&targetVersion=GCf27d337&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcf258a1&targetVersion=GCf27d337&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b)
---
 NuGet.config                                   |  4 ++--
 eng/Version.Details.xml                        | 18 +++++++++---------
 eng/Versions.props                             |  6 +++---
 .../AppWithP2PReference.csproj                 |  5 +++++
 .../ClassLibrary/ClassLibrary.csproj           |  5 +++++
 .../ClassLibrary2/ClassLibrary2.csproj         |  5 +++++
 .../LargeProject/LargeProject.csproj           |  5 +++++
 .../MvcWithComponents/MvcWithComponents.csproj |  5 +++++
 .../PackageLibraryDirectDependency.csproj      |  5 +++++
 .../PackageLibraryTransitiveDependency.csproj  |  5 +++++
 .../test/testassets/SimpleMvc/SimpleMvc.csproj |  5 +++++
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj     |  5 +++++
 .../testassets/SimplePages/SimplePages.csproj  |  5 +++++
 13 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 61e6f09ca0..9c291bc5af 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,7 +6,7 @@
     <!--  Begin: Package sources from dotnet-efcore -->
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-10fccb8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-10fccb80/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-f27d337" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f27d3372/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,7 +20,7 @@
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-10fccb8" value="true" />
+    <add key="darc-int-dotnet-runtime-f27d337" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-efcore -->
     <!--  End: Package sources from dotnet-efcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1076c743da..d80e20be1e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -207,7 +207,7 @@
     </Dependency>
     <Dependency Name="System.Drawing.Common" Version="5.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
     </Dependency>
     <Dependency Name="System.IO.Pipelines" Version="5.0.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
@@ -266,9 +266,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
+    <Dependency Name="System.Text.Encodings.Web" Version="5.0.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
     </Dependency>
     <Dependency Name="System.Text.Json" Version="5.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -296,15 +296,15 @@
     -->
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.4">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.4-servicing.21116.6">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.4-servicing.21116.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.4-servicing.21116.6">
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.4-servicing.21116.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 749db50a60..86222eb7b5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -58,10 +58,10 @@
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
     <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppInternalPackageVersion>5.0.4-servicing.21116.6</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.4-servicing.21116.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
     <MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
     <MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
     <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@@ -119,7 +119,7 @@
     <SystemSecurityPermissionsPackageVersion>5.0.0</SystemSecurityPermissionsPackageVersion>
     <SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
     <SystemServiceProcessServiceControllerPackageVersion>5.0.0</SystemServiceProcessServiceControllerPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>5.0.0</SystemTextEncodingsWebPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>5.0.1</SystemTextEncodingsWebPackageVersion>
     <SystemTextJsonPackageVersion>5.0.1</SystemTextJsonPackageVersion>
     <SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 55d3ad9e66..31c17ddd10 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -29,4 +29,9 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 42c33c219c..04c8fd3770 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -27,6 +27,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index 75deedd8cb..7956ba1433 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -24,6 +24,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 38ee709aec..46f4c830f2 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -31,6 +31,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 6bb3fcca8d..f5e72f635e 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -24,6 +24,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
index 2b81a4d5d7..721163731d 100644
--- a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
@@ -29,6 +29,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
index f5d0455baf..352a8a0e4b 100644
--- a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
@@ -30,6 +30,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 999e94839f..9eae58f9bf 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -24,6 +24,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index c4d3fba399..6356224e89 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -29,6 +29,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 999e94839f..9eae58f9bf 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -24,6 +24,11 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>