From 2e85c7b4b06788cc9ae77e9ffb34d9622a3a9979 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Mon, 3 Jan 2022 10:14:22 -0600
Subject: [PATCH] [release/6.0-vs4mac] Set stabilize package version to false
 (#62941)

* [release/6.0-vs4mac] Set stabilize package version to false

* Don't use stable version for corelib informational version

* Don't use non stable for libraries package dependencies when package is not built
---
 eng/Versions.props                                           | 5 ++---
 eng/packaging.targets                                        | 2 +-
 .../System.Private.CoreLib/System.Private.CoreLib.csproj     | 1 -
 src/libraries/workloads-testing.targets                      | 4 ++--
 .../System.Private.CoreLib/System.Private.CoreLib.csproj     | 1 -
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 7c86ef619df42..54afd26a53f4d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,13 +8,12 @@
     <PatchVersion>2</PatchVersion>
     <SdkBandVersion>6.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>
-    </PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- Enable to remove prerelease label. -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <!-- Opt-in/out repo features -->
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
diff --git a/eng/packaging.targets b/eng/packaging.targets
index 9fe4b569e5f70..47a8252c325ef 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -47,7 +47,7 @@
 
     <!-- Always update the package version in servicing. -->
     <Version>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</Version>
-    <Version Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</Version>
+    <Version Condition="'$(VersionSuffix)' != '' and '$(GeneratePackageOnBuild)' == 'true'">$(Version)-$(VersionSuffix)</Version>
     <_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
     <_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
     <_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
index 8515997bcb42e..b3966f3819303 100644
--- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -45,7 +45,6 @@
     <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade>
     <RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
     <!-- Override InformationalVersion during servicing as it's returned via public api. -->
-    <InformationalVersion Condition="'$(PreReleaseVersionLabel)' == 'servicing'">$(ProductVersion)</InformationalVersion>
     <InformationalVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</InformationalVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn),0419,0649,CA2249,CA1830</NoWarn>
diff --git a/src/libraries/workloads-testing.targets b/src/libraries/workloads-testing.targets
index a361a0a4cccde..e8204f40c9ca0 100644
--- a/src/libraries/workloads-testing.targets
+++ b/src/libraries/workloads-testing.targets
@@ -1,8 +1,6 @@
 <Project>
   <PropertyGroup>
     <_NuGetConfigForWorkloadInstall>$(ArtifactsBinDir)workload-nuget.config</_NuGetConfigForWorkloadInstall>
-    <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
-    <_PackageVersion Condition="'$(_PackageVersion)' == ''">$(PackageVersion)</_PackageVersion>
   </PropertyGroup>
 
   <Target Name="ProvisionSdkForWorkloadTesting"
@@ -93,6 +91,8 @@
     </ItemGroup>
 
     <PropertyGroup>
+      <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
+      <_PackageVersion Condition="'$(_PackageVersion)' == ''">$(PackageVersion)</_PackageVersion>
       <!-- Eg. Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm.6.0.0-dev.nupkg -->
       <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg</_AOTCrossNuGetPath>
     </PropertyGroup>
diff --git a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
index cb69737648039..1a03116ab3f9b 100644
--- a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -31,7 +31,6 @@
     <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade>
     <RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
     <!-- Override InformationalVersion during servicing as it's returned via public api. -->
-    <InformationalVersion Condition="'$(PreReleaseVersionLabel)' == 'servicing'">$(ProductVersion)</InformationalVersion>
     <InformationalVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</InformationalVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn),0419,0649</NoWarn>