Skip to content

Commit a267283

Browse files
committed
Update NativeBinaries to 1.0.192
1 parent e3d2565 commit a267283

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

LibGit2Sharp/CodeGenerator.targets

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,14 @@
1313
</Target>
1414

1515

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">
2217
<PropertyGroup>
2318
<NativeDllNameSourceLines>
2419
namespace LibGit2Sharp.Core
2520
{
2621
internal static class NativeDllName
2722
{
28-
public const string Name = "$(libgit2FileName)"%3b
23+
public const string Name = "$(libgit2_filename)"%3b
2924
}
3025
}
3126
</NativeDllNameSourceLines>
@@ -65,31 +60,24 @@
6560
</Target>
6661

6762

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">
7364

7465
<ItemGroup>
75-
<BuildMetadata Include="libgit2-$(libgit2hash.Substring(0,7))" />
66+
<BuildMetadata Include="libgit2-$(libgit2_hash.Substring(0,7))" />
7667
</ItemGroup>
7768

7869
</Target>
7970

80-
<Target Name="GenerateAssemblyCommitIdsCs" Inputs="@(EmbeddedResource);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties;GenerateAssemblyVersionInfo" Condition="'$(GitCommitId)' != ''">
8171

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)' != ''">
8573

8674
<PropertyGroup>
8775
<AssemblyCommitIdsSourceLines>
8876
namespace LibGit2Sharp
8977
{
9078
internal static class AssemblyCommitIds
9179
{
92-
public const string LibGit2CommitSha = "$(libgit2hash)"%3b
80+
public const string LibGit2CommitSha = "$(libgit2_hash)"%3b
9381
public const string LibGit2SharpCommitSha = "$(GitCommitId)"%3b
9482
}
9583
}

LibGit2Sharp/LibGit2Sharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.185]" PrivateAssets="contentFiles" />
35+
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.192]" PrivateAssets="none" />
3636
<PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
3737
<PackageReference Include="SourceLink.Create.GitHub" Version="2.6.0" PrivateAssets="all" />
3838
<DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.6.0" />

0 commit comments

Comments
 (0)