diff options
| author | Vsevolod Kukol <sevoku@microsoft.com> | 2019-02-05 12:05:12 +0300 |
|---|---|---|
| committer | Vsevolod Kukol <sevoku@microsoft.com> | 2019-10-14 17:15:02 +0300 |
| commit | 2985fb9b9b2f9b7a091b254ff301cbadc297a814 (patch) | |
| tree | 688a71bc978cc18b3bab47bba5b1bc88cbc9b405 | |
| parent | 3949f79d50716ec93b35dad84c5478ad61da2582 (diff) | |
Use libgit2 from MD if available
| -rw-r--r-- | Targets/CodeGenerator.targets | 11 | ||||
| -rw-r--r-- | Targets/GenerateNativeDllName.targets | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Targets/CodeGenerator.targets b/Targets/CodeGenerator.targets index 249cd4f3..358c0f8c 100644 --- a/Targets/CodeGenerator.targets +++ b/Targets/CodeGenerator.targets @@ -40,6 +40,15 @@ <Target Name="AddNativeDllCommitShaToBuildMetadata" BeforeTargets="GetBuildVersion"> + <ReadLinesFromFile File="$(MSBuildThisFileDirectory)..\..\libgit-binary\libgit2_hash.txt" + Condition="Exists('$(MSBuildThisFileDirectory)..\..\libgit-binary\libgit2_hash.txt')"> + <Output TaskParameter="Lines" PropertyName="libgit2_hash" /> + </ReadLinesFromFile> + + <PropertyGroup Condition="Exists('$(MSBuildThisFileDirectory)..\..\libgit-binary\libgit2_hash.txt')"> + <libgit2_filename>libgit2-$(libgit2_hash.Substring(0,7))</libgit2_filename> + </PropertyGroup> + <ItemGroup> <BuildMetadata Include="libgit2-$(libgit2_hash.Substring(0,7))" /> </ItemGroup> @@ -47,7 +56,7 @@ </Target> - <Target Name="GenerateAssemblyCommitIdsCs" Inputs="$(libgit2_propsfile);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" AfterTargets="GenerateAssemblyVersionInfo" DependsOnTargets="DefineProperties"> + <Target Name="GenerateAssemblyCommitIdsCs" Inputs="$(libgit2_hash);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" AfterTargets="GenerateAssemblyVersionInfo" DependsOnTargets="DefineProperties"> <PropertyGroup> <LibGit2SharpCommitSha>unknown</LibGit2SharpCommitSha> diff --git a/Targets/GenerateNativeDllName.targets b/Targets/GenerateNativeDllName.targets index 244b707b..e479dde7 100644 --- a/Targets/GenerateNativeDllName.targets +++ b/Targets/GenerateNativeDllName.targets @@ -10,7 +10,7 @@ </PropertyGroup> </Target> - <Target Name="GenerateNativeDllNameCs" Inputs="$(libgit2_propsfile)" Outputs="$(NativeDllNamePath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineNativeDllName"> + <Target Name="GenerateNativeDllNameCs" Inputs="$(libgit2_filename)" Outputs="$(NativeDllNamePath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineNativeDllName"> <PropertyGroup> <NativeDllNameSourceLines> namespace LibGit2Sharp.Core |