From 21e0334c654f82db95c8054311fae68e11a7d1ac Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 25 Mar 2024 10:18:59 -0400
Subject: [PATCH] Use built-in `SourceRevisionId` instead of `git rev-parse
 HEAD` (#19091)

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 src/redist/targets/GenerateLayout.targets | 4 ++--
 src/redist/targets/Versions.targets       | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 72344a894..7d090d6ac 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -482,9 +482,9 @@
   </Target>
 
   <Target Name="GenerateVersionFile"
-          DependsOnTargets="SetupBundledComponents;GetCommitHash;GenerateFullNuGetVersion">
+          DependsOnTargets="SetupBundledComponents;GenerateFullNuGetVersion">
     <WriteLinesToFile File="$(SdkOutputDirectory).version"
-                      Lines="$(GitCommitHash);$(Version);$(Rid);$(FullNugetVersion);$(SdkFeatureBand)"
+                      Lines="$(SourceRevisionId);$(Version);$(Rid);$(FullNugetVersion);$(SdkFeatureBand)"
                       Overwrite="true" />
 
     <!-- This is a hack to make the full nuget version available during the publishing step -->
diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
index 4e08d5063..405bd9a3e 100644
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@@ -6,12 +6,4 @@
       <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>