Skip to content

Commit f7e1316

Browse files
committed
Merge pull request #19 from libgit2/ntk/upgrade
Update libgit2 to 6b36945
2 parents 9750422 + af5328f commit f7e1316

5 files changed

Lines changed: 18 additions & 17 deletions

File tree

libgit2

Submodule libgit2 updated 119 files

nuget.package/build/LibGit2Sharp.NativeBinaries.props

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,31 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_hash.txt" />
5+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
56
</ItemGroup>
67
<ItemGroup>
7-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-4d6362b.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-4d6362b.dll">
8-
<Link>NativeBinaries\amd64\git2-4d6362b.dll</Link>
8+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-6b36945.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-6b36945.dll">
9+
<Link>NativeBinaries\amd64\git2-6b36945.dll</Link>
910
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1011
</None>
11-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-4d6362b.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-4d6362b.pdb">
12-
<Link>NativeBinaries\amd64\git2-4d6362b.pdb</Link>
12+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-6b36945.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-6b36945.pdb">
13+
<Link>NativeBinaries\amd64\git2-6b36945.pdb</Link>
1314
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1415
</None>
15-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-4d6362b.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-4d6362b.dll">
16-
<Link>NativeBinaries\x86\git2-4d6362b.dll</Link>
16+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-6b36945.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-6b36945.dll">
17+
<Link>NativeBinaries\x86\git2-6b36945.dll</Link>
1718
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1819
</None>
19-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-4d6362b.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-4d6362b.pdb">
20-
<Link>NativeBinaries\x86\git2-4d6362b.pdb</Link>
20+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-6b36945.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-6b36945.pdb">
21+
<Link>NativeBinaries\x86\git2-6b36945.pdb</Link>
2122
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2223
</None>
23-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-4d6362b.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-4d6362b.dylib">
24-
<Link>NativeBinaries\osx\libgit2-4d6362b.dylib</Link>
24+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-6b36945.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-6b36945.dylib">
25+
<Link>NativeBinaries\osx\libgit2-6b36945.dylib</Link>
2526
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2627
</None>
27-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-4d6362b.so')" Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-4d6362b.so">
28-
<Link>NativeBinaries\linux\amd64\libgit2-4d6362b.so</Link>
28+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-6b36945.so')" Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-6b36945.so">
29+
<Link>NativeBinaries\linux\amd64\libgit2-6b36945.so</Link>
2930
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3031
</None>
3132
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<configuration>
2-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-4d6362b" target="NativeBinaries/linux/amd64/libgit2-4d6362b.so" />
3-
<dllmap os="osx" cpu="x86,x86-64" dll="git2-4d6362b" target="NativeBinaries/osx/libgit2-4d6362b.dylib" />
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-6b36945" target="NativeBinaries/linux/amd64/libgit2-6b36945.so" />
3+
<dllmap os="osx" cpu="x86,x86-64" dll="git2-6b36945" target="NativeBinaries/osx/libgit2-6b36945.dylib" />
44
</configuration>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
git2-4d6362b
1+
git2-6b36945
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4d6362b168cdbc7d5b734810f2c81020c2837c4a
1+
6b36945d7e8a780a3063f09c65b3d9fed6525552

0 commit comments

Comments
 (0)