From ca6e86d472c75414975d4ee01a91e82e578261fe Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 9 Jan 2020 10:05:15 -0800
Subject: [PATCH 1/2] Move GenerateFullNuGetVersion to a different target to be
 shared by build, publish and publish to latest.

---
 eng/Publishing.props                         | 3 +++
 src/CopyToLatest/CopyToLatest.csproj         | 2 +-
 src/CopyToLatest/targets/FinishBuild.targets | 3 ++-
 src/redist/redist.csproj                     | 1 +
 src/redist/targets/GenerateLayout.targets    | 7 -------
 src/redist/targets/Versions.targets          | 8 ++++++++
 6 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 src/redist/targets/Versions.targets

diff --git a/eng/Publishing.props b/eng/Publishing.props
index deb6ab38d..0fec58745 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -15,6 +15,8 @@
   </PropertyGroup>
 
   <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' " />
+
+  <Import Project="..\src\redist\targets\Versions.targets" />
   
   <PropertyGroup>
       <!-- Because we may be building in a container, we should use an asset manifest file path
@@ -53,6 +55,7 @@
 
   <Target Name="PublishSdkAssetsAndChecksums"
           BeforeTargets="Publish"
+          DependsOnTargets="GenerateFullNuGetVersion"
           Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' ">
 
     <!-- If the sdk version is stabilized, then we should double publish the binaries to suffixed file names.
diff --git a/src/CopyToLatest/CopyToLatest.csproj b/src/CopyToLatest/CopyToLatest.csproj
index 84dad6aaf..21a9eb7bb 100644
--- a/src/CopyToLatest/CopyToLatest.csproj
+++ b/src/CopyToLatest/CopyToLatest.csproj
@@ -8,7 +8,7 @@
   <Import Project="targets\BranchInfo.props" />
   <Import Project="..\redist\targets\BuildCoreSdkTasks.targets" />
   <Import Project="..\redist\targets\GetRuntimeInformation.targets" />
-  <Import Project="..\redist\targets\SetBuildDefaults.targets" />
+  <Import Project="..\redist\targets\Versions.targets" />
   
   <Import Project="targets\FinishBuild.targets" />
 </Project>
diff --git a/src/CopyToLatest/targets/FinishBuild.targets b/src/CopyToLatest/targets/FinishBuild.targets
index 523b80870..4521bcf65 100644
--- a/src/CopyToLatest/targets/FinishBuild.targets
+++ b/src/CopyToLatest/targets/FinishBuild.targets
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="FinalizeBuild"
-          BeforeTargets="AfterBuild">
+          BeforeTargets="AfterBuild"
+          DependsOnTargets="GenerateFullNuGetVersion">
     <CopyBlobsToLatest FeedUrl="$(DotnetPublishSdkAssetsBlobFeedUrl)"
                        AccountKey="$(DotNetPublishSdkAssetsBlobFeedKey)"
                        NugetVersion="$(FullNugetVersion)"
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index f1ab93144..35c3d4ad9 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -22,6 +22,7 @@
   <Import Project="targets\BuildCoreSdkTasks.targets" />
   <Import Project="targets\GetRuntimeInformation.targets" />
   <Import Project="targets\SetBuildDefaults.targets" />
+  <Import Project="targets\Versions.targets" />
   <Import Project="targets\Branding.targets" />
   <Import Project="targets\BundledTemplates.targets" />
   <Import Project="targets\BundledDotnetTools.targets" />
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 7b80e5f9e..5ac091c3f 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -426,13 +426,6 @@
                       Overwrite="true" />
   </Target>
 
-  <Target Name="GenerateFullNuGetVersion">
-    <PropertyGroup>
-      <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</FullNugetVersion>
-      <FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
-    </PropertyGroup>
-  </Target>
-
   <Target Name="LayoutAppHostTemplate" DependsOnTargets="RunResolvePackageDependencies">
 
     <PropertyGroup>
diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
new file mode 100644
index 000000000..9653738a4
--- /dev/null
+++ b/src/redist/targets/Versions.targets
@@ -0,0 +1,8 @@
+<Project>
+  <Target Name="GenerateFullNuGetVersion">
+    <PropertyGroup>
+      <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</FullNugetVersion>
+      <FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
+    </PropertyGroup>
+  </Target>
+</Project>

From befcc966a59b2c3f7dacd1a54efaad9a22bc1bc3 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 9 Jan 2020 12:52:53 -0800
Subject: [PATCH 2/2] Moving the GitCommitHash code to a target to be shared
 amongst a couple of other targets.

---
 src/CopyToLatest/targets/FinishBuild.targets | 2 +-
 src/redist/targets/GenerateLayout.targets    | 8 +-------
 src/redist/targets/Versions.targets          | 8 ++++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/CopyToLatest/targets/FinishBuild.targets b/src/CopyToLatest/targets/FinishBuild.targets
index 4521bcf65..880487ef7 100644
--- a/src/CopyToLatest/targets/FinishBuild.targets
+++ b/src/CopyToLatest/targets/FinishBuild.targets
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="FinalizeBuild"
           BeforeTargets="AfterBuild"
-          DependsOnTargets="GenerateFullNuGetVersion">
+          DependsOnTargets="GenerateFullNuGetVersion;GetCommitHash">
     <CopyBlobsToLatest FeedUrl="$(DotnetPublishSdkAssetsBlobFeedUrl)"
                        AccountKey="$(DotNetPublishSdkAssetsBlobFeedKey)"
                        NugetVersion="$(FullNugetVersion)"
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 5ac091c3f..df94b2672 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -414,13 +414,7 @@
       ReplacementStrings="$(ReplacementString)" />
   </Target>
 
-  <Target Name="GenerateVersionFile" DependsOnTargets="SetupBundledComponents">
-    <Exec Command="git rev-parse HEAD"
-          ConsoleToMSBuild="true"
-          Condition=" '$(GitCommitHash)' == '' ">
-      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHash" />
-    </Exec>
-
+  <Target Name="GenerateVersionFile" DependsOnTargets="SetupBundledComponents;GetCommitHash">
     <WriteLinesToFile File="$(SdkOutputDirectory).version"
                       Lines="$(GitCommitHash);$(Version);$(Rid)"
                       Overwrite="true" />
diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
index 9653738a4..c4a2914db 100644
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@@ -5,4 +5,12 @@
       <FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
     </PropertyGroup>
   </Target>
+
+  <Target Name="GetCommitHash">
+    <Exec Command="git rev-parse HEAD"
+          ConsoleToMSBuild="true"
+          Condition=" '$(GitCommitHash)' == '' ">
+      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHash" />
+    </Exec>
+  </Target>
 </Project>