huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Quick infrastructure fix-ups (#25545) 

- pin Microsoft.Net.Compilers.Toolset version to isolate us from Arcade
  - the version now matches dotnet/runtime
  - may move the pin to later version later in RC2 if needed
- double the macOS job max. length in our normal and quarantined PR runs
  - have been seeing them timeout or come very close too often
This commit is contained in:
Doug Bunting 2020-09-02 19:45:36 -07:00 committed by GitHub
parent a2ffaf95ca
commit 3ef9fbee42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.azure/pipelines/ci.yml
View File

@ -573,6 +573,7 @@ stages:
jobName: MacOS_Test jobName: MacOS_Test
jobDisplayName: "Test: macOS 10.14" jobDisplayName: "Test: macOS 10.14"
agentOs: macOS agentOs: macOS
timeoutInMinutes: 240
isTestingJob: true isTestingJob: true
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs) buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
beforeBuild: beforeBuild:

2
.azure/pipelines/quarantined-pr.yml
View File

@ -86,7 +86,7 @@ jobs:
jobName: MacOS_Quarantined_Test jobName: MacOS_Quarantined_Test
jobDisplayName: "Tests: macOS 10.14" jobDisplayName: "Tests: macOS 10.14"
agentOs: macOS agentOs: macOS
timeoutInMinutes: 60 timeoutInMinutes: 120
isTestingJob: true isTestingJob: true
steps: steps:
- bash: ./build.sh --all --pack --ci --nobl --no-build-java - bash: ./build.sh --all --pack --ci --nobl --no-build-java

4
eng/Version.Details.xml
View File

@ -329,9 +329,9 @@
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha> <Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20407.3"> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20403.2" Pinned="true">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>dba2fa57432b4bd9cc7880e2c6fe3acdd01bba3c</Sha> <Sha>b6a07e61473ed8a804de465f7c1cb5c17f80732d</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

2
eng/Versions.props
View File

@ -62,7 +62,7 @@
--> -->
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<!-- Packages from dotnet/roslyn --> <!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20407.3</MicrosoftNetCompilersToolsetPackageVersion> <MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20403.2</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/runtime --> <!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.2.20452.8</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.2.20452.8</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20452.8</MicrosoftNETCoreAppInternalPackageVersion> <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20452.8</MicrosoftNETCoreAppInternalPackageVersion>