Tidy

eddymoulton · eddymoulton · commit d80ecf16482c · 2026-03-26T15:16:04.000+11:00
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\LibGit2Sharp\LibGit2Sharp.csproj" />
-    <!--<ProjectReference Include="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
-    <ProjectReference Include="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />-->
+    <ProjectReference Include="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
+    <ProjectReference Include="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LibGit2Sharp.Tests/NetworkFixture.cs b/LibGit2Sharp.Tests/NetworkFixture.cs
@@ -9,7 +9,8 @@ namespace LibGit2Sharp.Tests
     public class NetworkFixture : BaseFixture
     {
         [Theory]
-        //[InlineData("http://github.com/libgit2/TestGitRepository")]
+        [InlineData("http://github.com/libgit2/TestGitRepository")]
+        [InlineData("https://github.com/libgit2/TestGitRepository")]
         [InlineData("git@github.com:libgit2/TestGitRepository.git")]
         public void CanListRemoteReferences(string url)
         {
@@ -20,12 +21,7 @@ public void CanListRemoteReferences(string url)
             using (var repo = new Repository(repoPath))
             {
                 Remote remote = repo.Network.Remotes.Add(remoteName, url);
-                IList<Reference> references = repo.Network.ListReferences(remote, (s, fromUrl, types) =>
-                {
-
-                    return null;
-                }).ToList();
-
+                IList<Reference> references = repo.Network.ListReferences(remote).ToList();
 
                 foreach (var reference in references)
                 {
diff --git a/LibGit2Sharp/Core/GitRemoteCallbacks.cs b/LibGit2Sharp/Core/GitRemoteCallbacks.cs
@@ -39,6 +39,6 @@ internal struct GitRemoteCallbacks
 
         internal NativeMethods.url_resolve_callback resolve_url;
 
-        internal IntPtr update_refs; // git_remote_update_ref_cb added in libgit2 v1.9
+        internal IntPtr update_refs;
     }
 }
diff --git a/LibGit2Sharp/GlobalSettings.cs b/LibGit2Sharp/GlobalSettings.cs
@@ -20,7 +20,7 @@ public static class GlobalSettings
 
         private static string nativeLibraryPath;
         private static bool nativeLibraryPathLocked;
-        private static readonly string nativeLibraryDefaultPath = "/Users/robert/Development/Sandbox/libgit2/build";
+        private static readonly string nativeLibraryDefaultPath = null;
 
         static GlobalSettings()
         {
diff --git a/LibGit2Sharp/RemoteCallbacks.cs b/LibGit2Sharp/RemoteCallbacks.cs
@@ -307,7 +307,6 @@ private int GitCredentialHandler(
                 types |= SupportedCredentialTypes.SSMemory;
             }
 
-
             ptr = IntPtr.Zero;
             try
             {
diff --git a/LibGit2Sharp/SshUserKeyCredentials.cs b/LibGit2Sharp/SshUserKeyCredentials.cs
@@ -25,12 +25,6 @@ protected internal override int GitCredentialHandler(out IntPtr cred)
                 throw new InvalidOperationException("SshUserKeyCredentials contains a null Passphrase.");
             }
 
-            if (PublicKey == null)
-            {
-                // TODO: Can this be null or do we need to derive from the private key?
-                throw new InvalidOperationException("SshUserKeyCredentials contains a null PublicKey.");
-            }
-
             if (PrivateKey == null)
             {
                 throw new InvalidOperationException("SshUserKeyCredentials contains a null PrivateKey.");
diff --git a/LibGit2Sharp/SshUserKeyMemoryCredentials.cs b/LibGit2Sharp/SshUserKeyMemoryCredentials.cs
@@ -25,11 +25,6 @@ protected internal override int GitCredentialHandler(out IntPtr cred)
                 throw new InvalidOperationException("SshUserKeyMemoryCredentials contains a null Passphrase.");
             }
 
-            if (PublicKey == null)
-            {
-                // TODO: Can this be null or do we need to derive from the private key?
-            }
-
             if (PrivateKey == null)
             {
                 throw new InvalidOperationException("SshUserKeyMemoryCredentials contains a null PrivateKey.");

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ namespace LibGit2Sharp.Tests`
`9`	`9`	`public class NetworkFixture : BaseFixture`
`10`	`10`	`{`
`11`	`11`	`[Theory]`
`12`		`- //[InlineData("http://github.com/libgit2/TestGitRepository")]`
	`12`	`+ [InlineData("http://github.com/libgit2/TestGitRepository")]`
	`13`	`+ [InlineData("https://github.com/libgit2/TestGitRepository")]`
`13`	`14`	`[InlineData("git@github.com:libgit2/TestGitRepository.git")]`
`14`	`15`	`public void CanListRemoteReferences(string url)`
`15`	`16`	`{`
`@@ -20,12 +21,7 @@ public void CanListRemoteReferences(string url)`
`20`	`21`	`using (var repo = new Repository(repoPath))`
`21`	`22`	`{`
`22`	`23`	`Remote remote = repo.Network.Remotes.Add(remoteName, url);`
`23`		`- IList<Reference> references = repo.Network.ListReferences(remote, (s, fromUrl, types) =>`
`24`		`- {`
`25`		`-`
`26`		`- return null;`
`27`		`- }).ToList();`
`28`		`-`
	`24`	`+ IList<Reference> references = repo.Network.ListReferences(remote).ToList();`
`29`	`25`
`30`	`26`	`foreach (var reference in references)`
`31`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ internal struct GitRemoteCallbacks`
`39`	`39`
`40`	`40`	`internal NativeMethods.url_resolve_callback resolve_url;`
`41`	`41`
`42`		`- internal IntPtr update_refs; // git_remote_update_ref_cb added in libgit2 v1.9`
	`42`	`+ internal IntPtr update_refs;`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static class GlobalSettings`
`20`	`20`
`21`	`21`	`private static string nativeLibraryPath;`
`22`	`22`	`private static bool nativeLibraryPathLocked;`
`23`		`- private static readonly string nativeLibraryDefaultPath = "/Users/robert/Development/Sandbox/libgit2/build";`
	`23`	`+ private static readonly string nativeLibraryDefaultPath = null;`
`24`	`24`
`25`	`25`	`static GlobalSettings()`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,6 @@ private int GitCredentialHandler(`
`307`	`307`	`types \|= SupportedCredentialTypes.SSMemory;`
`308`	`308`	`}`
`309`	`309`
`310`		`-`
`311`	`310`	`ptr = IntPtr.Zero;`
`312`	`311`	`try`
`313`	`312`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,6 @@ protected internal override int GitCredentialHandler(out IntPtr cred)`
`25`	`25`	`throw new InvalidOperationException("SshUserKeyCredentials contains a null Passphrase.");`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (PublicKey == null)`
`29`		`- {`
`30`		`- // TODO: Can this be null or do we need to derive from the private key?`
`31`		`- throw new InvalidOperationException("SshUserKeyCredentials contains a null PublicKey.");`
`32`		`- }`
`33`		`-`
`34`	`28`	`if (PrivateKey == null)`
`35`	`29`	`{`
`36`	`30`	`throw new InvalidOperationException("SshUserKeyCredentials contains a null PrivateKey.");`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,6 @@ protected internal override int GitCredentialHandler(out IntPtr cred)`
`25`	`25`	`throw new InvalidOperationException("SshUserKeyMemoryCredentials contains a null Passphrase.");`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (PublicKey == null)`
`29`		`- {`
`30`		`- // TODO: Can this be null or do we need to derive from the private key?`
`31`		`- }`
`32`		`-`
`33`	`28`	`if (PrivateKey == null)`
`34`	`29`	`{`
`35`	`30`	`throw new InvalidOperationException("SshUserKeyMemoryCredentials contains a null PrivateKey.");`