From 72c92bcaa8d41dcf384cb8b493945a07fb6bffe4 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Thu, 25 Feb 2021 12:34:22 -0800
Subject: [PATCH 1/2] Update branding to 3.1.14

---
 eng/Versions.props            | 4 +++-
 eng/targets/Packaging.targets | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 393ff0fcef19..99d20fb2aa7c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,9 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>13</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>14</AspNetCorePatchVersion>
+    <ValidateBasline>false</ValidateBasline>
+    
     <PreReleasePreviewNumber>0</PreReleasePreviewNumber>
     <ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
     <ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index 81c974c36d98..94ccbabbc827 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -1,7 +1,8 @@
 <Project>
 
   <Target Name="EnsureBaselineIsUpdated"
-          Condition=" '$(IsServicingBuild)' == 'true' AND
+          Condition=" '$(ValidateBasline)' == 'true' AND
+              '$(IsServicingBuild)' == 'true' AND
               '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
               '$(MSBuildProjectName)' != 'BaselineGenerator' AND
               '$(MSBuildProjectName)' != 'RepoTasks' "

From 8c6d96ae6b330993b0a39d2be3e2a437413b457e Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Wed, 17 Feb 2021 13:49:34 -0800
Subject: [PATCH 2/2] Only install nginx if not already installed (#30253)

---
 eng/scripts/install-nginx-mac.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/scripts/install-nginx-mac.sh b/eng/scripts/install-nginx-mac.sh
index b44bd5d92866..e7df86f57c0a 100755
--- a/eng/scripts/install-nginx-mac.sh
+++ b/eng/scripts/install-nginx-mac.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
 brew update
-brew install openssl nginx
+brew list openssl || brew install openssl
+brew list nginx || brew install nginx