Port VersionSuffix changes from release/2.0.0 to master.

This change brings https://github.com/dotnet/core-setup/commit/dotnet/core-setup@d85d263924c2ee7b7109d4ee209275ad1dbcb2b4 into master, along with removing an unnecessary VersionSuffix setting in CommonManaged.props.

Commit migrated from https://github.com/dotnet/core-setup/commit/4afde938556de26d8a1f923543689129b083468f

diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props
index 8f91cdc..2a62fe2 100644 (file)
--- a/src/installer/managed/CommonManaged.props
+++ b/src/installer/managed/CommonManaged.props
@@ -15,15 +15,6 @@
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(StabilizePackageVersion)' != 'true'">
-    <!-- 
-    Ensure VersionSuffix is set (especially during 'dotnet restore')
-    to work around https://github.com/NuGet/Home/issues/4337
-     -->
-    <VersionSuffix Condition="'$(PreReleaseLabel)' != ''">$(PreReleaseLabel)-</VersionSuffix>
-    <VersionSuffix>$(VersionSuffix)$(BuildNumberMajor)-$(BuildNumberMinor)</VersionSuffix>
-  </PropertyGroup>
-
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>$(RepoRoot)tools-local/setuptools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>