Merge branch 'develop' into stable

Author: Pathoschild

Client/Client.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;netstandard2.0;net452</TargetFrameworks>
     <AssemblyName>Pathoschild.Http.Client</AssemblyName>
     <RootNamespace>Pathoschild.Http.Client</RootNamespace>
     <PackageId>Pathoschild.Http.FluentClient</PackageId>
     <Title>FluentHttpClient</Title>
-    <Version>4.1.0</Version>
+    <Version>4.1.1</Version>
     <Authors>Pathoschild</Authors>
     <Description>A modern async HTTP client for REST APIs. Its fluent interface lets you send an HTTP request and parse the response in one go.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -22,12 +22,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net452' ">
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="WinInsider.System.Net.Http.Formatting" Version="1.0.14" />
   </ItemGroup>

Client/FluentClientExtensions.cs

@@ -186,8 +186,8 @@ public static IClient SetRequestCoordinator(this IClient client, IEnumerable<IRe
 
         /// <summary>Set default options for all requests.</summary>
         /// <param name="client">The client.</param>
-        /// <param name="ignoreHttpErrors">Whether to ignore null arguments when the request is dispatched (or <c>null</c> to leave the option unchanged).</param>
-        /// <param name="ignoreNullArguments">Whether HTTP error responses like HTTP 404 should be ignored; else raised as exceptions (or <c>null</c> to leave the option unchanged).</param>
+        /// <param name="ignoreHttpErrors">Whether HTTP error responses like HTTP 404 should be ignored; else raised as exceptions (or <c>null</c> to leave the option unchanged).</param>
+        /// <param name="ignoreNullArguments">Whether to ignore null arguments when the request is dispatched (or <c>null</c> to leave the option unchanged).</param>
         public static IClient SetOptions(this IClient client, bool? ignoreHttpErrors = null, bool? ignoreNullArguments = null)
         {
             return client.SetOptions(new FluentClientOptions
@@ -269,8 +269,8 @@ public static IRequest WithRequestCoordinator(this IRequest request, IEnumerable
 
         /// <summary>Set options for this request.</summary>
         /// <param name="request">The request.</param>
-        /// <param name="ignoreHttpErrors">Whether to ignore null arguments when the request is dispatched (or <c>null</c> to leave the option unchanged).</param>
-        /// <param name="ignoreNullArguments">Whether HTTP error responses like HTTP 404 should be ignored; else raised as exceptions (or <c>null</c> to leave the option unchanged).</param>
+        /// <param name="ignoreHttpErrors">Whether HTTP error responses like HTTP 404 should be ignored; else raised as exceptions (or <c>null</c> to leave the option unchanged).</param>
+        /// <param name="ignoreNullArguments">Whether to ignore null arguments when the request is dispatched (or <c>null</c> to leave the option unchanged).</param>
         public static IRequest WithOptions(this IRequest request, bool? ignoreHttpErrors = null, bool? ignoreNullArguments = null)
         {
             return request.WithOptions(new RequestOptions

README.md

@@ -46,7 +46,7 @@ The client works on most platforms (including Linux, Mac, and Windows):
 | :-------------------------- | :---------- |
 | .NET                        | 5.0         |
 | .NET Core                   | 1.0         |
-| .NET Framework              | 4.5         |
+| .NET Framework              | 4.5.2       |
 | [.NET Standard][]           | 1.3         |
 | Mono                        | 4.6         |
 | Unity                       | 2018.1      |

RELEASE-NOTES.md

@@ -1,4 +1,11 @@
 # Release notes
+## 4.1.1
+Released 22 June 2022.
+
+* Bumped min .NET Framework version from 4.5 to 4.5.2.
+* Updated to Json.Net 13.0.1.
+* Fixed IntelliSense docs for `With`/`SetOptions` (thanks to Jericho!).
+
 ## 4.1
 Released 11 March 2021.
 

Tests/Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net451</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net452</TargetFrameworks>
     <AssemblyName>Pathoschild.Http.Tests</AssemblyName>
     <RootNamespace>Pathoschild.Http.Tests</RootNamespace>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>