Merge in 'release/5.0' changes

Author: dotnet-bot

src/coreclr/dir.common.props

@@ -41,14 +41,6 @@
     <PackagesBinDir>$(BinDir).nuget\</PackagesBinDir>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Set the boolean below to true to generate packages with stabilized versions -->
-    <IsShipping>false</IsShipping>
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
-    <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
-    <StableVersion Condition="($(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Transport'))) and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
-  </PropertyGroup>
-
   <!-- Set up common target properties that we use to conditionally include sources -->
   <PropertyGroup>
     <TargetsFreeBSD Condition="'$(TargetOS)' == 'FreeBSD'">true</TargetsFreeBSD>

src/coreclr/src/.nuget/packaging.props

@@ -25,6 +25,14 @@
     <VersionTxtFile Condition="'$(VersionTxtFile)' == ''">$(ArtifactsObjDir)version.txt</VersionTxtFile>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Set the boolean below to true to generate packages with stabilized versions -->
+    <IsShipping>false</IsShipping>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
+    <StableVersion Condition="$(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Transport'))" />
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
     <!-- Add required legal files to packages -->
     <File Condition="Exists('$(PackageLicenseFile)')"