|
13 | 13 | </Target> |
14 | 14 |
|
15 | 15 |
|
16 | | - <Target Name="GenerateNativeDllNameCs" Inputs="@(EmbeddedResource)" Outputs="$(NativeDllNamePath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties"> |
17 | | - |
18 | | - <ReadLinesFromFile File="@(EmbeddedResource)" Condition=" '%(Filename)%(Extension)' == 'libgit2_filename.txt' "> |
19 | | - <Output TaskParameter="Lines" PropertyName="libgit2FileName" /> |
20 | | - </ReadLinesFromFile> |
21 | | - |
| 16 | + <Target Name="GenerateNativeDllNameCs" Inputs="$(libgit2_propsfile)" Outputs="$(NativeDllNamePath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties"> |
22 | 17 | <PropertyGroup> |
23 | 18 | <NativeDllNameSourceLines> |
24 | 19 | namespace LibGit2Sharp.Core |
25 | 20 | { |
26 | 21 | internal static class NativeDllName |
27 | 22 | { |
28 | | - public const string Name = "$(libgit2FileName)"%3b |
| 23 | + public const string Name = "$(libgit2_filename)"%3b |
29 | 24 | } |
30 | 25 | } |
31 | 26 | </NativeDllNameSourceLines> |
|
65 | 60 | </Target> |
66 | 61 |
|
67 | 62 |
|
68 | | - <Target Name="AddNativeDllCommitShaToBuildMetadata" BeforeTargets="GetBuildVersion" Condition="'$(IsCrossTargetingBuild)' != 'true'"> |
69 | | - |
70 | | - <ReadLinesFromFile File="@(EmbeddedResource)" Condition=" '%(Filename)%(Extension)' == 'libgit2_hash.txt' "> |
71 | | - <Output TaskParameter="Lines" PropertyName="libgit2hash" /> |
72 | | - </ReadLinesFromFile> |
| 63 | + <Target Name="AddNativeDllCommitShaToBuildMetadata" BeforeTargets="GetBuildVersion"> |
73 | 64 |
|
74 | 65 | <ItemGroup> |
75 | | - <BuildMetadata Include="libgit2-$(libgit2hash.Substring(0,7))" /> |
| 66 | + <BuildMetadata Include="libgit2-$(libgit2_hash.Substring(0,7))" /> |
76 | 67 | </ItemGroup> |
77 | 68 |
|
78 | 69 | </Target> |
79 | 70 |
|
80 | | - <Target Name="GenerateAssemblyCommitIdsCs" Inputs="@(EmbeddedResource);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties;GenerateAssemblyVersionInfo" Condition="'$(GitCommitId)' != ''"> |
81 | 71 |
|
82 | | - <ReadLinesFromFile File="@(EmbeddedResource)" Condition=" '%(Filename)%(Extension)' == 'libgit2_hash.txt' "> |
83 | | - <Output TaskParameter="Lines" PropertyName="libgit2hash" /> |
84 | | - </ReadLinesFromFile> |
| 72 | + <Target Name="GenerateAssemblyCommitIdsCs" Inputs="$(libgit2_propsfile);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties;GenerateAssemblyVersionInfo" Condition="'$(GitCommitId)' != ''"> |
85 | 73 |
|
86 | 74 | <PropertyGroup> |
87 | 75 | <AssemblyCommitIdsSourceLines> |
88 | 76 | namespace LibGit2Sharp |
89 | 77 | { |
90 | 78 | internal static class AssemblyCommitIds |
91 | 79 | { |
92 | | - public const string LibGit2CommitSha = "$(libgit2hash)"%3b |
| 80 | + public const string LibGit2CommitSha = "$(libgit2_hash)"%3b |
93 | 81 | public const string LibGit2SharpCommitSha = "$(GitCommitId)"%3b |
94 | 82 | } |
95 | 83 | } |
|
0 commit comments