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) 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 @@ https://github.com/dotnet/arcade 9467b1074927ee3fe98d539d3b72f5686c861958 - + https://github.com/dotnet/corefx - fe18c4973e11d3302aa446039705948e95e20fe8 + 2395c5067189349691684542705cc3d9dc73bfe0 https://github.com/dotnet/corefx 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 @@ 3.3.0-beta2-19367-02 - 4.7.0-servicing.20460.1 + 4.7.0-servicing.21310.1 3.1.0 1.0.0 4.7.0 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