From 2e14d4e8b01e73d68536b9b17b9e3d6fc5b6fa5a Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 22 Sep 2020 07:59:59 -0700
Subject: [PATCH] Fixes for stable builds (#8648)

- Enable the switch for stable builds
- Fixup the calculation of FullNugetVersion to not include the iteration if it is empty
---
 eng/Versions.props                  | 4 ++++
 src/redist/targets/Versions.targets | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 0571fdc1c..312fbcf30 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -14,6 +14,10 @@
     <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
+    
+    <!-- Enable to remove prerelease label. -->
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
index c4a2914db..4e08d5063 100644
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@@ -1,7 +1,8 @@
 <Project>
   <Target Name="GenerateFullNuGetVersion">
     <PropertyGroup>
-      <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</FullNugetVersion>
+      <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)</FullNugetVersion>
+      <FullNugetVersion Condition="'$(PreReleaseVersionIteration)' != ''">$(FullNugetVersion).$(PreReleaseVersionIteration)</FullNugetVersion>
       <FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
     </PropertyGroup>
   </Target>