From ffa52140db30c05c607631d4272a5e30a2ba2bfd Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 3 Apr 2020 22:38:52 -0700
Subject: [PATCH 1/2] [release/5.0-preview3] Don't run Code Check in official
 builds

---
 .azure/pipelines/ci.yml | 45 +++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index e356ab3d42..1c85f16acc 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -92,27 +92,28 @@ stages:
   displayName: Build
   jobs:
   # Code check
-  - template: jobs/default-build.yml
-    parameters:
-      jobName: Code_check
-      jobDisplayName: Code check
-      agentOs: Windows
-      steps:
-      - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-        - task: PowerShell@2
-          displayName: Setup Private Feeds Credentials
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-            arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
-          env:
-            Token: $(dn-bot-dnceng-artifact-feeds-rw)
-      - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
-        displayName: Run eng/scripts/CodeCheck.ps1
-      artifacts:
-      - name: Code_Check_Logs
-        path: artifacts/log/
-        publishOnError: true
-        includeForks: true
+  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: jobs/default-build.yml
+      parameters:
+        jobName: Code_check
+        jobDisplayName: Code check
+        agentOs: Windows
+        steps:
+        - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+          - task: PowerShell@2
+            displayName: Setup Private Feeds Credentials
+            inputs:
+              filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+              arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+            env:
+              Token: $(dn-bot-dnceng-artifact-feeds-rw)
+        - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
+          displayName: Run eng/scripts/CodeCheck.ps1
+        artifacts:
+        - name: Code_Check_Logs
+          path: artifacts/log/
+          publishOnError: true
+          includeForks: true
 
   # Build Windows (x64/x86)
   - template: jobs/default-build.yml
@@ -594,7 +595,7 @@ stages:
     parameters:
       condition: ne(variables['SkipTests'], 'true')
       jobName: MacOS_Test
-      jobDisplayName: "Test: macOS 10.13"
+      jobDisplayName: "Test: macOS 10.14"
       agentOs: macOS
       isTestingJob: true
       buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)

From 4bbf56b26fdabe13b4b51bc7101828b4391fd8d6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 5 Apr 2020 05:12:09 +0000
Subject: [PATCH 2/2] Update dependencies from
 https://github.com/dotnet/aspnetcore-tooling build 20200404.5 (#20548)

- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.3.20204.5
- Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.3.20204.5
- Microsoft.CodeAnalysis.Razor - 5.0.0-preview.3.20204.5
- Microsoft.NET.Sdk.Razor - 5.0.0-preview.3.20204.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e63ae9d242..02b66c22f1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,21 +13,21 @@
       <Uri>https://github.com/dotnet/blazor</Uri>
       <Sha>dd7fb4d3931d556458f62642c2edfc59f6295bfb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.3.20202.16">
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.3.20204.5">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>46133a42cbf5af76e4f98a0b5221d55d342067a0</Sha>
+      <Sha>54d7e2616d22ccb45b0d52a84931ba56aa3c9e65</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.3.20202.16">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.3.20204.5">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>46133a42cbf5af76e4f98a0b5221d55d342067a0</Sha>
+      <Sha>54d7e2616d22ccb45b0d52a84931ba56aa3c9e65</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.3.20202.16">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.3.20204.5">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>46133a42cbf5af76e4f98a0b5221d55d342067a0</Sha>
+      <Sha>54d7e2616d22ccb45b0d52a84931ba56aa3c9e65</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.3.20202.16">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.3.20204.5">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>46133a42cbf5af76e4f98a0b5221d55d342067a0</Sha>
+      <Sha>54d7e2616d22ccb45b0d52a84931ba56aa3c9e65</Sha>
     </Dependency>
     <Dependency Name="dotnet-ef" Version="5.0.0-preview.3.20181.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index f17da370ff..f0edfac88e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -146,10 +146,10 @@
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.3.20181.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.3.20181.2</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from dotnet/aspnetcore-tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.3.20202.16</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.3.20202.16</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.3.20202.16</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.3.20202.16</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.3.20204.5</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.3.20204.5</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.3.20204.5</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.3.20204.5</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--