From 61a14220c23378c12139b5b1e2fe6996c533fe06 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 9 Jul 2021 21:10:24 +0000
Subject: [PATCH] [release/3.1] Update dependencies from dotnet/corefx (#28179)

[release/3.1] Update dependencies from dotnet/corefx


 - Add 3.1 AzDO feeds to the test build to ensure that the test build can correctly restore the CoreFX build.

It seems that the new CoreFX build isn't on the old blob feeds, so without this fix, we end up restoring the first 5.0.0-alpha.1 build instead of the build we want.

 - Exclude tests that depend on OOB assemblies.

 - Turn off CoreFX test legs in CI.

Now that the branch is on servicing, and the churn is low, exclude these as they
break far more often than they detect issues. These already run in CoreFX CI on release bits.
In case we want to bring them back for checked testing, we need to fix CoreFX.depproj.
It has a package - Microsoft.Private.CoreFx.OOB - that's supposed to bring in all deps
that are out of box. These are currently not getting restored and this ends up causing
File not found issues in the binder when compiling tests, making test exclusions impossible.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
---
 dependencies.props             |  2 ++
 eng/Version.Details.xml        |  4 ++--
 eng/Versions.props             |  2 +-
 eng/pipelines/pr.yml           | 31 ++++++++++++++++++-------------
 tests/CoreFX/CoreFX.issues.rsp |  7 +++++++
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index 72a6ffe25bae..b5ac8b45de59 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -7,6 +7,8 @@
       https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
       https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
       https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json;
       $(RestoreSources)
     </RestoreSources>
   </PropertyGroup>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3f90a5a1027d..bd121841251a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -18,9 +18,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20460.1">
+    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21310.1">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>fe18c4973e11d3302aa446039705948e95e20fe8</Sha>
+      <Sha>2395c5067189349691684542705cc3d9dc73bfe0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview3.19551.4">
       <Uri>https://github.com/dotnet/corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d6e19b73e24e..47557356170d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,7 +22,7 @@
     <!-- roslyn -->
     <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
     <!-- corefx -->
-    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-servicing.20460.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
+    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-servicing.21310.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
     <MicrosoftNETCorePlatformsVersion>3.1.0</MicrosoftNETCorePlatformsVersion>
     <MicrosoftBclAsyncInterfacesVersion>1.0.0</MicrosoftBclAsyncInterfacesVersion>
     <SystemIOFileSystemAccessControlVersion>4.7.0</SystemIOFileSystemAccessControlVersion>
diff --git a/eng/pipelines/pr.yml b/eng/pipelines/pr.yml
index 33ff8c699737..e3230af8a8ca 100644
--- a/eng/pipelines/pr.yml
+++ b/eng/pipelines/pr.yml
@@ -93,19 +93,24 @@ jobs:
 
 #
 # CoreFX test runs against CoreCLR
-#
-- template: /eng/platform-matrix.yml
-  parameters:
-    jobTemplate: test-job.yml
-    buildConfig: checked
-    platforms:
-    - Linux_x64
-    - Windows_NT_x64
-    helixQueueGroup: pr
-    jobParameters:
-      testGroup: innerloop
-      corefxTests: true
-      displayNameArgs: CoreFX
+# Now that the branch is on servicing, and the churn is low, exclude these as they
+# break far more often than they detect issues. These already run in CoreFX CI on release bits.
+# In case we want to bring them back for checked testing, we need to fix CoreFX.depproj.
+# It has a package - Microsoft.Private.CoreFx.OOB - that's supposed to bring in all deps
+# that are out of box. These are currently not getting restored and this ends up causing 
+# File not found issues in the binder when compiling tests, making test exclusions impossible.
+# - template: /eng/platform-matrix.yml
+#   parameters:
+#     jobTemplate: test-job.yml
+#     buildConfig: checked
+#     platforms:
+#     - Linux_x64
+#     - Windows_NT_x64
+#     helixQueueGroup: pr
+#     jobParameters:
+#       testGroup: innerloop
+#       corefxTests: true
+#       displayNameArgs: CoreFX
 
 #
 # Release test builds
diff --git a/tests/CoreFX/CoreFX.issues.rsp b/tests/CoreFX/CoreFX.issues.rsp
index 0d1a44452d8b..82ca7f8abd75 100644
--- a/tests/CoreFX/CoreFX.issues.rsp
+++ b/tests/CoreFX/CoreFX.issues.rsp
@@ -89,3 +89,10 @@
 
 # Test failure: https://github.com/dotnet/runtime/issues/43166
 -nomethod System.IO.Tests.File_GetSetTimes.SetDateTimeMax
+
+# We have issues in restoring the OOB packages to run these tests. Disable for now.
+-nonamespace System.Data.Common.Tests
+-nonamespace System.IO.Pipelines.Tests
+-nonamespace System.Resources.Extensions.Tests
+-nonamespace System.Resources.ResourceManager.Tests
+-nonamespace System.Runtime.Serialization.Formatters.Tests