From cc4c58cd0296958bd6992ef626adca35daab3543 Mon Sep 17 00:00:00 2001
From: "Julio C. Rocha" <dev@rocha.red>
Date: Fri, 10 May 2024 14:39:40 -0700
Subject: [PATCH] Use common property for Git macros

---
 Directory.Build.targets | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index f4a55905d..11c967860 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -19,31 +19,31 @@
       <GetGitVersionSet>true</GetGitVersionSet>
       <GitVersion>$(GitRevisionShort)</GitVersion>
       <GitVersion Condition="'$(GitIsDirty)'!=''">$(GitRevisionShort)-Dirty</GitVersion>
+      <GitPreprocessorDefinitions>
+        GIT_REVISION=$(GitRevision);
+        GIT_REVISION_SHORT=$(GitRevisionShort);
+        VERSION_BUILD=$(GitRevisionCount);
+        VERSION_BUILD_YEAR=$([System.DateTime]::Now.ToString(`yyyy`))
+      </GitPreprocessorDefinitions>
     </PropertyGroup>
     <!-- TODO: Remove -->
     <Message Importance="High" Text="git rev:       [$(GitRevision)]" />
     <Message Importance="High" Text="git rev short: [$(GitRevisionShort)]" />
     <Message Importance="High" Text="git rev count: [$(GitRevisionCount)]" />
-    <Message Importance="High" Text="git dirty?:    [Dirty]" Condition="'$(GitIsDirty)'!=''" />
+    <Message Importance="High" Text="git dirty?:    [YES]" Condition="'$(GitIsDirty)'!=''" />
     <Message Importance="High" Text="git dirty?:    []" Condition="'$(GitIsDirty)'==''" />
     <Message Importance="High" Text="GitVersion:    [$(GitVersion)]" />
     <ItemGroup>
       <ClCompile>
         <PreprocessorDefinitions>
           %(PreprocessorDefinitions);
-          GIT_REVISION=$(GitRevision);
-          GIT_REVISION_SHORT=$(GitRevisionShort);
-          VERSION_BUILD=$(GitRevisionCount);
-          VERSION_BUILD_YEAR=$([System.DateTime]::Now.ToString(`yyyy`))
+          $(GitPreprocessorDefinitions)
        </PreprocessorDefinitions>
       </ClCompile>
       <ResourceCompile>
         <PreprocessorDefinitions>
           %(PreprocessorDefinitions);
-          GIT_REVISION=$(GitRevision);
-          GIT_REVISION_SHORT=$(GitRevisionShort);
-          VERSION_BUILD=$(GitRevisionCount);
-          VERSION_BUILD_YEAR=$([System.DateTime]::Now.ToString(`yyyy`))
+          $(GitPreprocessorDefinitions)
        </PreprocessorDefinitions>
       </ResourceCompile>
     </ItemGroup>