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

Commit 61a1422

Browse files
[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.
1 parent 09f5b75 commit 61a1422

File tree

5 files changed

+30
-16
lines changed

5 files changed

+30
-16
lines changed

dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
88
https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
99
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
10+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json;
11+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json;
1012
$(RestoreSources)
1113
</RestoreSources>
1214
</PropertyGroup>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<Uri>https://github.com/dotnet/arcade</Uri>
1919
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20460.1">
21+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21310.1">
2222
<Uri>https://github.com/dotnet/corefx</Uri>
23-
<Sha>fe18c4973e11d3302aa446039705948e95e20fe8</Sha>
23+
<Sha>2395c5067189349691684542705cc3d9dc73bfe0</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview3.19551.4">
2626
<Uri>https://github.com/dotnet/corefx</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- roslyn -->
2323
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
2424
<!-- corefx -->
25-
<MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-servicing.20460.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
25+
<MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-servicing.21310.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
2626
<MicrosoftNETCorePlatformsVersion>3.1.0</MicrosoftNETCorePlatformsVersion>
2727
<MicrosoftBclAsyncInterfacesVersion>1.0.0</MicrosoftBclAsyncInterfacesVersion>
2828
<SystemIOFileSystemAccessControlVersion>4.7.0</SystemIOFileSystemAccessControlVersion>

eng/pipelines/pr.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,24 @@ jobs:
9393

9494
#
9595
# CoreFX test runs against CoreCLR
96-
#
97-
- template: /eng/platform-matrix.yml
98-
parameters:
99-
jobTemplate: test-job.yml
100-
buildConfig: checked
101-
platforms:
102-
- Linux_x64
103-
- Windows_NT_x64
104-
helixQueueGroup: pr
105-
jobParameters:
106-
testGroup: innerloop
107-
corefxTests: true
108-
displayNameArgs: CoreFX
96+
# Now that the branch is on servicing, and the churn is low, exclude these as they
97+
# break far more often than they detect issues. These already run in CoreFX CI on release bits.
98+
# In case we want to bring them back for checked testing, we need to fix CoreFX.depproj.
99+
# It has a package - Microsoft.Private.CoreFx.OOB - that's supposed to bring in all deps
100+
# that are out of box. These are currently not getting restored and this ends up causing
101+
# File not found issues in the binder when compiling tests, making test exclusions impossible.
102+
# - template: /eng/platform-matrix.yml
103+
# parameters:
104+
# jobTemplate: test-job.yml
105+
# buildConfig: checked
106+
# platforms:
107+
# - Linux_x64
108+
# - Windows_NT_x64
109+
# helixQueueGroup: pr
110+
# jobParameters:
111+
# testGroup: innerloop
112+
# corefxTests: true
113+
# displayNameArgs: CoreFX
109114

110115
#
111116
# Release test builds

tests/CoreFX/CoreFX.issues.rsp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,10 @@
8989

9090
# Test failure: https://github.com/dotnet/runtime/issues/43166
9191
-nomethod System.IO.Tests.File_GetSetTimes.SetDateTimeMax
92+
93+
# We have issues in restoring the OOB packages to run these tests. Disable for now.
94+
-nonamespace System.Data.Common.Tests
95+
-nonamespace System.IO.Pipelines.Tests
96+
-nonamespace System.Resources.Extensions.Tests
97+
-nonamespace System.Resources.ResourceManager.Tests
98+
-nonamespace System.Runtime.Serialization.Formatters.Tests

0 commit comments

Comments
 (0)