Enable basic proxy support in libgit2 (#11)

A-Ovchinnikov-mx · A-Ovchinnikov-mx · commit ea09b8caaac4 · 2022-07-18T18:15:16.000+02:00
diff --git a/LibGit2Sharp/Commands/Fetch.cs b/LibGit2Sharp/Commands/Fetch.cs
@@ -75,7 +75,7 @@ public static void Fetch(Repository repository, string remote, IEnumerable<strin
                     fetchOptions.CustomHeaders = GitStrArrayManaged.BuildFrom(options.CustomHeaders);
                 }
 
-                fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
+                fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
 
                 Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage);
             }
diff --git a/LibGit2Sharp/Network.cs b/LibGit2Sharp/Network.cs
@@ -118,7 +118,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan
             using (RemoteHandle remoteHandle = BuildRemoteHandle(repository.Handle, url))
             {
                 GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };
-                GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1 };
+                GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
 
                 if (credentialsProvider != null)
                 {
@@ -375,7 +375,7 @@ public virtual void Push(Remote remote, IEnumerable<string> pushRefSpecs, PushOp
                                       {
                                           PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism,
                                           RemoteCallbacks = gitCallbacks,
-                                          ProxyOptions = new GitProxyOptions { Version = 1 },
+                                          ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto },
                                       });
             }
         }
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -720,7 +720,7 @@ private static RemoteHandle ConnectToAnonymousRemote(RepositoryHandle repository
             RemoteHandle remoteHandle = Proxy.git_remote_create_anonymous(repositoryHandle, url);
 
             var gitCallbacks = new GitRemoteCallbacks { version = 1 };
-            var proxyOptions = new GitProxyOptions { Version = 1 };
+            var proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
 
             if (credentialsProvider != null)
             {
@@ -810,7 +810,7 @@ public static string Clone(string sourceUrl, string workdirPath,
                 var gitCheckoutOptions = checkoutOptionsWrapper.Options;
 
                 var gitFetchOptions = fetchOptionsWrapper.Options;
-                gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
+                gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
                 gitFetchOptions.RemoteCallbacks = new RemoteCallbacks(options).GenerateCallbacks();
                 if (options.FetchOptions != null && options.FetchOptions.CustomHeaders != null)
                 {
diff --git a/LibGit2Sharp/SubmoduleCollection.cs b/LibGit2Sharp/SubmoduleCollection.cs
@@ -104,7 +104,11 @@ public virtual void Update(string name, SubmoduleUpdateOptions options)
                     {
                         Version = 1,
                         CheckoutOptions = gitCheckoutOptions,
-                        FetchOptions = new GitFetchOptions { ProxyOptions = new GitProxyOptions { Version = 1 }, RemoteCallbacks = gitRemoteCallbacks },
+                        FetchOptions = new GitFetchOptions
+                        {
+                            ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto },
+                            RemoteCallbacks = gitRemoteCallbacks
+                        },
                         CloneCheckoutStrategy = CheckoutStrategy.GIT_CHECKOUT_SAFE
                     };
 
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.110.10",
+  "version": "1.110.11",
   "cloudBuild": {
     "buildNumber": {
       "enabled": true

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static void Fetch(Repository repository, string remote, IEnumerable<strin`
`75`	`75`	`fetchOptions.CustomHeaders = GitStrArrayManaged.BuildFrom(options.CustomHeaders);`
`76`	`76`	`}`
`77`	`77`
`78`		`- fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };`
	`78`	`+ fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
`79`	`79`
`80`	`80`	`Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan`
`118`	`118`	`using (RemoteHandle remoteHandle = BuildRemoteHandle(repository.Handle, url))`
`119`	`119`	`{`
`120`	`120`	`GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };`
`121`		`- GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1 };`
	`121`	`+ GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
`122`	`122`
`123`	`123`	`if (credentialsProvider != null)`
`124`	`124`	`{`
`@@ -375,7 +375,7 @@ public virtual void Push(Remote remote, IEnumerable<string> pushRefSpecs, PushOp`
`375`	`375`	`{`
`376`	`376`	`PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism,`
`377`	`377`	`RemoteCallbacks = gitCallbacks,`
`378`		`- ProxyOptions = new GitProxyOptions { Version = 1 },`
	`378`	`+ ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto },`
`379`	`379`	`});`
`380`	`380`	`}`
`381`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ private static RemoteHandle ConnectToAnonymousRemote(RepositoryHandle repository`
`720`	`720`	`RemoteHandle remoteHandle = Proxy.git_remote_create_anonymous(repositoryHandle, url);`
`721`	`721`
`722`	`722`	`var gitCallbacks = new GitRemoteCallbacks { version = 1 };`
`723`		`- var proxyOptions = new GitProxyOptions { Version = 1 };`
	`723`	`+ var proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
`724`	`724`
`725`	`725`	`if (credentialsProvider != null)`
`726`	`726`	`{`
`@@ -810,7 +810,7 @@ public static string Clone(string sourceUrl, string workdirPath,`
`810`	`810`	`var gitCheckoutOptions = checkoutOptionsWrapper.Options;`
`811`	`811`
`812`	`812`	`var gitFetchOptions = fetchOptionsWrapper.Options;`
`813`		`- gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };`
	`813`	`+ gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
`814`	`814`	`gitFetchOptions.RemoteCallbacks = new RemoteCallbacks(options).GenerateCallbacks();`
`815`	`815`	`if (options.FetchOptions != null && options.FetchOptions.CustomHeaders != null)`
`816`	`816`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "1.110.10",`
	`3`	`+ "version": "1.110.11",`
`4`	`4`	`"cloudBuild": {`
`5`	`5`	`"buildNumber": {`
`6`	`6`	`"enabled": true`