diff --git a/Lib/NativeBinaries/amd64/git2-3f8d005.dll b/Lib/NativeBinaries/amd64/git2-3f8d005.dll new file mode 100644 index 000000000..b7c5193cd Binary files /dev/null and b/Lib/NativeBinaries/amd64/git2-3f8d005.dll differ diff --git a/Lib/NativeBinaries/amd64/git2-e0383fa.pdb b/Lib/NativeBinaries/amd64/git2-3f8d005.pdb similarity index 50% rename from Lib/NativeBinaries/amd64/git2-e0383fa.pdb rename to Lib/NativeBinaries/amd64/git2-3f8d005.pdb index c0e785800..01c00edd9 100644 Binary files a/Lib/NativeBinaries/amd64/git2-e0383fa.pdb and b/Lib/NativeBinaries/amd64/git2-3f8d005.pdb differ diff --git a/Lib/NativeBinaries/amd64/git2-e0383fa.dll b/Lib/NativeBinaries/amd64/git2-e0383fa.dll deleted file mode 100644 index bd7a365be..000000000 Binary files a/Lib/NativeBinaries/amd64/git2-e0383fa.dll and /dev/null differ diff --git a/Lib/NativeBinaries/x86/git2-3f8d005.dll b/Lib/NativeBinaries/x86/git2-3f8d005.dll new file mode 100644 index 000000000..9754921f6 Binary files /dev/null and b/Lib/NativeBinaries/x86/git2-3f8d005.dll differ diff --git a/Lib/NativeBinaries/x86/git2-e0383fa.pdb b/Lib/NativeBinaries/x86/git2-3f8d005.pdb similarity index 51% rename from Lib/NativeBinaries/x86/git2-e0383fa.pdb rename to Lib/NativeBinaries/x86/git2-3f8d005.pdb index b26876b55..576c18572 100644 Binary files a/Lib/NativeBinaries/x86/git2-e0383fa.pdb and b/Lib/NativeBinaries/x86/git2-3f8d005.pdb differ diff --git a/Lib/NativeBinaries/x86/git2-e0383fa.dll b/Lib/NativeBinaries/x86/git2-e0383fa.dll deleted file mode 100644 index 6cb75dc4b..000000000 Binary files a/Lib/NativeBinaries/x86/git2-e0383fa.dll and /dev/null differ diff --git a/LibGit2Sharp.Tests/RemoteFixture.cs b/LibGit2Sharp.Tests/RemoteFixture.cs index 0299860a3..00d15a993 100644 --- a/LibGit2Sharp.Tests/RemoteFixture.cs +++ b/LibGit2Sharp.Tests/RemoteFixture.cs @@ -259,14 +259,14 @@ public void CanRenameExistingRemote() } [Fact] - public void CanRenameNonExistingRemote() + public void RenamingNonExistingRemoteThrows() { using (var repo = new Repository(StandardTestRepoPath)) { - Assert.Null(repo.Network.Remotes["i_dont_exist"]); - - repo.Network.Remotes.Rename("i_dont_exist", "i_dont_either", problem => Assert.True(false)); - Assert.Null(repo.Network.Remotes["i_dont_either"]); + Assert.Throws(() => + { + repo.Network.Remotes.Rename("i_dont_exist", "i_dont_either"); + }); } } @@ -327,20 +327,5 @@ public void CanNotRenameWhenRemoteWithSameNameExists() Assert.Throws(() => repo.Network.Remotes.Rename("origin", "upstream")); } } - - [Theory] - [InlineData("git@github.com:org/repo.git", false)] - [InlineData("git://site.com:80/org/repo.git", true)] - [InlineData("ssh://user@host.com:80/org/repo.git", false)] - [InlineData("http://site.com:80/org/repo.git", true)] - [InlineData("https://github.com:80/org/repo.git", true)] - [InlineData("ftp://site.com:80/org/repo.git", false)] - [InlineData("ftps://site.com:80/org/repo.git", false)] - [InlineData("file:///path/repo.git", true)] - [InlineData("protocol://blah.meh/whatever.git", false)] - public void CanCheckIfUrlisSupported(string url, bool supported) - { - Assert.Equal(supported, Remote.IsSupportedUrl(url)); - } } } diff --git a/LibGit2Sharp/Core/GitDiff.cs b/LibGit2Sharp/Core/GitDiff.cs index 27b5fab19..7ce4eafdf 100644 --- a/LibGit2Sharp/Core/GitDiff.cs +++ b/LibGit2Sharp/Core/GitDiff.cs @@ -205,8 +205,8 @@ internal class GitDiffOptions : IDisposable /* options controlling how to diff text is generated */ - public ushort ContextLines; - public ushort InterhunkLines; + public uint ContextLines; + public uint InterhunkLines; public ushort IdAbbrev; public Int64 MaxSize; public IntPtr OldPrefixString; diff --git a/LibGit2Sharp/Core/Handles/GitMergeHeadHandle.cs b/LibGit2Sharp/Core/Handles/GitAnnotatedCommitHandle.cs similarity index 62% rename from LibGit2Sharp/Core/Handles/GitMergeHeadHandle.cs rename to LibGit2Sharp/Core/Handles/GitAnnotatedCommitHandle.cs index f49e30e54..519874d03 100644 --- a/LibGit2Sharp/Core/Handles/GitMergeHeadHandle.cs +++ b/LibGit2Sharp/Core/Handles/GitAnnotatedCommitHandle.cs @@ -2,11 +2,11 @@ namespace LibGit2Sharp.Core.Handles { - internal class GitMergeHeadHandle : SafeHandleBase + internal class GitAnnotatedCommitHandle : SafeHandleBase { protected override bool ReleaseHandleImpl() { - Proxy.git_merge_head_free(handle); + Proxy.git_annotated_commit_free(handle); return true; } } diff --git a/LibGit2Sharp/Core/NativeDllName.cs b/LibGit2Sharp/Core/NativeDllName.cs index 16e5f7800..ecd41aaa6 100644 --- a/LibGit2Sharp/Core/NativeDllName.cs +++ b/LibGit2Sharp/Core/NativeDllName.cs @@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core { internal static class NativeDllName { - public const string Name = "git2-e0383fa"; + public const string Name = "git2-3f8d005"; } } diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs index ab47bb327..1ef9f77ed 100644 --- a/LibGit2Sharp/Core/NativeMethods.cs +++ b/LibGit2Sharp/Core/NativeMethods.cs @@ -215,7 +215,8 @@ internal static extern int git_branch_remote_name( [DllImport(libgit2)] internal static extern int git_remote_rename( ref GitStrArray problems, - RemoteSafeHandle remote, + RepositorySafeHandle repo, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string old_name, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string new_name); internal delegate int git_remote_rename_problem_cb( @@ -223,11 +224,6 @@ internal delegate int git_remote_rename_problem_cb( IntPtr payload); - [DllImport(libgit2)] - [return: MarshalAs(UnmanagedType.Bool)] - internal static extern bool git_remote_supported_url( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url); - [DllImport(libgit2)] internal static extern int git_branch_upstream_name( GitBuf buf, @@ -630,28 +626,28 @@ internal static extern int git_merge_base_octopus( [In] GitOid[] input_array); [DllImport(libgit2)] - internal static extern int git_merge_head_from_ref( - out GitMergeHeadHandle mergehead, + internal static extern int git_annotated_commit_from_ref( + out GitAnnotatedCommitHandle annotatedCommit, RepositorySafeHandle repo, ReferenceSafeHandle reference); [DllImport(libgit2)] - internal static extern int git_merge_head_from_fetchhead( - out GitMergeHeadHandle mergehead, + internal static extern int git_annotated_commit_from_fetchhead( + out GitAnnotatedCommitHandle annotatedCommit, RepositorySafeHandle repo, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string branch_name, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string remote_url, ref GitOid oid); [DllImport(libgit2)] - internal static extern int git_merge_head_from_id( - out GitMergeHeadHandle mergehead, + internal static extern int git_annotated_commit_lookup( + out GitAnnotatedCommitHandle annotatedCommit, RepositorySafeHandle repo, ref GitOid id); [DllImport(libgit2)] - internal static extern OidSafeHandle git_merge_head_id( - GitMergeHeadHandle mergeHead); + internal static extern OidSafeHandle git_annotated_commit_id( + GitAnnotatedCommitHandle annotatedCommit); [DllImport(libgit2)] internal static extern int git_merge( @@ -670,7 +666,7 @@ internal static extern int git_merge_analysis( int their_heads_len); [DllImport(libgit2)] - internal static extern void git_merge_head_free( + internal static extern void git_annotated_commit_free( IntPtr merge_head); [DllImport(libgit2)] diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs index e87ce58de..a9ab5e1d5 100644 --- a/LibGit2Sharp/Core/Proxy.cs +++ b/LibGit2Sharp/Core/Proxy.cs @@ -1048,13 +1048,13 @@ public static ObjectId git_merge_base_octopus(RepositorySafeHandle repo, GitOid[ } } - public static GitMergeHeadHandle git_merge_head_from_fetchhead(RepositorySafeHandle repo, string branchName, string remoteUrl, GitOid oid) + public static GitAnnotatedCommitHandle git_annotated_commit_from_fetchhead(RepositorySafeHandle repo, string branchName, string remoteUrl, GitOid oid) { using (ThreadAffinity()) { - GitMergeHeadHandle merge_head; + GitAnnotatedCommitHandle merge_head; - int res = NativeMethods.git_merge_head_from_fetchhead(out merge_head, repo, branchName, remoteUrl, ref oid); + int res = NativeMethods.git_annotated_commit_from_fetchhead(out merge_head, repo, branchName, remoteUrl, ref oid); Ensure.ZeroResult(res); @@ -1062,13 +1062,13 @@ public static GitMergeHeadHandle git_merge_head_from_fetchhead(RepositorySafeHan } } - public static GitMergeHeadHandle git_merge_head_from_id(RepositorySafeHandle repo, GitOid oid) + public static GitAnnotatedCommitHandle git_annotated_commit_lookup(RepositorySafeHandle repo, GitOid oid) { using (ThreadAffinity()) { - GitMergeHeadHandle their_head; + GitAnnotatedCommitHandle their_head; - int res = NativeMethods.git_merge_head_from_id(out their_head, repo, ref oid); + int res = NativeMethods.git_annotated_commit_lookup(out their_head, repo, ref oid); Ensure.ZeroResult(res); @@ -1076,13 +1076,13 @@ public static GitMergeHeadHandle git_merge_head_from_id(RepositorySafeHandle rep } } - public static GitMergeHeadHandle git_merge_head_from_ref(RepositorySafeHandle repo, ReferenceSafeHandle reference) + public static GitAnnotatedCommitHandle git_annotated_commit_from_ref(RepositorySafeHandle repo, ReferenceSafeHandle reference) { using (ThreadAffinity()) { - GitMergeHeadHandle their_head; + GitAnnotatedCommitHandle their_head; - int res = NativeMethods.git_merge_head_from_ref(out their_head, repo, reference); + int res = NativeMethods.git_annotated_commit_from_ref(out their_head, repo, reference); Ensure.ZeroResult(res); @@ -1090,12 +1090,12 @@ public static GitMergeHeadHandle git_merge_head_from_ref(RepositorySafeHandle re } } - public static ObjectId git_merge_head_id(GitMergeHeadHandle mergeHead) + public static ObjectId git_annotated_commit_id(GitAnnotatedCommitHandle mergeHead) { - return NativeMethods.git_merge_head_id(mergeHead).MarshalAsObjectId(); + return NativeMethods.git_annotated_commit_id(mergeHead).MarshalAsObjectId(); } - public static void git_merge(RepositorySafeHandle repo, GitMergeHeadHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions) + public static void git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions) { using (ThreadAffinity()) { @@ -1114,7 +1114,7 @@ public static void git_merge(RepositorySafeHandle repo, GitMergeHeadHandle[] hea public static void git_merge_analysis( RepositorySafeHandle repo, - GitMergeHeadHandle[] heads, + GitAnnotatedCommitHandle[] heads, out GitMergeAnalysis analysis_out, out GitMergePreference preference_out) { @@ -1133,9 +1133,9 @@ public static void git_merge_analysis( } } - public static void git_merge_head_free(IntPtr handle) + public static void git_annotated_commit_free(IntPtr handle) { - NativeMethods.git_merge_head_free(handle); + NativeMethods.git_annotated_commit_free(handle); } #endregion @@ -2125,39 +2125,38 @@ public static void git_remote_rename(RepositorySafeHandle repo, string name, str { using (ThreadAffinity()) { - using (RemoteSafeHandle remote = git_remote_load(repo, name, false)) + if (callback == null) { - if (remote == null) - { - return; - } + callback = problem => {}; + } - if (callback == null) - { - callback = problem => {}; - } + var array = new GitStrArrayNative(); - var array = new GitStrArrayNative(); + try + { + int res = NativeMethods.git_remote_rename( + ref array.Array, + repo, + name, + new_name); - try + if (res == (int)GitErrorCode.NotFound) { - int res = NativeMethods.git_remote_rename( - ref array.Array, - remote, - new_name); + throw new NotFoundException( + string.Format("Remote '{0}' does not exist and cannot be renamed.", name)); + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - foreach (var item in array.ReadStrings()) - { - callback(item); - } - } - finally + foreach (var item in array.ReadStrings()) { - array.Dispose(); + callback(item); } } + finally + { + array.Dispose(); + } } } @@ -2189,11 +2188,6 @@ public static string git_remote_url(RemoteSafeHandle remote) return NativeMethods.git_remote_url(remote); } - public static bool git_remote_supported_url(string url) - { - return NativeMethods.git_remote_supported_url(url); - } - #endregion #region git_repository_ diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index 4214e22bc..5d302db71 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -117,7 +117,7 @@ - + diff --git a/LibGit2Sharp/Remote.cs b/LibGit2Sharp/Remote.cs index dfff15fed..bb6de70ff 100644 --- a/LibGit2Sharp/Remote.cs +++ b/LibGit2Sharp/Remote.cs @@ -105,16 +105,6 @@ public static bool IsValidName(string name) return Proxy.git_remote_is_valid_name(name); } - /// - /// Determines if the proposed remote URL is supported by the library. - /// - /// The URL to be checked. - /// true if the url is supported; false otherwise. - public static bool IsSupportedUrl(string url) - { - return Proxy.git_remote_supported_url(url); - } - /// /// Determines whether the specified is equal to the current . /// diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs index 3a4268319..1c81bd26d 100644 --- a/LibGit2Sharp/Repository.cs +++ b/LibGit2Sharp/Repository.cs @@ -988,9 +988,9 @@ public MergeResult Merge(Commit commit, Signature merger, MergeOptions options) options = options ?? new MergeOptions(); - using (GitMergeHeadHandle mergeHeadHandle = Proxy.git_merge_head_from_id(Handle, commit.Id.Oid)) + using (GitAnnotatedCommitHandle annotatedCommitHandle = Proxy.git_annotated_commit_lookup(Handle, commit.Id.Oid)) { - return Merge(new[] { mergeHeadHandle }, merger, options); + return Merge(new[] { annotatedCommitHandle }, merger, options); } } @@ -1009,9 +1009,9 @@ public MergeResult Merge(Branch branch, Signature merger, MergeOptions options) options = options ?? new MergeOptions(); using (ReferenceSafeHandle referencePtr = Refs.RetrieveReferencePtr(branch.CanonicalName)) - using (GitMergeHeadHandle mergeHeadHandle = Proxy.git_merge_head_from_ref(Handle, referencePtr)) + using (GitAnnotatedCommitHandle annotatedCommitHandle = Proxy.git_annotated_commit_from_ref(Handle, referencePtr)) { - return Merge(new[] { mergeHeadHandle }, merger, options); + return Merge(new[] { annotatedCommitHandle }, merger, options); } } @@ -1055,20 +1055,20 @@ internal MergeResult MergeFetchHeads(Signature merger, MergeOptions options) "The current branch is configured to merge with the reference '{0}' from the remote, but this reference was not fetched.", expectedRef)); } - GitMergeHeadHandle[] mergeHeadHandles = fetchHeads.Select(fetchHead => - Proxy.git_merge_head_from_fetchhead(Handle, fetchHead.RemoteCanonicalName, fetchHead.Url, fetchHead.Target.Id.Oid)).ToArray(); + GitAnnotatedCommitHandle[] annotatedCommitHandles = fetchHeads.Select(fetchHead => + Proxy.git_annotated_commit_from_fetchhead(Handle, fetchHead.RemoteCanonicalName, fetchHead.Url, fetchHead.Target.Id.Oid)).ToArray(); try { // Perform the merge. - return Merge(mergeHeadHandles, merger, options); + return Merge(annotatedCommitHandles, merger, options); } finally { // Cleanup. - foreach (GitMergeHeadHandle mergeHeadHandle in mergeHeadHandles) + foreach (GitAnnotatedCommitHandle annotatedCommitHandle in annotatedCommitHandles) { - mergeHeadHandle.Dispose(); + annotatedCommitHandle.Dispose(); } } } @@ -1245,16 +1245,16 @@ private FastForwardStrategy FastForwardStrategyFromMergePreference(GitMergePrefe /// /// Internal implementation of merge. /// - /// Merge heads to operate on. + /// Merge heads to operate on. /// The of who is performing the merge. /// Specifies optional parameters controlling merge behavior; if null, the defaults are used. /// The of the merge. - private MergeResult Merge(GitMergeHeadHandle[] mergeHeads, Signature merger, MergeOptions options) + private MergeResult Merge(GitAnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options) { GitMergeAnalysis mergeAnalysis; GitMergePreference mergePreference; - Proxy.git_merge_analysis(Handle, mergeHeads, out mergeAnalysis, out mergePreference); + Proxy.git_merge_analysis(Handle, annotatedCommits, out mergeAnalysis, out mergePreference); MergeResult mergeResult = null; @@ -1271,29 +1271,29 @@ private MergeResult Merge(GitMergeHeadHandle[] mergeHeads, Signature merger, Mer case FastForwardStrategy.Default: if (mergeAnalysis.HasFlag(GitMergeAnalysis.GIT_MERGE_ANALYSIS_FASTFORWARD)) { - if (mergeHeads.Length != 1) + if (annotatedCommits.Length != 1) { // We should not reach this code unless there is a bug somewhere. throw new LibGit2SharpException("Unable to perform Fast-Forward merge with mith multiple merge heads."); } - mergeResult = FastForwardMerge(mergeHeads[0], merger, options); + mergeResult = FastForwardMerge(annotatedCommits[0], merger, options); } else if (mergeAnalysis.HasFlag(GitMergeAnalysis.GIT_MERGE_ANALYSIS_NORMAL)) { - mergeResult = NormalMerge(mergeHeads, merger, options); + mergeResult = NormalMerge(annotatedCommits, merger, options); } break; case FastForwardStrategy.FastForwardOnly: if (mergeAnalysis.HasFlag(GitMergeAnalysis.GIT_MERGE_ANALYSIS_FASTFORWARD)) { - if (mergeHeads.Length != 1) + if (annotatedCommits.Length != 1) { // We should not reach this code unless there is a bug somewhere. throw new LibGit2SharpException("Unable to perform Fast-Forward merge with mith multiple merge heads."); } - mergeResult = FastForwardMerge(mergeHeads[0], merger, options); + mergeResult = FastForwardMerge(annotatedCommits[0], merger, options); } else { @@ -1305,7 +1305,7 @@ private MergeResult Merge(GitMergeHeadHandle[] mergeHeads, Signature merger, Mer case FastForwardStrategy.NoFastFoward: if (mergeAnalysis.HasFlag(GitMergeAnalysis.GIT_MERGE_ANALYSIS_NORMAL)) { - mergeResult = NormalMerge(mergeHeads, merger, options); + mergeResult = NormalMerge(annotatedCommits, merger, options); } break; default: @@ -1325,11 +1325,11 @@ private MergeResult Merge(GitMergeHeadHandle[] mergeHeads, Signature merger, Mer /// /// Perform a normal merge (i.e. a non-fast-forward merge). /// - /// The merge head handles to merge. + /// The merge head handles to merge. /// The of who is performing the merge. /// Specifies optional parameters controlling merge behavior; if null, the defaults are used. /// The of the merge. - private MergeResult NormalMerge(GitMergeHeadHandle[] mergeHeads, Signature merger, MergeOptions options) + private MergeResult NormalMerge(GitAnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options) { MergeResult mergeResult; @@ -1347,7 +1347,7 @@ private MergeResult NormalMerge(GitMergeHeadHandle[] mergeHeads, Signature merge { var checkoutOpts = checkoutOptionsWrapper.Options; - Proxy.git_merge(Handle, mergeHeads, mergeOptions, checkoutOpts); + Proxy.git_merge(Handle, annotatedCommits, mergeOptions, checkoutOpts); } if (Index.IsFullyMerged) @@ -1372,13 +1372,13 @@ private MergeResult NormalMerge(GitMergeHeadHandle[] mergeHeads, Signature merge /// /// Perform a fast-forward merge. /// - /// The merge head handle to fast-forward merge. + /// The merge head handle to fast-forward merge. /// The of who is performing the merge. /// Options controlling merge behavior. /// The of the merge. - private MergeResult FastForwardMerge(GitMergeHeadHandle mergeHead, Signature merger, MergeOptions options) + private MergeResult FastForwardMerge(GitAnnotatedCommitHandle annotatedCommit, Signature merger, MergeOptions options) { - ObjectId id = Proxy.git_merge_head_id(mergeHead); + ObjectId id = Proxy.git_annotated_commit_id(annotatedCommit); Commit fastForwardCommit = (Commit) Lookup(id, ObjectType.Commit); Ensure.GitObjectIsNotNull(fastForwardCommit, id.Sha); diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt index 953bb57b1..d6a1f3602 100644 --- a/LibGit2Sharp/libgit2_hash.txt +++ b/LibGit2Sharp/libgit2_hash.txt @@ -1 +1 @@ -e0383fa35f981c656043976a43c61bff059cb709 +3f8d005a82b39c504220d65b6a6aa696c3b1a9c4 diff --git a/UpdateLibgit2ToSha.ps1 b/UpdateLibgit2ToSha.ps1 index cc46e05f6..ee70de107 100644 --- a/UpdateLibgit2ToSha.ps1 +++ b/UpdateLibgit2ToSha.ps1 @@ -144,7 +144,7 @@ function Assert-Consistent-Naming($expected, $path) { Run-Command -Quiet { & remove-item build -recurse -force } Run-Command -Quiet { & mkdir build } cd build - Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON .. } + Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON .. } Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration diff --git a/build.libgit2sharp.sh b/build.libgit2sharp.sh index 9e4b5da25..a64434fb2 100755 --- a/build.libgit2sharp.sh +++ b/build.libgit2sharp.sh @@ -9,7 +9,6 @@ pushd libgit2/build export _BINPATH=`pwd` cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ - -DTHREADSAFE:BOOL=ON \ -DBUILD_CLAR:BOOL=OFF \ -DUSE_SSH=OFF \ -DENABLE_TRACE=ON \ diff --git a/libgit2 b/libgit2 index e0383fa35..3f8d005a8 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit e0383fa35f981c656043976a43c61bff059cb709 +Subproject commit 3f8d005a82b39c504220d65b6a6aa696c3b1a9c4 diff --git a/nuget.package/build/LibGit2Sharp.props b/nuget.package/build/LibGit2Sharp.props index 975cc521b..f3f5effd2 100644 --- a/nuget.package/build/LibGit2Sharp.props +++ b/nuget.package/build/LibGit2Sharp.props @@ -1,20 +1,20 @@  - - NativeBinaries\amd64\git2-e0383fa.dll + + NativeBinaries\amd64\git2-3f8d005.dll PreserveNewest - - NativeBinaries\amd64\git2-e0383fa.pdb + + NativeBinaries\amd64\git2-3f8d005.pdb PreserveNewest - - NativeBinaries\x86\git2-e0383fa.dll + + NativeBinaries\x86\git2-3f8d005.dll PreserveNewest - - NativeBinaries\x86\git2-e0383fa.pdb + + NativeBinaries\x86\git2-3f8d005.pdb PreserveNewest