From 2922f539aacd0db7ca672a0ec54270a3b7ff37d1 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 25 Feb 2021 13:36:44 -0800
Subject: [PATCH 1/2] Update branding to 5.0.5 (#30464)

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 7c866c257ba7..34eeb421c5d7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,8 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>4</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>5</AspNetCorePatchVersion>
+    <ValidateBasline>false</ValidateBasline>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index aa4b272cba53..d404855dd804 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 2a9a19157ce43a0e8d732e7dbacd210437d1cf4e Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 25 Feb 2021 15:58:30 -0800
Subject: [PATCH 2/2] Update Packaging.targets

---
 eng/targets/Packaging.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index 6c119198a22f..7bbcc6a94618 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -1,8 +1,7 @@
 <Project>
 
   <Target Name="EnsureBaselineIsUpdated"
-          Condition=" '$(ValidateBasline)' == 'true' AND
-              '$(IsServicingBuild)' == 'true' AND
+          Condition=" '$(IsServicingBuild)' == 'true' AND
               '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
               '$(MSBuildProjectName)' != 'BaselineGenerator' AND
               '$(MSBuildProjectName)' != 'RepoTasks' "