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)
2021-02-17 20:43:45 +00:00 · 2021-02-17 20:43:45 +00:00 · 324cf99ce3
parent 1df900ee43
commit 324cf99ce3
13 changed files with 64 additions and 14 deletions
--- 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 -->
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>