Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feb 3.1 Update coreFX #1481

Merged
merged 3 commits into from
Feb 14, 2020
Merged

Feb 3.1 Update coreFX #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b79d57
update corefx
adaggarwal Feb 13, 2020
978665e
prebuilts: update versions: online baseline
adaggarwal Feb 13, 2020
729d408
pipelines: dont continue on error for corefx tests, increase timeout
adaggarwal Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vsts.pipelines/jobs/ci-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ jobs:
du -h $(rootDirectory) | sort -h | tail -n 50
displayName: Run unit tests
condition: and(succeeded(), eq(variables['runUnitTests'], true))
timeoutInMinutes: 80
continueOnError: true
timeoutInMinutes: 120
continueOnError: false

# Create tarball.
- script: |
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
<RepoName>corefx</RepoName>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
<RepoName>corefx-portable</RepoName>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.1.2-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
Expand Down
8 changes: 3 additions & 5 deletions tools-local/prebuilt-baseline-online.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<Dir>bin/src/core-setup.916b5cba268e1e1e803243004f4276cf40b2dda8/</Dir>
<Dir>bin/src/coreclr.fd22fd600a2526a7c58536da0e80325eb710d7f1/</Dir>
<Dir>bin/src/coreclr.fd22fd600a2526a7c58536da0e80325eb710d7f1/</Dir>
<Dir>bin/src/corefx.0f7f38c4fd323b26da10cce95f857f77f0f09b48/</Dir>
<Dir>bin/src/corefx.0f7f38c4fd323b26da10cce95f857f77f0f09b48/</Dir>
<Dir>bin/src/corefx.e946cebe43a510e8c6476bbc8185d1445df33a1a/</Dir>
<Dir>bin/src/corefx.e946cebe43a510e8c6476bbc8185d1445df33a1a/</Dir>
<Dir>bin/src/fsharp.dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e/</Dir>
<Dir>bin/src/known-good-tests./</Dir>
<Dir>bin/src/known-good./</Dir>
Expand Down Expand Up @@ -80,8 +80,7 @@
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta3" />
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta4" />
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1" />
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19474.3" IsDirectDependency="true" />
<Usage Id="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19461.7" />
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19577.5" IsDirectDependency="true" />
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" IsDirectDependency="true" />
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
<Usage Id="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19359.6" IsDirectDependency="true" IsAutoReferenced="true" />
Expand All @@ -106,7 +105,6 @@
<Usage Id="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0" />
<Usage Id="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20066.4" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19565.4" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App.Ref" Version="3.0.0" />
Expand Down