Skip to content

Commit

Permalink
Merge pull request #154 from hoerup/libgit2v172
Browse files Browse the repository at this point in the history
Update libgit2 to v1.7.2
  • Loading branch information
bording authored Mar 16, 2024
2 parents 9deb8d8 + 1a531fb commit 2c5c31e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v4.1.2
with:
submodules: true
- name: Build Windows
Expand All @@ -60,7 +60,7 @@ jobs:
if: runner.os == 'Linux'
run: ./dockerbuild.sh
- name: Upload artifacts
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.3.1
with:
name: ${{ matrix.name }}
path: nuget.package/runtimes/${{ matrix.name }}
Expand All @@ -72,26 +72,26 @@ jobs:
DOTNET_NOLOGO: true
steps:
- name: Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v4.1.2
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3.0.3
uses: actions/setup-dotnet@v4.0.0
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install MinVer
run: dotnet tool install --global minver-cli
- name: Run MinVer
id: minver
run: echo "version=$(minver)" >> $env:GITHUB_OUTPUT
- name: Download artifacts
uses: actions/download-artifact@v3.0.2
uses: actions/download-artifact@v4.1.4
with:
path: nuget.package/runtimes/
- name: Create package
run: ./nuget.exe Pack nuget.package/NativeBinaries.nuspec -Version ${{ steps.minver.outputs.version }} -NoPackageAnalysis
- name: Upload NuGet package
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.3.1
with:
name: NuGet package
path: ./*.nupkg
Binary file modified nuget.exe
Binary file not shown.
6 changes: 3 additions & 3 deletions nuget.package/build/LibGit2Sharp.NativeBinaries.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
<libgit2_filename>git2-a2bde63</libgit2_filename>
<libgit2_hash>a418d9d4ab87bae16b87d8f37143a4687ae0e4b2</libgit2_hash>
<libgit2_filename>git2-a418d9d</libgit2_filename>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
<libgit2_filename>git2-a2bde63</libgit2_filename>
<libgit2_hash>a418d9d4ab87bae16b87d8f37143a4687ae0e4b2</libgit2_hash>
<libgit2_filename>git2-a418d9d</libgit2_filename>
</PropertyGroup>
<ItemGroup>
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
Expand Down
12 changes: 6 additions & 6 deletions nuget.package/libgit2/LibGit2Sharp.dll.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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>
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-a418d9d" target="lib/linux-x64/libgit2-a418d9d.so" />
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-a418d9d" target="lib/linux-arm/libgit2-a418d9d.so" />
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-a418d9d" target="lib/linux-arm64/libgit2-a418d9d.so" />
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-a418d9d" target="lib/osx-x64/libgit2-a418d9d.dylib" />
<dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-a418d9d" target="lib/osx-arm64/libgit2-a418d9d.dylib" />
</configuration>
2 changes: 1 addition & 1 deletion nuget.package/libgit2/libgit2_hash.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a2bde63741977ca0f4ef7db2f609df320be67a08
a418d9d4ab87bae16b87d8f37143a4687ae0e4b2

0 comments on commit 2c5c31e

Please sign in to comment.