Skip to content

Commit a6f80e0

Browse files
committed
Upgrade with libgit2/libgit2#3127 changes
1 parent 3408695 commit a6f80e0

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ before_install:
1212
- date -u
1313
- uname -a
1414
- env | grep -v "BINTRAY_API_KEY" | sort
15+
- cd libgit2
16+
- git fetch origin refs/pull/3127/merge:refs/remotes/pr/3127
17+
- git checkout refs/remotes/pr/3127
18+
- cd ..
1519

1620
install: true
1721

appveyor.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ skip_tags: true
44

55
install:
66
- git submodule update --init --recursive
7+
- cd libgit2
8+
- git fetch origin refs/pull/3127/merge:refs/remotes/pr/3127
9+
- git checkout refs/remotes/pr/3127
10+
- cd ..
711

812
build_script:
913
- ps: .\build.libgit2.ps1 -vs 12

nuget.package/build/LibGit2Sharp.NativeBinaries.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_hash.txt" />
55
</ItemGroup>
66
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
7-
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-9042693.dll">
8-
<Link>NativeBinaries\amd64\git2-9042693.dll</Link>
7+
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-465dbe1.dll">
8+
<Link>NativeBinaries\amd64\git2-465dbe1.dll</Link>
99
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1010
</None>
11-
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-9042693.pdb">
12-
<Link>NativeBinaries\amd64\git2-9042693.pdb</Link>
11+
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-465dbe1.pdb">
12+
<Link>NativeBinaries\amd64\git2-465dbe1.pdb</Link>
1313
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1414
</None>
15-
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-9042693.dll">
16-
<Link>NativeBinaries\x86\git2-9042693.dll</Link>
15+
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-465dbe1.dll">
16+
<Link>NativeBinaries\x86\git2-465dbe1.dll</Link>
1717
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1818
</None>
19-
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-9042693.pdb">
20-
<Link>NativeBinaries\x86\git2-9042693.pdb</Link>
19+
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-465dbe1.pdb">
20+
<Link>NativeBinaries\x86\git2-465dbe1.pdb</Link>
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2222
</None>
2323
</ItemGroup>
2424
<ItemGroup Condition=" '$(OS)' == 'Unix' And Exists('/Library/Frameworks') ">
25-
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-9042693.dylib">
25+
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-465dbe1.dylib">
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2727
</None>
2828
</ItemGroup>
2929
<ItemGroup Condition=" '$(OS)' == 'Unix' And !Exists('/Library/Frameworks') ">
30-
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-9042693.so">
30+
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-465dbe1.so">
3131
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3232
</None>
3333
</ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9042693e283f65d9afb4906ed693a862a250664b
1+
465dbe1ed9f4393eda8041e25dd9a5af013af964

0 commit comments

Comments
 (0)