Finish update to v1.0.1 (#3)

A-Ovchinnikov-mx · MarcellvanRooyen · Alexander Ovchinnikov · commit f958478f89fa · 2020-12-04T12:43:25.000+01:00
* Update Native Method names and signatures as per: https://github.com/libgit2/libgit2/blob/master/docs/changelog.md#v099 Co-authored-by: Marcell van Rooyen <marcell.van.rooyen@mendix.com>
diff --git a/.github/workflows/Build_and_publish_package.yml b/.github/workflows/Build_and_publish_package.yml
@@ -7,7 +7,8 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
+  BUILD_TYPE: 'Release'
+  NUPKG_VERSION: '1.101.11'
   
 jobs:
   build:
@@ -33,7 +34,7 @@ jobs:
       run: |
         nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/mendix/index.json" -UserName srv-LibGit2sharp-mendix -Password ${{ secrets.GHPACKAGESTOKEN }}
         dotnet build -c Release
-        nuget pack .\mx_nuget.package\Mendix_package.nuspec  -Version 1.101.10 -NoPackageAnalysis
+        nuget pack .\mx_nuget.package\Mendix_package.nuspec  -Version ${{ env.NUPKG_VERSION }}  -NoPackageAnalysis
       shell: powershell #Keep as powershell and not pwsh
       
     - name: Upload build artifacts
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -99,7 +99,7 @@ private sealed class NativeShutdownObject : CriticalFinalizerObject
         internal static extern unsafe GitError* git_error_last();
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void git_error_set_str(
+        internal static extern int git_error_set_str(
             GitErrorCategory error_class,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string errorString);
 
@@ -124,25 +124,25 @@ internal static extern unsafe int git_blame_file(
         internal static extern unsafe void git_blame_free(git_blame* blame);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe int git_blob_create_fromdisk(
+        internal static extern unsafe int git_blob_create_from_disk(
             ref GitOid id,
             git_repository* repo,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe int git_blob_create_fromworkdir(
+        internal static extern unsafe int git_blob_create_from_workdir(
             ref GitOid id,
             git_repository* repo,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath relative_path);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe int git_blob_create_fromstream(
+        internal static extern unsafe int git_blob_create_from_stream(
             out IntPtr stream,
             git_repository* repositoryPtr,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string hintpath);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int git_blob_create_fromstream_commit(
+        internal static extern int git_blob_create_from_stream_commit(
             ref GitOid oid,
             IntPtr stream);
 
@@ -1465,7 +1465,7 @@ internal static extern unsafe int git_repository_open_ext(
         internal static extern unsafe FilePath git_repository_path(git_repository* repository);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe void git_repository_set_config(
+        internal static extern unsafe int git_repository_set_config(
             git_repository* repository,
             git_config* config);
 
@@ -1477,7 +1477,7 @@ internal static extern unsafe int git_repository_set_ident(
 
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe void git_repository_set_index(
+        internal static extern unsafe int git_repository_set_index(
             git_repository* repository,
             git_index* index);
 
@@ -1559,13 +1559,13 @@ internal static extern unsafe int git_revparse_ext(
         internal static extern unsafe int git_revwalk_push(git_revwalk* walker, ref GitOid id);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe void git_revwalk_reset(git_revwalk* walker);
+        internal static extern unsafe int git_revwalk_reset(git_revwalk* walker);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe void git_revwalk_sorting(git_revwalk* walk, CommitSortStrategies sort);
+        internal static extern unsafe int git_revwalk_sorting(git_revwalk* walk, CommitSortStrategies sort);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe void git_revwalk_simplify_first_parent(git_revwalk* walk);
+        internal static extern unsafe int git_revwalk_simplify_first_parent(git_revwalk* walk);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe void git_signature_free(git_signature* signature);
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -36,34 +36,34 @@ public static unsafe BlameHandle git_blame_file(
 
         #region git_blob_
 
-        public static unsafe IntPtr git_blob_create_fromstream(RepositoryHandle repo, string hintpath)
+        public static unsafe IntPtr git_blob_create_from_stream(RepositoryHandle repo, string hintpath)
         {
             IntPtr writestream_ptr;
 
-            Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream(out writestream_ptr, repo, hintpath));
+            Ensure.ZeroResult(NativeMethods.git_blob_create_from_stream(out writestream_ptr, repo, hintpath));
             return writestream_ptr;
         }
 
         public static unsafe ObjectId git_blob_create_fromstream_commit(IntPtr writestream_ptr)
         {
             var oid = new GitOid();
-            Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream_commit(ref oid, writestream_ptr));
+            Ensure.ZeroResult(NativeMethods.git_blob_create_from_stream_commit(ref oid, writestream_ptr));
             return oid;
         }
 
-        public static unsafe ObjectId git_blob_create_fromdisk(RepositoryHandle repo, FilePath path)
+        public static unsafe ObjectId git_blob_create_from_disk(RepositoryHandle repo, FilePath path)
         {
             var oid = new GitOid();
-            int res = NativeMethods.git_blob_create_fromdisk(ref oid, repo, path);
+            int res = NativeMethods.git_blob_create_from_disk(ref oid, repo, path);
             Ensure.ZeroResult(res);
 
             return oid;
         }
 
-        public static unsafe ObjectId git_blob_create_fromfile(RepositoryHandle repo, FilePath path)
+        public static unsafe ObjectId git_blob_create_from_workdir(RepositoryHandle repo, FilePath path)
         {
             var oid = new GitOid();
-            int res = NativeMethods.git_blob_create_fromworkdir(ref oid, repo, path);
+            int res = NativeMethods.git_blob_create_from_workdir(ref oid, repo, path);
             Ensure.ZeroResult(res);
 
             return oid;
@@ -847,21 +847,22 @@ public static unsafe int git_diff_num_deltas(DiffHandle diff)
 
         #region git_error_
 
-        public static void git_error_set_str(GitErrorCategory error_class, Exception exception)
+        public static int git_error_set_str(GitErrorCategory error_class, Exception exception)
         {
             if (exception is OutOfMemoryException)
             {
                 NativeMethods.git_error_set_oom();
+                return 0;
             }
             else
             {
-                NativeMethods.git_error_set_str(error_class, ErrorMessageFromException(exception));
+                return NativeMethods.git_error_set_str(error_class, ErrorMessageFromException(exception));
             }
         }
 
-        public static void git_error_set_str(GitErrorCategory error_class, String errorString)
+        public static int git_error_set_str(GitErrorCategory error_class, String errorString)
         {
-            NativeMethods.git_error_set_str(error_class, errorString);
+            return NativeMethods.git_error_set_str(error_class, errorString);
         }
 
         /// <summary>
@@ -2581,9 +2582,9 @@ public static unsafe FilePath git_repository_path(RepositoryHandle repo)
             return NativeMethods.git_repository_path(repo);
         }
 
-        public static unsafe void git_repository_set_config(RepositoryHandle repo, ConfigurationHandle config)
+        public static unsafe int git_repository_set_config(RepositoryHandle repo, ConfigurationHandle config)
         {
-            NativeMethods.git_repository_set_config(repo, config);
+            return NativeMethods.git_repository_set_config(repo, config);
         }
 
         public static unsafe void git_repository_set_ident(RepositoryHandle repo, string name, string email)
@@ -2592,9 +2593,9 @@ public static unsafe void git_repository_set_ident(RepositoryHandle repo, string
             Ensure.ZeroResult(res);
         }
 
-        public static unsafe void git_repository_set_index(RepositoryHandle repo, IndexHandle index)
+        public static unsafe int git_repository_set_index(RepositoryHandle repo, IndexHandle index)
         {
-            NativeMethods.git_repository_set_index(repo, index);
+            return NativeMethods.git_repository_set_index(repo, index);
         }
 
         public static unsafe void git_repository_set_workdir(RepositoryHandle repo, FilePath workdir)
@@ -2775,14 +2776,14 @@ public static unsafe void git_revwalk_reset(RevWalkerHandle walker)
             NativeMethods.git_revwalk_reset(walker);
         }
 
-        public static unsafe void git_revwalk_sorting(RevWalkerHandle walker, CommitSortStrategies options)
+        public static unsafe int git_revwalk_sorting(RevWalkerHandle walker, CommitSortStrategies options)
         {
-            NativeMethods.git_revwalk_sorting(walker, options);
+            return NativeMethods.git_revwalk_sorting(walker, options);
         }
 
-        public static unsafe void git_revwalk_simplify_first_parent(RevWalkerHandle walker)
+        public static unsafe int git_revwalk_simplify_first_parent(RevWalkerHandle walker)
         {
-            NativeMethods.git_revwalk_simplify_first_parent(walker);
+            return NativeMethods.git_revwalk_simplify_first_parent(walker);
         }
 
 #endregion
diff --git a/LibGit2Sharp/ObjectDatabase.cs b/LibGit2Sharp/ObjectDatabase.cs
@@ -104,8 +104,8 @@ public virtual Blob CreateBlob(string path)
             }
 
             ObjectId id = Path.IsPathRooted(path)
-                ? Proxy.git_blob_create_fromdisk(repo.Handle, path)
-                : Proxy.git_blob_create_fromfile(repo.Handle, path);
+                ? Proxy.git_blob_create_from_disk(repo.Handle, path)
+                : Proxy.git_blob_create_from_workdir(repo.Handle, path);
 
             return repo.Lookup<Blob>(id);
         }
@@ -277,7 +277,7 @@ private unsafe Blob CreateBlob(Stream stream, string hintpath, long? numberOfByt
                 throw new ArgumentException("The stream cannot be read from.", "stream");
             }
 
-            IntPtr writestream_ptr = Proxy.git_blob_create_fromstream(repo.Handle, hintpath);
+            IntPtr writestream_ptr = Proxy.git_blob_create_from_stream(repo.Handle, hintpath);
             GitWriteStream writestream = Marshal.PtrToStructure<GitWriteStream>(writestream_ptr);
 
             try

Original file line number	Diff line number	Diff line change
`@@ -36,34 +36,34 @@ public static unsafe BlameHandle git_blame_file(`
`36`	`36`
`37`	`37`	`#region git_blob_`
`38`	`38`
`39`		`- public static unsafe IntPtr git_blob_create_fromstream(RepositoryHandle repo, string hintpath)`
	`39`	`+ public static unsafe IntPtr git_blob_create_from_stream(RepositoryHandle repo, string hintpath)`
`40`	`40`	`{`
`41`	`41`	`IntPtr writestream_ptr;`
`42`	`42`
`43`		`- Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream(out writestream_ptr, repo, hintpath));`
	`43`	`+ Ensure.ZeroResult(NativeMethods.git_blob_create_from_stream(out writestream_ptr, repo, hintpath));`
`44`	`44`	`return writestream_ptr;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public static unsafe ObjectId git_blob_create_fromstream_commit(IntPtr writestream_ptr)`
`48`	`48`	`{`
`49`	`49`	`var oid = new GitOid();`
`50`		`- Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream_commit(ref oid, writestream_ptr));`
	`50`	`+ Ensure.ZeroResult(NativeMethods.git_blob_create_from_stream_commit(ref oid, writestream_ptr));`
`51`	`51`	`return oid;`
`52`	`52`	`}`
`53`	`53`
`54`		`- public static unsafe ObjectId git_blob_create_fromdisk(RepositoryHandle repo, FilePath path)`
	`54`	`+ public static unsafe ObjectId git_blob_create_from_disk(RepositoryHandle repo, FilePath path)`
`55`	`55`	`{`
`56`	`56`	`var oid = new GitOid();`
`57`		`- int res = NativeMethods.git_blob_create_fromdisk(ref oid, repo, path);`
	`57`	`+ int res = NativeMethods.git_blob_create_from_disk(ref oid, repo, path);`
`58`	`58`	`Ensure.ZeroResult(res);`
`59`	`59`
`60`	`60`	`return oid;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public static unsafe ObjectId git_blob_create_fromfile(RepositoryHandle repo, FilePath path)`
	`63`	`+ public static unsafe ObjectId git_blob_create_from_workdir(RepositoryHandle repo, FilePath path)`
`64`	`64`	`{`
`65`	`65`	`var oid = new GitOid();`
`66`		`- int res = NativeMethods.git_blob_create_fromworkdir(ref oid, repo, path);`
	`66`	`+ int res = NativeMethods.git_blob_create_from_workdir(ref oid, repo, path);`
`67`	`67`	`Ensure.ZeroResult(res);`
`68`	`68`
`69`	`69`	`return oid;`
`@@ -847,21 +847,22 @@ public static unsafe int git_diff_num_deltas(DiffHandle diff)`
`847`	`847`
`848`	`848`	`#region git_error_`
`849`	`849`
`850`		`- public static void git_error_set_str(GitErrorCategory error_class, Exception exception)`
	`850`	`+ public static int git_error_set_str(GitErrorCategory error_class, Exception exception)`
`851`	`851`	`{`
`852`	`852`	`if (exception is OutOfMemoryException)`
`853`	`853`	`{`
`854`	`854`	`NativeMethods.git_error_set_oom();`
	`855`	`+ return 0;`
`855`	`856`	`}`
`856`	`857`	`else`
`857`	`858`	`{`
`858`		`- NativeMethods.git_error_set_str(error_class, ErrorMessageFromException(exception));`
	`859`	`+ return NativeMethods.git_error_set_str(error_class, ErrorMessageFromException(exception));`
`859`	`860`	`}`
`860`	`861`	`}`
`861`	`862`
`862`		`- public static void git_error_set_str(GitErrorCategory error_class, String errorString)`
	`863`	`+ public static int git_error_set_str(GitErrorCategory error_class, String errorString)`
`863`	`864`	`{`
`864`		`- NativeMethods.git_error_set_str(error_class, errorString);`
	`865`	`+ return NativeMethods.git_error_set_str(error_class, errorString);`
`865`	`866`	`}`
`866`	`867`
`867`	`868`	`/// <summary>`
`@@ -2581,9 +2582,9 @@ public static unsafe FilePath git_repository_path(RepositoryHandle repo)`
`2581`	`2582`	`return NativeMethods.git_repository_path(repo);`
`2582`	`2583`	`}`
`2583`	`2584`
`2584`		`- public static unsafe void git_repository_set_config(RepositoryHandle repo, ConfigurationHandle config)`
	`2585`	`+ public static unsafe int git_repository_set_config(RepositoryHandle repo, ConfigurationHandle config)`
`2585`	`2586`	`{`
`2586`		`- NativeMethods.git_repository_set_config(repo, config);`
	`2587`	`+ return NativeMethods.git_repository_set_config(repo, config);`
`2587`	`2588`	`}`
`2588`	`2589`
`2589`	`2590`	`public static unsafe void git_repository_set_ident(RepositoryHandle repo, string name, string email)`
`@@ -2592,9 +2593,9 @@ public static unsafe void git_repository_set_ident(RepositoryHandle repo, string`
`2592`	`2593`	`Ensure.ZeroResult(res);`
`2593`	`2594`	`}`
`2594`	`2595`
`2595`		`- public static unsafe void git_repository_set_index(RepositoryHandle repo, IndexHandle index)`
	`2596`	`+ public static unsafe int git_repository_set_index(RepositoryHandle repo, IndexHandle index)`
`2596`	`2597`	`{`
`2597`		`- NativeMethods.git_repository_set_index(repo, index);`
	`2598`	`+ return NativeMethods.git_repository_set_index(repo, index);`
`2598`	`2599`	`}`
`2599`	`2600`
`2600`	`2601`	`public static unsafe void git_repository_set_workdir(RepositoryHandle repo, FilePath workdir)`
`@@ -2775,14 +2776,14 @@ public static unsafe void git_revwalk_reset(RevWalkerHandle walker)`
`2775`	`2776`	`NativeMethods.git_revwalk_reset(walker);`
`2776`	`2777`	`}`
`2777`	`2778`
`2778`		`- public static unsafe void git_revwalk_sorting(RevWalkerHandle walker, CommitSortStrategies options)`
	`2779`	`+ public static unsafe int git_revwalk_sorting(RevWalkerHandle walker, CommitSortStrategies options)`
`2779`	`2780`	`{`
`2780`		`- NativeMethods.git_revwalk_sorting(walker, options);`
	`2781`	`+ return NativeMethods.git_revwalk_sorting(walker, options);`
`2781`	`2782`	`}`
`2782`	`2783`
`2783`		`- public static unsafe void git_revwalk_simplify_first_parent(RevWalkerHandle walker)`
	`2784`	`+ public static unsafe int git_revwalk_simplify_first_parent(RevWalkerHandle walker)`
`2784`	`2785`	`{`
`2785`		`- NativeMethods.git_revwalk_simplify_first_parent(walker);`
	`2786`	`+ return NativeMethods.git_revwalk_simplify_first_parent(walker);`
`2786`	`2787`	`}`
`2787`	`2788`
`2788`	`2789`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ public virtual Blob CreateBlob(string path)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`ObjectId id = Path.IsPathRooted(path)`
`107`		`- ? Proxy.git_blob_create_fromdisk(repo.Handle, path)`
`108`		`- : Proxy.git_blob_create_fromfile(repo.Handle, path);`
	`107`	`+ ? Proxy.git_blob_create_from_disk(repo.Handle, path)`
	`108`	`+ : Proxy.git_blob_create_from_workdir(repo.Handle, path);`
`109`	`109`
`110`	`110`	`return repo.Lookup<Blob>(id);`
`111`	`111`	`}`
`@@ -277,7 +277,7 @@ private unsafe Blob CreateBlob(Stream stream, string hintpath, long? numberOfByt`
`277`	`277`	`throw new ArgumentException("The stream cannot be read from.", "stream");`
`278`	`278`	`}`
`279`	`279`
`280`		`- IntPtr writestream_ptr = Proxy.git_blob_create_fromstream(repo.Handle, hintpath);`
	`280`	`+ IntPtr writestream_ptr = Proxy.git_blob_create_from_stream(repo.Handle, hintpath);`
`281`	`281`	`GitWriteStream writestream = Marshal.PtrToStructure<GitWriteStream>(writestream_ptr);`
`282`	`282`
`283`	`283`	`try`