From de651022c79930d7d27c5bbb5169aaf58ef303a0 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 12 Feb 2021 18:32:51 +0100
Subject: [PATCH 1/2] Inline platform package version

The platform package version doesn't need to be defined centrally anymore.
---
 .../pkg/Microsoft.NETCore.Platforms.pkgproj                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dc797d8bbd1608..a3c60cf9772781 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>

From 51a2bc71541d19abd22a72d8845e1d2be13908cf Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 12 Feb 2021 18:33:32 +0100
Subject: [PATCH 2/2] Update packaging.props

---
 eng/packaging.props | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eng/packaging.props b/eng/packaging.props
index 07c8426ec49f63..754c7b5996378b 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>