Merge pull request #152 from libgit2/libgit2-171

Update libgit2 to v1.7.1
libgit2 · Nov 27, 2023 · 9deb8d8 · 9deb8d8
2 parents 827d4be + 38737e9
commit 9deb8d8
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
             name: linux-musl-arm64
           - os: ubuntu-20.04
             name: linux-arm
-          - os: macos-10.15
+          - os: macos-11
             name: osx-x64
           - os: macos-11
             name: osx-arm64

diff --git a/Dockerfile.linux b/Dockerfile.linux
@@ -1,4 +1,4 @@
-FROM multiarch/crossbuild
+FROM bording/crossbuild
 ARG ARCH='amd64'
 ENV CROSS_TRIPLE=${ARCH}
 RUN apt update && apt -y install pkg-config

diff --git a/Dockerfile.linux-musl b/Dockerfile.linux-musl
@@ -1,5 +1,5 @@
 ARG ARCH='amd64'
-FROM multiarch/alpine:${ARCH}-v3.12
+FROM multiarch/alpine:${ARCH}-v3.13
 RUN apk add --no-cache bash build-base cmake
 
 WORKDIR /nativebinaries

diff --git a/build.libgit2.ps1 b/build.libgit2.ps1
@@ -118,7 +118,7 @@ try {
 
     if ($x86.IsPresent) {
         Write-Output "Building x86..."
-        Run-Command -Fatal { & $cmake -A Win32 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename"  .. }
+        Run-Command -Fatal { & $cmake -A Win32 -D USE_SSH=OFF -D USE_HTTPS=Schannel -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename"  .. }
         Run-Command -Fatal { & $cmake --build . --config $configuration }
         if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
         cd $configuration
@@ -134,7 +134,7 @@ try {
         Write-Output "Building x64..."
         Run-Command -Quiet { & mkdir build64 }
         cd build64
-        Run-Command -Fatal { & $cmake -A x64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
+        Run-Command -Fatal { & $cmake -A x64 -D USE_SSH=OFF -D USE_HTTPS=Schannel -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
         Run-Command -Fatal { & $cmake --build . --config $configuration }
         if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
         cd $configuration
@@ -149,7 +149,7 @@ try {
         Write-Output "Building arm64..."
         Run-Command -Quiet { & mkdir buildarm64 }
         cd buildarm64
-        Run-Command -Fatal { & $cmake -A ARM64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
+        Run-Command -Fatal { & $cmake -A ARM64 -D USE_SSH=OFF -D USE_HTTPS=Schannel -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
         Run-Command -Fatal { & $cmake --build . --config $configuration }
         if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
         cd $configuration

diff --git a/libgit2 b/libgit2
diff --git a/nuget.exe b/nuget.exe
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
@@ -1,7 +1,7 @@
-<Project>
+<Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>e6325351ceee58cf56f58bdce61b38907805544f</libgit2_hash>
-    <libgit2_filename>git2-e632535</libgit2_filename>
+    <libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
+    <libgit2_filename>git2-a2bde63</libgit2_filename>
   </PropertyGroup>
 </Project>
diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
@@ -1,8 +1,8 @@
-<Project>
+<Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>e6325351ceee58cf56f58bdce61b38907805544f</libgit2_hash>
-    <libgit2_filename>git2-e632535</libgit2_filename>
+    <libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
+    <libgit2_filename>git2-a2bde63</libgit2_filename>
   </PropertyGroup>
   <ItemGroup>
     <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />

diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config
@@ -1,7 +1,7 @@
-<configuration>
-    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-e632535" target="lib/linux-x64/libgit2-e632535.so" />
-    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-e632535" target="lib/linux-arm/libgit2-e632535.so" />
-    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-e632535" target="lib/linux-arm64/libgit2-e632535.so" />
-    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-e632535" target="lib/osx-x64/libgit2-e632535.dylib" />
-    <dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-e632535" target="lib/osx-arm64/libgit2-e632535.dylib" />
+<configuration>
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-a2bde63" target="lib/linux-x64/libgit2-a2bde63.so" />
+    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-a2bde63" target="lib/linux-arm/libgit2-a2bde63.so" />
+    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-a2bde63" target="lib/linux-arm64/libgit2-a2bde63.so" />
+    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-a2bde63" target="lib/osx-x64/libgit2-a2bde63.dylib" />
+    <dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-a2bde63" target="lib/osx-arm64/libgit2-a2bde63.dylib" />
 </configuration>
diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt
@@ -1 +1 @@
-e6325351ceee58cf56f58bdce61b38907805544f
+a2bde63741977ca0f4ef7db2f609df320be67a08