Skip to content

Commit 84713e3

Browse files
authored
Merge pull request #114 from jairbubbles/update-libgit2-to-v1-1-0
Update libgit2 to v1.1.1
2 parents 8bb23e3 + 55e4a1c commit 84713e3

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

build.libgit2.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ function Assert-Consistent-Naming($expected, $path) {
100100
try {
101101
Push-Location $libgit2Directory
102102

103+
# Patch CMakeLists.txt to fix LIBGIT2_FILENAME not being used when compiling the .rc file
104+
# To remove when https://github.com/libgit2/libgit2/pull/5994 is included
105+
$libgit2CMakeLists = Join-Path $libgit2Directory "src\CMakeLists.txt"
106+
(Get-Content $libgit2CMakeLists).Replace('target_compile_definitions(git2internal PRIVATE LIBGIT2_FILENAME', 'target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME') | Set-Content $libgit2CMakeLists
107+
103108
$cmake = Find-CMake
104109
$ctest = Join-Path (Split-Path -Parent $cmake) "ctest.exe"
105110

libgit2

Submodule libgit2 updated 835 files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
4-
<libgit2_hash>6777db8e8343014d57c41b335e0c60af44d4e9f2</libgit2_hash>
5-
<libgit2_filename>git2-6777db8</libgit2_filename>
4+
<libgit2_hash>8a0dc6783c340e61a44c179c48f832165ad2053c</libgit2_hash>
5+
<libgit2_filename>git2-8a0dc67</libgit2_filename>
66
</PropertyGroup>
77
</Project>

nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
4-
<libgit2_hash>6777db8e8343014d57c41b335e0c60af44d4e9f2</libgit2_hash>
5-
<libgit2_filename>git2-6777db8</libgit2_filename>
4+
<libgit2_hash>8a0dc6783c340e61a44c179c48f832165ad2053c</libgit2_hash>
5+
<libgit2_filename>git2-8a0dc67</libgit2_filename>
66
</PropertyGroup>
77
<ItemGroup>
88
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<configuration>
2-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-6777db8" target="lib/linux-x64/libgit2-6777db8.so" />
3-
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-6777db8" target="lib/linux-arm/libgit2-6777db8.so" />
4-
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-6777db8" target="lib/linux-arm64/libgit2-6777db8.so" />
5-
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-6777db8" target="lib/osx-x64/libgit2-6777db8.dylib" />
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-8a0dc67" target="lib/linux-x64/libgit2-8a0dc67.so" />
3+
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-8a0dc67" target="lib/linux-arm/libgit2-8a0dc67.so" />
4+
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-8a0dc67" target="lib/linux-arm64/libgit2-8a0dc67.so" />
5+
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-8a0dc67" target="lib/osx-x64/libgit2-8a0dc67.dylib" />
66
</configuration>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6777db8e8343014d57c41b335e0c60af44d4e9f2
1+
8a0dc6783c340e61a44c179c48f832165ad2053c

0 commit comments

Comments
 (0)