Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libgit2 to v1.1.1 #114

Merged
merged 5 commits into from
Aug 21, 2021
Merged

Update libgit2 to v1.1.1 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ea0d25
Update libgit2 to v1.1.0
jairbubbles May 10, 2021
3accd98
Remove checks
jairbubbles May 10, 2021
0bab4ff
Update to 1.1.1
jairbubbles Aug 16, 2021
989f084
Add check back + patch CMakeLists.txt
jairbubbles Aug 17, 2021
55e4a1c
Add comment
jairbubbles Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.libgit2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ function Assert-Consistent-Naming($expected, $path) {
try {
Push-Location $libgit2Directory

# Patch CMakeLists.txt to fix LIBGIT2_FILENAME not being used when compiling the .rc file
# To remove when https://github.com/libgit2/libgit2/pull/5994 is included
$libgit2CMakeLists = Join-Path $libgit2Directory "src\CMakeLists.txt"
(Get-Content $libgit2CMakeLists).Replace('target_compile_definitions(git2internal PRIVATE LIBGIT2_FILENAME', 'target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME') | Set-Content $libgit2CMakeLists

$cmake = Find-CMake
$ctest = Join-Path (Split-Path -Parent $cmake) "ctest.exe"

Expand Down
2 changes: 1 addition & 1 deletion libgit2
Open in desktop
Submodule libgit2 updated 835 files
4 changes: 2 additions & 2 deletions nuget.package/build/LibGit2Sharp.NativeBinaries.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>6777db8e8343014d57c41b335e0c60af44d4e9f2</libgit2_hash>
<libgit2_filename>git2-6777db8</libgit2_filename>
<libgit2_hash>8a0dc6783c340e61a44c179c48f832165ad2053c</libgit2_hash>
<libgit2_filename>git2-8a0dc67</libgit2_filename>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>6777db8e8343014d57c41b335e0c60af44d4e9f2</libgit2_hash>
<libgit2_filename>git2-6777db8</libgit2_filename>
<libgit2_hash>8a0dc6783c340e61a44c179c48f832165ad2053c</libgit2_hash>
<libgit2_filename>git2-8a0dc67</libgit2_filename>
</PropertyGroup>
<ItemGroup>
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
Expand Down
8 changes: 4 additions & 4 deletions nuget.package/libgit2/LibGit2Sharp.dll.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<configuration>
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-6777db8" target="lib/linux-x64/libgit2-6777db8.so" />
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-6777db8" target="lib/linux-arm/libgit2-6777db8.so" />
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-6777db8" target="lib/linux-arm64/libgit2-6777db8.so" />
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-6777db8" target="lib/osx-x64/libgit2-6777db8.dylib" />
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-8a0dc67" target="lib/linux-x64/libgit2-8a0dc67.so" />
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-8a0dc67" target="lib/linux-arm/libgit2-8a0dc67.so" />
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-8a0dc67" target="lib/linux-arm64/libgit2-8a0dc67.so" />
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-8a0dc67" target="lib/osx-x64/libgit2-8a0dc67.dylib" />
</configuration>
2 changes: 1 addition & 1 deletion nuget.package/libgit2/libgit2_hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6777db8e8343014d57c41b335e0c60af44d4e9f2
8a0dc6783c340e61a44c179c48f832165ad2053c