Skip to content

Commit 26a3722

Browse files
author
Edward Thomson
authored
Merge pull request #45 from libgit2/ethomson/a5cf255
Update libgit2 to a5cf255
2 parents 5f85424 + d2b1d2d commit 26a3722

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

buildpackage.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ $versionSuffix = ""
99
if ($pre.IsPresent) { $versionSuffix = "-pre$BuildDate" }
1010

1111
$projectDirectory = Split-Path $MyInvocation.MyCommand.Path
12-
$x86Directory = Join-Path $projectDirectory "nuget.package\runtimes\win-x86\native"
13-
$x64Directory = Join-Path $projectDirectory "nuget.package\runtimes\win-x64\native"
12+
$x86Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x86\native"
13+
$x64Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x64\native"
1414
$osxDirectory = Join-Path $projectDirectory "nuget.package\runtimes\osx\native"
1515
$linuxDirectory = Join-Path $projectDirectory "nuget.package\runtimes\linux-x64\native"
1616

nuget.package/build/LibGit2Sharp.NativeBinaries.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
66
</ItemGroup>
77
<ItemGroup>
8-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-75db289.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-75db289.dll">
9-
<Link>lib\win32\x64\git2-75db289.dll</Link>
8+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-a5cf255.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-a5cf255.dll">
9+
<Link>lib\win32\x64\git2-a5cf255.dll</Link>
1010
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1111
</None>
12-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-75db289.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-75db289.pdb">
13-
<Link>lib\win32\x64\git2-75db289.pdb</Link>
12+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-a5cf255.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-a5cf255.pdb">
13+
<Link>lib\win32\x64\git2-a5cf255.pdb</Link>
1414
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1515
</None>
16-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-75db289.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-75db289.dll">
17-
<Link>lib\win32\x86\git2-75db289.dll</Link>
16+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-a5cf255.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-a5cf255.dll">
17+
<Link>lib\win32\x86\git2-a5cf255.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
20-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-75db289.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-75db289.pdb">
21-
<Link>lib\win32\x86\git2-75db289.pdb</Link>
20+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-a5cf255.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-a5cf255.pdb">
21+
<Link>lib\win32\x86\git2-a5cf255.pdb</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</None>
24-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-75db289.dylib')" Include="$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-75db289.dylib">
25-
<Link>lib\osx\libgit2-75db289.dylib</Link>
24+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-a5cf255.dylib')" Include="$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-a5cf255.dylib">
25+
<Link>lib\osx\libgit2-a5cf255.dylib</Link>
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2727
</None>
28-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-75db289.so')" Include="$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-75db289.so">
29-
<Link>lib\linux\x86_64\libgit2-75db289.so</Link>
28+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-a5cf255.so')" Include="$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-a5cf255.so">
29+
<Link>lib\linux\x86_64\libgit2-a5cf255.so</Link>
3030
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3131
</None>
3232
<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-75db289" target="lib/linux/x86_64/libgit2-75db289.so" />
3-
<dllmap os="osx" cpu="x86,x86-64" dll="git2-75db289" target="lib/osx/libgit2-75db289.dylib" />
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-a5cf255" target="lib/linux/x86_64/libgit2-a5cf255.so" />
3+
<dllmap os="osx" cpu="x86,x86-64" dll="git2-a5cf255" target="lib/osx/libgit2-a5cf255.dylib" />
44
</configuration>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
git2-75db289
1+
git2-a5cf255
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
75db289a041b1f1084768244e167b953ac7eeaa5
1+
a5cf255b471ad7113247d552d5695db0cb720882

0 commit comments

Comments
 (0)