Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
[release/3.1] Update dependencies from dotnet/corefx (#28179)
Browse files Browse the repository at this point in the history
[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.
  • Loading branch information
dotnet-maestro[bot] authored Jul 9, 2021
1 parent 09f5b75 commit 61a1422
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 16 deletions.
2 changes: 2 additions & 0 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
31 changes: 18 additions & 13 deletions eng/pipelines/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/CoreFX/CoreFX.issues.rsp
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 61a1422

Please sign in to comment.