Merge in 'release/3.1' changes

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>

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>

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>

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

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