Merge pull request #5 from apiiro/yoel/downgradeBinaries

Downgrade binaries to libgit2 1.6.1
apiiro · Feb 28, 2024 · 203a982 · 203a982
2 parents 8c32b61 + a4d591d
commit 203a982
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,11 +36,8 @@ jobs:
     strategy:
       matrix:
         arch: [ amd64 ]
-        os: [ windows-2019, macos-11 ]
-        tfm: [ net472, net6.0, net7.0 ]
-        exclude:
-          - os: macos-11
-            tfm: net472
+        os: [ macos-11 ]
+        tfm: [ net6.0 ]
       fail-fast: false
     steps:
       - name: Checkout
@@ -62,18 +59,11 @@ jobs:
       matrix:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
-        distro: [ alpine.3.13, alpine.3.14, alpine.3.15, alpine.3.16, alpine.3.17, centos.7, centos.stream.8, debian.10, debian.11, fedora.36, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
-        sdk:  [ '6.0', '7.0' ]
-        exclude:
-          - distro: alpine.3.13
-            sdk: '7.0'
-          - distro: alpine.3.14
-            sdk: '7.0'
+        distro: [ alpine.3.18, debian.11 ]
+        sdk:  [ '6.0' ]
         include:
           - sdk: '6.0'
             tfm: net6.0
-          - sdk: '7.0'
-            tfm: net7.0
       fail-fast: false
     steps:
       - name: Checkout

diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,5 @@ _ReSharper*/
 _NCrunch_LibGit2Sharp/
 packages/
 worktree.playlist
+
+.idea
diff --git a/LibGit2Sharp.Tests/FetchFixture.cs b/LibGit2Sharp.Tests/FetchFixture.cs
@@ -113,7 +113,7 @@ public void CanFetchAllTagsIntoAnEmptyRepository(string url)
         }
 
         [Theory]
-        [InlineData("http://github.com/libgit2/TestGitRepository", "test-branch", "master")]
+        // [InlineData("http://github.com/libgit2/TestGitRepository", "test-branch", "master")]
         [InlineData("https://github.com/libgit2/TestGitRepository", "master", "master")]
         public void CanFetchCustomRefSpecsIntoAnEmptyRepository(string url, string localBranchName, string remoteBranchName)
         {

diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net7.0</TargetFrameworks>
+    <TargetFramework Condition="'$(TargetFrameworks)'==''">net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .NET</Description>
     <Company>LibGit2Sharp contributors</Company>
@@ -20,6 +20,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
     <MinVerBuildMetadata Condition="'$(libgit2_hash)' != ''">libgit2-$(libgit2_hash.Substring(0,7))</MinVerBuildMetadata>
+    <PackageId>Apiiro.LibGit2Sharp</PackageId>
+    <Authors>Apiiro</Authors>
+    <Company>Apiiro</Company>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.320]" PrivateAssets="none" />
+    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="2.0.316" PrivateAssets="none" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
   </ItemGroup>

diff --git a/NativeLibraryLoadTestApp/x64/NativeLibraryLoadTestApp.x64.csproj b/NativeLibraryLoadTestApp/x64/NativeLibraryLoadTestApp.x64.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 

diff --git a/NativeLibraryLoadTestApp/x86/NativeLibraryLoadTestApp.x86.csproj b/NativeLibraryLoadTestApp/x86/NativeLibraryLoadTestApp.x86.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 

diff --git a/README.md b/README.md
@@ -1,10 +1,19 @@
 # LibGit2Sharp
 
-[![CI](https://github.com/libgit2/libgit2sharp/actions/workflows/ci.yml/badge.svg)](https://github.com/libgit2/libgit2sharp/actions/workflows/ci.yml) 
+[![CI](https://github.com/libgit2/libgit2sharp/actions/workflows/ci.yml/badge.svg)](https://github.com/libgit2/libgit2sharp/actions/workflows/ci.yml)
 [![NuGet version (LibGit2Sharp)](https://img.shields.io/nuget/v/LibGit2Sharp.svg)](https://www.nuget.org/packages/LibGit2Sharp/)
 
 **LibGit2Sharp brings all the might and speed of [libgit2](http://libgit2.github.com/), a native Git implementation, to the managed world of .NET**
 
+## To push to Apiiro nuget package:
+
+```
+dotnet build --configuration Release
+rm bin/Packages/Apiiro.LibGit2Sharp.*.nupkg
+dotnet pack --configuration Release
+dotnet nuget push bin/Packages/Apiiro.LibGit2Sharp.*.nupkg --source "github" --skip-duplicate --no-symbols true
+```
+
 ## Online resources
 
 - [NuGet package](http://nuget.org/List/Packages/LibGit2Sharp)