8000 Merge pull request #5 from UiPath/proxy_options_initializing · UiPath/libgit2sharp@1873544 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1873544

Browse files
andrei-balintandrei-balint
authored
Merge pull request #5 from UiPath/proxy_options_initializing
Proxy options initializing UI-30214
2 parents fb9bb5d + ffd2dda commit 1873544

File tree

6 files changed

+21
-7
lines changed

6 files changed

+21
-7
lines changed

‎LibGit2Sharp/Commands/Fetch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static void Fetch(Repository repository, string remote, IEnumerable<strin
7575
fetchOptions.CustomHeaders = GitStrArrayManaged.BuildFrom(options.CustomHeaders);
7676
}
7777

78-
fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
78+
fetchOptions.ProxyOptions = GitProxyOptionsFactory.CreateDefaultProxyOptions();
7979

8080
Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage);
8181
}

‎LibGit2Sharp/Core/GitProxyOptions.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,16 @@ internal struct GitProxyOptions
2020
public IntPtr CertificateCheck;
2121
public IntPtr CbPayload;
2222
}
23+
24+
internal static class GitProxyOptionsFactory
25+
{
26+
public static GitProxyOptions CreateDefaultProxyOptions()
27+
{
28+
return new GitProxyOptions
29+
{
30+
Version = 1,
31+
Type = GitProxyType.Auto
32+
};
33+
}
34+
}
2335
}

‎LibGit2Sharp/LibGit2Sharp.csproj

Lines 8000 changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="LibGit2Sharp.NativeBinaries.UiPath" Version="0.28.3" PrivateAssets="none" />
33+
<PackageReference Include="LibGit2Sharp.NativeBinaries.UiPath" Version="0.28.4" PrivateAssets="none" />
3434
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="all" />
3535
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
3636
</ItemGroup>

‎LibGit2Sharp/Network.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan
118118
using (RemoteHandle remoteHandle = BuildRemoteHandle(repository.Handle, url))
119119
{
120120
GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };
121-
GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1 };
121+
GitProxyOptions proxyOptions = GitProxyOptionsFactory.CreateDefaultProxyOptions();
122122

123123
if (credentialsProvider != null)
124124
{
@@ -375,7 +375,7 @@ public virtual void Push(Remote remote, IEnumerable<string> pushRefSpecs, PushOp
375375
{
376376
PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism,
377377
RemoteCallbacks = gitCallbacks,
378-
ProxyOptions = new GitProxyOptions { Version = 1 },
378+
ProxyOptions = GitProxyOptionsFactory.CreateDefaultProxyOptions()
379379
});
380380
}
381381
}

‎LibGit2Sharp/Repository.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential
678678
using (RemoteHandle remoteHandle = Proxy.git_remote_create_anonymous(repositoryHandle, url))
679679
{
680680
var gitCallbacks = new GitRemoteCallbacks { version = 1 };
681-
var proxyOptions = new GitProxyOptions { Version = 1 };
681+
var proxyOptions = GitProxyOptionsFactory.CreateDefaultProxyOptions();
682682

683683
if (credentialsProvider != null)
684684
{
@@ -768,7 +768,7 @@ public static string Clone(string sourceUrl, string workdirPath,
768768
var gitCheckoutOptions = checkoutOptionsWrapper.Options;
769769

770770
var gitFetchOptions = fetchOptionsWrapper.Options;
771-
gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
771+
gitFetchOptions.ProxyOptions = GitProxyOptionsFactory.CreateDefaultProxyOptions();
772772
gitFetchOptions.RemoteCallbacks = new RemoteCallbacks(options).GenerateCallbacks();
773773
if (options.FetchOptions != null && options.FetchOptions.CustomHeaders != null)
774774
{

‎LibGit2Sharp/SubmoduleCollection.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,13 @@ public virtual void Update(string name, SubmoduleUpdateOptions options)
100100
var remoteCallbacks = new RemoteCallbacks(options);
101101
var gitRemoteCallbacks = remoteCallbacks.GenerateCallbacks();
102102

103+
var proxyOptions = GitProxyOptionsFactory.CreateDefaultProxyOptions();
104+
103105
var gitSubmoduleUpdateOpts = new GitSubmoduleUpdateOptions
104106
{
105107
Version = 1,
106108
CheckoutOptions = gitCheckoutOptions,
107-
FetchOptions = new GitFetchOptions { ProxyOptions = new GitProxyOptions { Version = 1 }, RemoteCallbacks = gitRemoteCallbacks },
109+
FetchOptions = new GitFetchOptions { ProxyOptions = proxyOptions, RemoteCallbacks = gitRemoteCallbacks },
108110
CloneCheckoutStrategy = CheckoutStrategy.GIT_CHECKOUT_SAFE
109111
};
110112

0 commit comments

Comments
 (0)
0