Fixed bug where the git information is not properly obtained and the …

…head information was not properly dumped to the right file name. Signed-off-by: AraHaan <seandhunt_7@yahoo.com>
Elskom · Jan 1, 2022 · de25f59 · de25f59
1 parent bf0ee0f
commit de25f59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/build/GitBuildInfo.SourceGenerator.targets b/build/GitBuildInfo.SourceGenerator.targets
@@ -18,19 +18,19 @@
         WorkingDirectory="$(MSBuildProjectDirectory)"
         ConsoleToMSBuild="true"
         IgnoreExitCode="true"
-        Condition="'$(GitHead)' == ''">
+        Condition="'$(CommitHash)' == ''">
         <Output TaskParameter="ConsoleOutput" PropertyName="CommitHash" />
     </Exec>
     <Exec
         Command="git name-rev --name-only HEAD"
         WorkingDirectory="$(MSBuildProjectDirectory)"
         ConsoleToMSBuild="true"
         IgnoreExitCode="true"
-        Condition="'$(GitHead)' == ''">
+        Condition="'$(GitBranch)' == ''">
         <Output TaskParameter="ConsoleOutput" PropertyName="GitBranch" />
     </Exec>
     <WriteLinesToFile
-        File="$(IntermediateOutputPath)\githead.txt"
+        File="$(IntermediateOutputPath)\git_head.txt"
         Lines="$(GitHead)"
         Condition="'$(GitHead)' != ''"
         Overwrite="true"

diff --git a/src/GitBuildInfo.SourceGenerator/Directory.Build.props b/src/GitBuildInfo.SourceGenerator/Directory.Build.props
@@ -3,10 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>true</IsPackable>
-    <Version>1.0.14</Version>
-    <PackageReleaseNotes>
-      Removed MSBuild task assembly and replaced them when msbuild execute commands to grab the needed data and output them to intermediate files for the generator to use.
-    </PackageReleaseNotes>
+    <Version>1.0.15</Version>
+    <PackageReleaseNotes>Fixed bug where the git information is not properly obtained and the head information was not properly dumped to the right file name.</PackageReleaseNotes>
     <Copyright>Copyright (c) 2021</Copyright>
     <!-- Suppresses the warnings about the package not having assemblies in lib/*/.dll.-->
     <NoPackageAnalysis>true</NoPackageAnalysis>