Use the .NET Core product version for informational version description (dotnet/coref...

* Use the .NET Core product version for informational version description

The 4.X.Y.Z versions that we use for file and assembly versions are confusing. We can make the situation better by including the official .NET Core version in the informational assembly version description at least.

* Move ProductVersion to Versions.props

* Move Packaging.props to later

Commit migrated from https://github.com/dotnet/corefx/commit/0577135efa86fec33f1cc9bb10808d31e302a94f

diff --git a/eng/Packaging.props b/eng/Packaging.props
index 17f7a6e..0eb0350 100644 (file)
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -26,9 +26,9 @@
 
     <!-- by default all packages will use the same version which revs with respect to product version -->
     <PackageVersion Condition="'$(PackageVersion)' == ''">4.6.0</PackageVersion>
-    <!-- this must represent the major.minor.release version of the platforms package we're currently building 
-         pre-release will be appended during build -->
-    <PlatformPackageVersion>3.0.0</PlatformPackageVersion>
+    <!-- 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/eng/versioning.targets b/eng/versioning.targets
index b523921..a95906c 100644 (file)
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -43,6 +43,10 @@
 
     <!-- SDK sets product to assembly but we want it to be our product name -->
     <Product>Microsoft%AE .NET Core</Product>
+
+    <!-- Use the .NET Core product branding version for informational version description -->
+    <InformationalVersion>$(ProductVersion)</InformationalVersion>
+    <InformationalVersion Condition="'$(VersionSuffix)' != ''">$(InformationalVersion)-$(VersionSuffix)</InformationalVersion>
   </PropertyGroup>
 
   <Target Name="_ComputeBuildToolsAssemblyInfoAttributes"