Improve GenerateAssemblyCommitIdsCs

bording · bording · commit d9dd593febf5 · 2017-11-20T21:22:34.000-05:00
Makes it handle being run when the project is not in a git repo.
diff --git a/LibGit2Sharp/CodeGenerator.targets b/LibGit2Sharp/CodeGenerator.targets
@@ -69,16 +69,18 @@
   </Target>
 
 
-  <Target Name="GenerateAssemblyCommitIdsCs" Inputs="$(libgit2_propsfile);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties;GenerateAssemblyVersionInfo" Condition="'$(GitCommitId)' != ''">
+  <Target Name="GenerateAssemblyCommitIdsCs" Inputs="$(libgit2_propsfile);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" AfterTargets="GenerateAssemblyVersionInfo" DependsOnTargets="DefineProperties">
 
     <PropertyGroup>
+      <LibGit2SharpCommitSha>unknown</LibGit2SharpCommitSha>
+      <LibGit2SharpCommitSha Condition="'$(GitCommitId)' != ''">$(GitCommitId)</LibGit2SharpCommitSha>
       <AssemblyCommitIdsSourceLines>
         namespace LibGit2Sharp
         {
         internal static class AssemblyCommitIds
         {
         public const string LibGit2CommitSha = "$(libgit2_hash)"%3b
-        public const string LibGit2SharpCommitSha = "$(GitCommitId)"%3b
+        public const string LibGit2SharpCommitSha = "$(LibGit2SharpCommitSha)"%3b
         }
         }
       </AssemblyCommitIdsSourceLines>

Original file line number	Diff line number	Diff line change
`@@ -69,16 +69,18 @@`
`69`	`69`	`</Target>`
`70`	`70`
`71`	`71`
`72`		`- <Target Name="GenerateAssemblyCommitIdsCs" Inputs="$(libgit2_propsfile);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties;GenerateAssemblyVersionInfo" Condition="'$(GitCommitId)' != ''">`
	`72`	`+ <Target Name="GenerateAssemblyCommitIdsCs" Inputs="$(libgit2_propsfile);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" AfterTargets="GenerateAssemblyVersionInfo" DependsOnTargets="DefineProperties">`
`73`	`73`
`74`	`74`	`<PropertyGroup>`
	`75`	`+ <LibGit2SharpCommitSha>unknown</LibGit2SharpCommitSha>`
	`76`	`+ <LibGit2SharpCommitSha Condition="'$(GitCommitId)' != ''">$(GitCommitId)</LibGit2SharpCommitSha>`
`75`	`77`	`<AssemblyCommitIdsSourceLines>`
`76`	`78`	`namespace LibGit2Sharp`
`77`	`79`	`{`
`78`	`80`	`internal static class AssemblyCommitIds`
`79`	`81`	`{`
`80`	`82`	`public const string LibGit2CommitSha = "$(libgit2_hash)"%3b`
`81`		`- public const string LibGit2SharpCommitSha = "$(GitCommitId)"%3b`
	`83`	`+ public const string LibGit2SharpCommitSha = "$(LibGit2SharpCommitSha)"%3b`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`	`</AssemblyCommitIdsSourceLines>`