From ec3d3952f02192675854488fee5a28b8d1a56fd5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 12 Feb 2021 21:27:33 +0100
Subject: [PATCH] Inline platform package version (#48230)

* Inline platform package version

The platform package version doesn't need to be defined centrally anymore.
---
 eng/packaging.props                                                    | 3 ---
 .../pkg/Microsoft.NETCore.Platforms.pkgproj                            | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/eng/packaging.props b/eng/packaging.props
index 07c8426..754c7b5 100644
--- a/eng/packaging.props
+++ b/eng/packaging.props
@@ -11,9 +11,6 @@
     <!-- We're currently not building a "live" baseline, instead we're using .NETCore 1.0 RTM stable versions as the baseline -->
     <SkipBaseLineCheck>true</SkipBaseLineCheck>
     <PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
-    <!-- major.minor.release version of the platforms package we're currently building
-         Pre-release will be appended during build -->
-    <PlatformPackageVersion>$(ProductVersion)</PlatformPackageVersion>
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
     <SkipGenerationCheck>true</SkipGenerationCheck>
   </PropertyGroup>
diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/Microsoft.NETCore.Platforms.pkgproj b/src/libraries/Microsoft.NETCore.Platforms/pkg/Microsoft.NETCore.Platforms.pkgproj
index dc797d8..a3c60cf 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/pkg/Microsoft.NETCore.Platforms.pkgproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/Microsoft.NETCore.Platforms.pkgproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <PropertyGroup>
-    <PackageVersion>$(PlatformPackageVersion)</PackageVersion>
+    <PackageVersion>$(ProductVersion)</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
-- 
2.7.4