From c97484217fbef9ec44dbf2a2cf4042d33855f00e Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 24 Sep 2019 17:21:49 -0700
Subject: [PATCH] Update branding to 3.0.1 - aspnet/AspNetCore-Internal#3153

---
 Directory.Build.targets |  6 +++++
 eng/PatchConfig.props   | 55 +----------------------------------------
 eng/Versions.props      |  9 +++----
 3 files changed, 11 insertions(+), 59 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index c31b6f65b6..67e287d0c7 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -59,6 +59,12 @@
   <Import Project="eng\Baseline.Designer.props" />
 
   <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
+    <!--
+      For now at least, build entire repo to settle the infrastructure and ignore out-of-date package baselines. May
+      revisit after aspnet/AspNetCore#12702 is complete.
+    -->
+    <IsPackageInThisPatch
+        Condition="'$(IsPackageInThisPatch)' == '' AND '$(IsServicingBuild)' == 'true' AND '$(StabilizePackageVersion)' != 'true'">true</IsPackageInThisPatch>
     <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
   </PropertyGroup>
 
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 2c26521f8c..b8b76f7355 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -4,8 +4,8 @@ This file contains a list of the package IDs which are patching in a given relea
 
 CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
 When adding a new package, make sure the new line ends with a semicolon and starts with a space.
-Later on, this will be checked using this condition:
 
+Directory.Build.props checks this property using the following condition:
     <IsPackageInThisPatch>$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
 -->
 <Project>
@@ -17,57 +17,4 @@ Later on, this will be checked using this condition:
     <PackagesInPatch>
     </PackagesInPatch>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
-    <PackagesInPatch>
-      @aspnet/signalr;
-      Microsoft.AspNetCore.AspNetCoreModuleV2;
-      Microsoft.AspNetCore.Authentication.Google;
-      Microsoft.AspNetCore.Http;
-      Microsoft.AspNetCore.Mvc.Core;
-      Microsoft.AspNetCore.Routing;
-      Microsoft.AspNetCore.Server.IIS;
-      java:signalr;
-    </PackagesInPatch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
-    <PackagesInPatch>
-      @aspnet/signalr;
-      Microsoft.AspNetCore.AspNetCoreModuleV2;
-    </PackagesInPatch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
-    <PackagesInPatch>
-      Microsoft.AspNetCore.AspNetCoreModule;
-      Microsoft.AspNetCore.AspNetCoreModuleV2;
-      Microsoft.AspNetCore.Identity.UI;
-      java:signalr;
-      Microsoft.AspNetCore.SignalR.Protocols.MessagePack;
-      Microsoft.AspNetCore.SignalR.Redis;
-      Microsoft.AspNetCore.SignalR.StackExchangeRedis;
-      Microsoft.AspNetCore.DataProtection.StackExchangeRedis;
-      Microsoft.AspNetCore.Mvc.Core;
-      Microsoft.AspNetCore.Mvc.RazorPages;
-      Microsoft.AspNetCore.AzureAppServicesIntegration;
-      Microsoft.AspNetCore.AzureAppServices.HostingStartup;
-      Microsoft.AspNetCore.AzureAppServices.SiteExtension;
-    </PackagesInPatch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.6' ">
-    <PackagesInPatch>
-      Microsoft.AspNetCore.Mvc.Api.Analyzers;
-      Microsoft.AspNetCore.Server.HttpSys;
-      Microsoft.AspNetCore.Server.IIS;
-    </PackagesInPatch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
-    <PackagesInPatch>
-      Microsoft.AspNetCore.DataProtection.AzureStorage;
-      Microsoft.AspNetCore.Hosting;
-      Microsoft.AspNetCore.SpaServices;
-    </PackagesInPatch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.8' ">
-    <PackagesInPatch>
-    </PackagesInPatch>
-  </PropertyGroup>
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 023598352f..23496f30b2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,19 +8,18 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
-    <PreReleasePreviewNumber>2</PreReleasePreviewNumber>
+    <AspNetCorePatchVersion>1</AspNetCorePatchVersion>
 
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
 
     <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
     <IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
-    <PreReleaseVersionLabel>rc$(PreReleasePreviewNumber)</PreReleaseVersionLabel>
-    <PreReleaseBrandingLabel>Release Candidate $(PreReleasePreviewNumber)</PreReleaseBrandingLabel>
+    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
+    <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <!-- Blazor Client packages will not RTM with 3.0 -->
     <BlazorClientPreReleasePreviewNumber>9</BlazorClientPreReleasePreviewNumber>
     <BlazorClientPreReleaseVersionLabel>preview$(BlazorClientPreReleasePreviewNumber)</BlazorClientPreReleaseVersionLabel>