Skip to content

Commit e5d3faa

Browse files
authored
Feb 3.1 Update coreFX (#1481)
* update corefx * prebuilts: update versions: online baseline * pipelines: dont continue on error for corefx tests, increase timeout
1 parent d582020 commit e5d3faa

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

.vsts.pipelines/jobs/ci-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ jobs:
106106
du -h $(rootDirectory) | sort -h | tail -n 50
107107
displayName: Run unit tests
108108
condition: and(succeeded(), eq(variables['runUnitTests'], true))
109-
timeoutInMinutes: 80
110-
continueOnError: true
109+
timeoutInMinutes: 120
110+
continueOnError: false
111111
112112
# Create tarball.
113113
- script: |

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
</Dependency>
4444
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
4545
<Uri>https://github.com/dotnet/corefx</Uri>
46-
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
46+
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
4747
<RepoName>corefx</RepoName>
4848
</Dependency>
4949
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
5050
<Uri>https://github.com/dotnet/corefx</Uri>
51-
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
51+
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
5252
<RepoName>corefx-portable</RepoName>
5353
</Dependency>
5454
<Dependency Name="Microsoft.NETCore.App" Version="3.1.2-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">

tools-local/prebuilt-baseline-online.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<Dir>bin/src/core-setup.916b5cba268e1e1e803243004f4276cf40b2dda8/</Dir>
1616
<Dir>bin/src/coreclr.fd22fd600a2526a7c58536da0e80325eb710d7f1/</Dir>
1717
<Dir>bin/src/coreclr.fd22fd600a2526a7c58536da0e80325eb710d7f1/</Dir>
18-
<Dir>bin/src/corefx.0f7f38c4fd323b26da10cce95f857f77f0f09b48/</Dir>
19-
<Dir>bin/src/corefx.0f7f38c4fd323b26da10cce95f857f77f0f09b48/</Dir>
18+
<Dir>bin/src/corefx.e946cebe43a510e8c6476bbc8185d1445df33a1a/</Dir>
19+
<Dir>bin/src/corefx.e946cebe43a510e8c6476bbc8185d1445df33a1a/</Dir>
2020
<Dir>bin/src/fsharp.dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e/</Dir>
2121
<Dir>bin/src/known-good-tests./</Dir>
2222
<Dir>bin/src/known-good./</Dir>
@@ -80,8 +80,7 @@
8080
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta3" />
8181
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta4" />
8282
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1" />
83-
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19474.3" IsDirectDependency="true" />
84-
<Usage Id="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19461.7" />
83+
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19577.5" IsDirectDependency="true" />
8584
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" IsDirectDependency="true" />
8685
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
8786
<Usage Id="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19359.6" IsDirectDependency="true" IsAutoReferenced="true" />
@@ -106,7 +105,6 @@
106105
<Usage Id="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0" />
107106
<Usage Id="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20066.4" />
108107
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0" IsDirectDependency="true" />
109-
<Usage Id="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19565.4" IsDirectDependency="true" IsAutoReferenced="true" />
110108
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
111109
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
112110
<Usage Id="Microsoft.NETCore.App.Ref" Version="3.0.0" />

0 commit comments

Comments
 (0)