From d17c7b5d3d29a78db4c1273320c7bc9a2f3321c1 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Fri, 15 Jan 2021 21:57:55 +0000
Subject: [PATCH] [internal/release/5.0] Update dependencies from
 dnceng/internal/dotnet-runtime

 - Correct System.Diagnostics.EventLog.Messages workaround for servicing

 - Update tests to expect System.Diagnostics.EventLog.Messages

 - Merge remote-tracking branch 'dnceng/internal/release/5.0' into darc-internal/release/5.0-109c1e6f-a65e-448d-b842-9621f60826f6
---
 NuGet.config                                  |  6 ++++-
 eng/Version.Details.xml                       | 22 +++++++++----------
 eng/Versions.props                            |  8 +++----
 .../Microsoft.AspNetCore.App.UnitTests.csproj | 10 ++++++++-
 src/Framework/test/TestData.cs                |  1 +
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 632ebf879b..402053fd88 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
     <add key="darc-int-dotnet-efcore-efc2924" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-efc2924e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-f37e9a0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f37e9a07/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-75b9165" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-75b91655/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" />
@@ -28,6 +28,10 @@
     <add key="darc-int-dotnet-efcore-ff5f100" value="true" />
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-f37e9a0" value="true" />
+    <add key="darc-int-dotnet-runtime-d070c3f" value="true" />
+    <add key="darc-int-dotnet-runtime-c37365f" value="true" />
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-75b9165" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-efcore -->
     <add key="darc-int-dotnet-efcore-efc2924" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 31fbefe74a..650fa89323 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,9 +197,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
+    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>75b9165595c9d88edbd452d06bbdc05f950a563b</Sha>
     </Dependency>
     <Dependency Name="System.DirectoryServices.Protocols" Version="5.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
@@ -296,22 +296,22 @@
     -->
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.3">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>f37e9a07051328a2dde6fb33845523d1681c0c66</Sha>
+      <Sha>75b9165595c9d88edbd452d06bbdc05f950a563b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.3-servicing.21063.16">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.3-servicing.21064.20">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>f37e9a07051328a2dde6fb33845523d1681c0c66</Sha>
+      <Sha>75b9165595c9d88edbd452d06bbdc05f950a563b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.3-servicing.21063.16">
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.3-servicing.21064.20">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>f37e9a07051328a2dde6fb33845523d1681c0c66</Sha>
+      <Sha>75b9165595c9d88edbd452d06bbdc05f950a563b</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>75b9165595c9d88edbd452d06bbdc05f950a563b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21063.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8d13d33275..0e720463db 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.3-servicing.21063.16</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>5.0.3-servicing.21064.20</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.3-servicing.21063.16</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.3-servicing.21064.20</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
     <MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
     <MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
     <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@@ -101,7 +101,7 @@
     <MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rtm.20519.4</MicrosoftExtensionsInternalTransportPackageVersion>
     <SystemComponentModelAnnotationsPackageVersion>5.0.0</SystemComponentModelAnnotationsPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>5.0.0</SystemDiagnosticsEventLogPackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>5.0.1</SystemDiagnosticsEventLogPackageVersion>
     <SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion>
     <SystemDrawingCommonPackageVersion>5.0.0</SystemDrawingCommonPackageVersion>
     <SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
@@ -124,7 +124,7 @@
     <SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsPackageVersion>5.0.0</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>5.0.1</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from dotnet/efcore -->
     <dotnetefPackageVersion>5.0.3</dotnetefPackageVersion>
     <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index fae3483c22..6eba8717f4 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -12,7 +12,15 @@
     <!-- Ignore aspnetcorev2_inprocess because tests expect only managed assemblies in this item group. -->
     <_SharedFrameworkBinariesFromRepo Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)" />
 
-    <_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo);@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" />
+    <!--
+      Special-case System.Diagnostics.EventLog.Messages.dll because that assembly name does _not_ match a
+      package. Can't mention it in @(ExternalAspNetCoreAppReference) or underlying
+      @(_TransitiveExternalAspNetCoreAppReference) without thoroughly confusing eng/targets/ResolveReferences.targets.
+    -->
+    <_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo);
+        @(ExternalAspNetCoreAppReference);
+        @(_TransitiveExternalAspNetCoreAppReference);
+        System.Diagnostics.EventLog.Messages" />
     <_ExpectedSharedFrameworkBinaries Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'" Include="aspnetcorev2_inprocess" />
 
     <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs
index 7d2237ffaa..4da187022b 100644
--- a/src/Framework/test/TestData.cs
+++ b/src/Framework/test/TestData.cs
@@ -143,6 +143,7 @@ namespace Microsoft.AspNetCore
                 "Microsoft.Net.Http.Headers",
                 "Microsoft.Win32.SystemEvents",
                 "System.Diagnostics.EventLog",
+                "System.Diagnostics.EventLog.Messages",
                 "System.Drawing.Common",
                 "System.IO.Pipelines",
                 "System.Security.Cryptography.Pkcs",