Skip to content

Commit 501fe2a

Browse files
committed
Merge branch 'SebastianGrief-add_proxy_guard' into dev
2 parents 4576521 + 60ee82f commit 501fe2a

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

benchmarks/RestSharp.Benchmarks/RestSharp.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="AutoFixture" Version="4.17.0" />
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\..\src\RestSharp.Serializers.NewtonsoftJson\RestSharp.Serializers.NewtonsoftJson.csproj" />

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
22-
<PackageReference Include="MinVer" Version="4.1.0" PrivateAssets="All"/>
22+
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All"/>
2323
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All"/>
2424
</ItemGroup>
2525
<ItemGroup>

src/RestSharp/RestClient.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ void ConfigureHttpMessageHandler(HttpClientHandler handler) {
139139
handler.AutomaticDecompression = Options.AutomaticDecompression;
140140
handler.PreAuthenticate = Options.PreAuthenticate;
141141
handler.AllowAutoRedirect = Options.FollowRedirects;
142-
handler.Proxy = Options.Proxy;
142+
143+
if (handler.SupportsProxy)
144+
handler.Proxy = Options.Proxy;
143145

144146
if (Options.RemoteCertificateValidationCallback != null)
145147
handler.ServerCertificateCustomValidationCallback =

test/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup Condition="$(IsTestProject) == 'true'">
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0"/>
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1"/>
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All"/>
1313
<PackageReference Include="coverlet.collector" Version="3.1.2"/>
1414
</ItemGroup>
@@ -18,7 +18,7 @@
1818
<PackageReference Include="FluentAssertions" Version="6.7.0"/>
1919
</ItemGroup>
2020
<ItemGroup Condition="$(TargetFramework) == 'net472'">
21-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2" PrivateAssets="All"/>
21+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" PrivateAssets="All"/>
2222
</ItemGroup>
2323

2424
<ItemGroup>

0 commit comments

Comments
 (0)