From e4415b9101742b8b6798a2990d05c5e1a600878c Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Wed, 29 Apr 2020 17:33:20 +0100
Subject: [PATCH 1/2] Document why PackageVersion is used in
 PowerShell.Common.props

Add documentation of why `PackageVersion` is used in `PowerShell.Common.props`. Explamation is copied from [dotnet/sdk](https://github.com/dotnet/sdk/issues/1557#issuecomment-328015774)

Co-Authored-By: Nick Guerrera <nicholg@microsoft.com>
---
 PowerShell.Common.props | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 177eef87842..ad0b106d243 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -56,12 +56,11 @@
       <ProductVersion>$(PSCoreFormattedVersion)</ProductVersion>
 
       <!--
-            We have explicitly assign 'PackageVersion'
-            because there is a bug: 'PackageVersion' is correctly assigned as 'Version' in 'NuGet.targets'
-            but then immediately redefined as '1.0.0'.
-            Tracking Issue https://github.com/dotnet/sdk/issues/1557
+        We have to explicitly assign 'PackageVersion' here because we're changing 'Version' in a target.
+        Before any targets have run (during static evaluation), 'Version' will have defaulted to '1.0.0' and PackageVersion will have defaulted to 'Version'.
       -->
       <PackageVersion>$(PSCoreBuildVersion)</PackageVersion>
+
       <ApplicationIcon Condition="$(ProductVersion.Contains('preview'))">..\..\assets\Powershell_av_colors.ico</ApplicationIcon>
       <ApplicationIcon Condition="!$(ProductVersion.Contains('preview'))">..\..\assets\Powershell_black.ico</ApplicationIcon>
 

From ec1005a20fe14eef6733f58af10134f032132d4e Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Wed, 29 Apr 2020 21:39:27 +0100
Subject: [PATCH 2/2] Restore issue link

address @TravisEz13 review
---
 PowerShell.Common.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index ad0b106d243..6cae0785ec3 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -58,6 +58,7 @@
       <!--
         We have to explicitly assign 'PackageVersion' here because we're changing 'Version' in a target.
         Before any targets have run (during static evaluation), 'Version' will have defaulted to '1.0.0' and PackageVersion will have defaulted to 'Version'.
+        See https://github.com/dotnet/sdk/issues/1557
       -->
       <PackageVersion>$(PSCoreBuildVersion)</PackageVersion>