Skip to content

Commit 3ef9fbe

Browse files
authored
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
1 parent a2ffaf9 commit 3ef9fbe

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.azure/pipelines/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,7 @@ stages:
573573
jobName: MacOS_Test
574574
jobDisplayName: "Test: macOS 10.14"
575575
agentOs: macOS
576+
timeoutInMinutes: 240
576577
isTestingJob: true
577578
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
578579
beforeBuild:

.azure/pipelines/quarantined-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
jobName: MacOS_Quarantined_Test
8787
jobDisplayName: "Tests: macOS 10.14"
8888
agentOs: macOS
89-
timeoutInMinutes: 60
89+
timeoutInMinutes: 120
9090
isTestingJob: true
9191
steps:
9292
- bash: ./build.sh --all --pack --ci --nobl --no-build-java

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@
329329
<Uri>https://github.com/dotnet/arcade</Uri>
330330
<Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20407.3">
332+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20403.2" Pinned="true">
333333
<Uri>https://github.com/dotnet/roslyn</Uri>
334-
<Sha>dba2fa57432b4bd9cc7880e2c6fe3acdd01bba3c</Sha>
334+
<Sha>b6a07e61473ed8a804de465f7c1cb5c17f80732d</Sha>
335335
</Dependency>
336336
</ToolsetDependencies>
337337
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/roslyn -->
65-
<MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20407.3</MicrosoftNetCompilersToolsetPackageVersion>
65+
<MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20403.2</MicrosoftNetCompilersToolsetPackageVersion>
6666
<!-- Packages from dotnet/runtime -->
6767
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.2.20452.8</MicrosoftExtensionsDependencyModelPackageVersion>
6868
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20452.8</MicrosoftNETCoreAppInternalPackageVersion>

0 commit comments

Comments
 (0)