From 3ef9fbee42ae846797b771d86efecbf277556ea9 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 2 Sep 2020 19:45:36 -0700
Subject: [PATCH] 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
---
 .azure/pipelines/ci.yml             | 1 +
 .azure/pipelines/quarantined-pr.yml | 2 +-
 eng/Version.Details.xml             | 4 ++--
 eng/Versions.props                  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index bbf6b58667..801eb09923 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -573,6 +573,7 @@ stages:
         jobName: MacOS_Test
         jobDisplayName: "Test: macOS 10.14"
         agentOs: macOS
+        timeoutInMinutes: 240
         isTestingJob: true
         buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
         beforeBuild:
diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
index adcff0e305..13a7236c3a 100644
--- a/.azure/pipelines/quarantined-pr.yml
+++ b/.azure/pipelines/quarantined-pr.yml
@@ -86,7 +86,7 @@ jobs:
     jobName: MacOS_Quarantined_Test
     jobDisplayName: "Tests: macOS 10.14"
     agentOs: macOS
-    timeoutInMinutes: 60
+    timeoutInMinutes: 120
     isTestingJob: true
     steps:
     - bash: ./build.sh --all --pack --ci --nobl --no-build-java
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3403589c3c..159fcfd186 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -329,9 +329,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
     </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>
-      <Sha>dba2fa57432b4bd9cc7880e2c6fe3acdd01bba3c</Sha>
+      <Sha>b6a07e61473ed8a804de465f7c1cb5c17f80732d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 855ebb1979..bea85d582f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -62,7 +62,7 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20407.3</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20403.2</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/runtime -->
     <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.2.20452.8</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20452.8</MicrosoftNETCoreAppInternalPackageVersion>