From 6b92579bede91156c467712aa253fab439ab22ac Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Thu, 4 Oct 2018 16:36:40 +0000
Subject: [PATCH 1/4] Updating submodule(s)

Identity => 042b6ecaf2b2d7757ac45bf962a933e4c65ecc7c

[auto-updated: submodules]
---
 modules/Identity | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Identity b/modules/Identity
index 646e65cb1d..042b6ecaf2 160000
--- a/modules/Identity
+++ b/modules/Identity
@@ -1 +1 @@
-Subproject commit 646e65cb1db34e9d02e305d952e19565391c87a1
+Subproject commit 042b6ecaf2b2d7757ac45bf962a933e4c65ecc7c

From 548eb520cd83fd1e8baa411871cf0df5ad305037 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 5 Oct 2018 11:09:32 -0700
Subject: [PATCH 2/4] Updating submodule(s)

Common => 343ae77b2bf5a9be53ea8af185e6af663ea207dd

[auto-updated: submodules]
---
 modules/Common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Common b/modules/Common
index b93e18b0a2..343ae77b2b 160000
--- a/modules/Common
+++ b/modules/Common
@@ -1 +1 @@
-Subproject commit b93e18b0a263739d8cc10a7724f558ea022100d1
+Subproject commit 343ae77b2bf5a9be53ea8af185e6af663ea207dd

From 3d1e677bdf4f7a2807be1a5bc72858ed23445743 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 5 Oct 2018 19:38:37 +0000
Subject: [PATCH 3/4] Updating submodule(s)

Identity => 2327d6ae44d553d26743825c6087c0460388f5ab
MetaPackages => 96be626c87c3ca325b18aa6653602f5e7087497f

[auto-updated: submodules]
---
 modules/Identity     | 2 +-
 modules/MetaPackages | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Identity b/modules/Identity
index 042b6ecaf2..2327d6ae44 160000
--- a/modules/Identity
+++ b/modules/Identity
@@ -1 +1 @@
-Subproject commit 042b6ecaf2b2d7757ac45bf962a933e4c65ecc7c
+Subproject commit 2327d6ae44d553d26743825c6087c0460388f5ab
diff --git a/modules/MetaPackages b/modules/MetaPackages
index f20e2f82aa..96be626c87 160000
--- a/modules/MetaPackages
+++ b/modules/MetaPackages
@@ -1 +1 @@
-Subproject commit f20e2f82aaa3717e97fc109cf7427c259dfb34cf
+Subproject commit 96be626c87c3ca325b18aa6653602f5e7087497f

From 36e462d6f25a5c34509d211fd5cc228c83e4cc60 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 5 Oct 2018 16:50:15 -0700
Subject: [PATCH 4/4] Update branding to 2.1.6-servicing (#1455)

Cleanup the implementation of version.props to make it clearer what the rules are for appending version suffixes, applying updates, etc.
---
 build/repo.targets |  2 +-
 version.props      | 50 +++++++++++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 507dcaa1c0..bba113bb1c 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -158,7 +158,7 @@
     <AspNetCoreMajorVersion>$(AspNetCoreMajorVersion)</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>$(AspNetCoreMinorVersion)</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>$(AspNetCorePatchVersion)</AspNetCorePatchVersion>
-    <AspNetCorePrereleaseVersionLabel>$(PrereleaseVersionLabel)</AspNetCorePrereleaseVersionLabel>
+    <AspNetCorePreReleaseVersionLabel>$(PreReleaseLabel)</AspNetCorePreReleaseVersionLabel>
     <AspNetCoreBuildNumber>$(BuildNumber)</AspNetCoreBuildNumber>
     <AspNetCoreBrandingVersion>$(PackageBrandingVersion)</AspNetCoreBrandingVersion>
   </PropertyGroup>
diff --git a/version.props b/version.props
index bede325a3e..c0217598a3 100644
--- a/version.props
+++ b/version.props
@@ -3,35 +3,43 @@
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>6</AspNetCorePatchVersion>
-    <VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
-    <PrereleaseVersionLabel>rtm</PrereleaseVersionLabel>
+    <PreReleaseLabel>servicing</PreReleaseLabel>
+    <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
-
-    <!-- The 'human friendly' version to display in installers. In pre-release builds, this might be "2.0.7 Preview 2" -->
-    <PackageBrandingVersion>$(VersionPrefix)</PackageBrandingVersion>
-
+    <VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
     <ExperimentalVersionPrefix>0.1.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
-    <ExperimentalVersionSuffix>rtm</ExperimentalVersionSuffix>
+    <VersionSuffix>$(PreReleaseLabel)-$(BuildNumber)</VersionSuffix>
+    <BrandingVersionSuffix>$(PreReleaseBrandingLabel) Build $(BuildNumber)</BrandingVersionSuffix>
 
-    <PackageVersionSuffix Condition=" '$(IsFinalBuild)' != 'true' AND '$(PrereleaseVersionLabel)' != '' ">$(PrereleaseVersionLabel)</PackageVersionSuffix>
-    <PackageVersionSuffix Condition=" '$(IsFinalBuild)' != 'true' AND '$(BuildNumber)' != '' ">$(PackageVersionSuffix)-$(BuildNumber)</PackageVersionSuffix>
-    <PackageVersionSuffix Condition=" '$(IsFinalBuild)' == 'true' AND '$(PrereleaseVersionLabel)' != 'rtm' ">$(PrereleaseVersionLabel)-final</PackageVersionSuffix>
-    <!-- NB: VersionSuffix is empty if '$(IsFinalBuild)' == 'true' AND '$(PrereleaseVersionLabel)' == 'rtm' -->
+    <!-- Run the build with /p:IsFinalBuild=true to produce the product with 'final' branding and versioning -->
+    <IsFinalBuild Condition=" '$(IsFinalBuild)' == '' ">false</IsFinalBuild>
+    <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
+    <IncludePreReleaseLabelInPackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND ('$(PreReleaseLabel)' == 'servicing' OR '$(PreReleaseLabel)' == 'rtm')">false</IncludePreReleaseLabelInPackageVersion>
 
+    <!-- The 'human friendly' version to display in installers. In pre-release builds, this might be "2.0.7 Preview 2 Build 12356". In final builds, it should be "2.0.7" -->
+    <PackageBrandingVersion>$(VersionPrefix)</PackageBrandingVersion>
+    <PackageBrandingVersion Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(PackageBrandingVersion) $(BrandingVersionSuffix)</PackageBrandingVersion>
+
+    <!-- The version in files -->
     <PackageVersion>$(VersionPrefix)</PackageVersion>
-    <PackageVersion Condition=" '$(PackageVersionSuffix)' != '' ">$(VersionPrefix)-$(PackageVersionSuffix)</PackageVersion>
+    <PackageVersion Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
+
+    <!-- Experimental packages which are not truly supported yet. -->
+    <ExperimentalPackageVersion>$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
+    <ExperimentalPackageVersion  Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(ExperimentalVersionPrefix)-$(VersionSuffix)</ExperimentalPackageVersion>
 
-    <!-- Add metadata to the suffix last so it does not appear in package versions. -->
     <VersionMetadata Condition=" '$(DotNetProductBuildId)' != '' ">pb-$(DotNetProductBuildId)</VersionMetadata>
-    <VersionSuffix>$(PrereleaseVersionLabel)</VersionSuffix>
-    <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(VersionMetadata)' != '' ">$(VersionSuffix)+$(VersionMetadata)</VersionSuffix>
+    <VersionSuffix Condition=" '$(VersionMetadata)' != '' ">$(VersionSuffix)+$(VersionMetadata)</VersionSuffix>
 
-    <ExperimentalPackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' == 'rtm' ">$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
-    <ExperimentalPackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
-    <ExperimentalVersionSuffix Condition=" '$(ExperimentalVersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(ExperimentalVersionSuffix)-$(BuildNumber)</ExperimentalVersionSuffix>
-
-    <SharedFxCliBlobChannel>release/2.1</SharedFxCliBlobChannel>
+    <SharedFxCliBlobChannel>release/$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</SharedFxCliBlobChannel>
   </PropertyGroup>
 
+  <!-- Run 'dotnet msbuild version.props' to test changes to this file. -->
+  <Target Name="InspectVersionNumbers">
+    <Message Importance="High" Text="PackageVersion                = '$(PackageVersion)'" />
+    <Message Importance="High" Text="PackageBrandingVersion        = '$(PackageBrandingVersion)'" />
+    <Message Importance="High" Text="ExperimentalPackageVersion    = '$(ExperimentalPackageVersion)'" />
+    <Message Importance="High" Text="SharedFxCliBlobChannel        = '$(SharedFxCliBlobChannel)'" />
+  </Target>
+
 </Project>