Merge branch 'release/2.0.2'

Author: Jaben

README.md

@@ -1,12 +1,13 @@
-⭐ For Gotenberg v7+. Beta⭐
-
 # <img src="https://github.com/ChangemakerStudios/GotenbergSharpApiClient/raw/master/lib/Resources/gotenbergSharpClient.PNG" width="24" height="24" /> Gotenberg.Sharp.Api.Client
 
-[![NuGet version](https://badge.fury.io/nu/Gotenberg.Sharp.Api.Client.svg)](https://badge.fury.io/nu/Gotenberg.Sharp.Api.Client) [![Build status](https://ci.appveyor.com/api/projects/status/s8lvj93xewlsylxh?svg=true)](https://ci.appveyor.com/project/Jaben/gotenbergsharpapiclient) [![Downloads](https://img.shields.io/nuget/dt/Gotenberg.Sharp.API.Client.svg?logo=nuget&color=purple)](https://www.nuget.org/packages/Gotenberg.Sharp.API.Client) 
+[![NuGet version](https://badge.fury.io/nu/Gotenberg.Sharp.Api.Client.svg)](https://badge.fury.io/nu/Gotenberg.Sharp.Api.Client)
+[![Downloads](https://img.shields.io/nuget/dt/Gotenberg.Sharp.API.Client.svg?logo=nuget&color=purple)](https://www.nuget.org/packages/Gotenberg.Sharp.API.Client) 
+![Build status](https://github.com/ChangemakerStudios/GotenbergSharpApiClient/actions/workflows/deploy.yml/badge.svg)
+
+⭐ For Gotenberg v7+.⭐
 
-.NET C# Client for interacting with the [Gotenberg](https://gotenberg.dev/) micro-service's API. [Gotenberg](https://github.com/gotenberg/gotenberg) is a [Docker-powered stateless API](https://hub.docker.com/r/gotenberg/gotenberg/) for converting & merging HTML, Markdown and Office documents to PDF. The client supports a configurable [Polly](http://www.thepollyproject.org/) **retry policy** with exponential backoff for handling transient exceptions.
+.NET C# Client for interacting with the [Gotenberg](https://gotenberg.dev/) v7 micro-service's API. [Gotenberg](https://github.com/gotenberg/gotenberg) is a [Docker-powered stateless API](https://hub.docker.com/r/gotenberg/gotenberg/) for converting & merging HTML, Markdown and Office documents to PDF. The client supports a configurable [Polly](http://www.thepollyproject.org/) **retry policy** with exponential backoff for handling transient exceptions.
 
-*As of version [2.0.0-alpha0002](https://www.nuget.org/packages/Gotenberg.Sharp.API.Client/2.0.0-alpha0002#supportedframeworks-tab) Gotenberg.Sharp.API.Client targets net6.0, net5.0; netstandard 2.0 and 2.1* 
 
 # Getting Started
 *Pull the image from dockerhub.com*
@@ -17,11 +18,15 @@
 ```powershell
 docker run --name gotenbee7x --rm -p 3000:3000 gotenberg/gotenberg:latest gotenberg --api-timeout=1800s --log-level=debug
 ```
+
 # .NET Core Project Setup
 *Install nuget package into your project*
 ```powershell
 PM> Install-Package Gotenberg.Sharp.Api.Client
 ```
+
+*Note: Use v1.x nugets for Gotenberg v6.*
+
 ## AppSettings
 ```json
   "GotenbergSharpClient": {

lib/Gotenberg.Sharp.Api.Client.csproj

@@ -23,7 +23,7 @@
     </Description>
     <IncludeSymbols>True</IncludeSymbols>
     <PackageReleaseNotes>
-      Upgraded to support Gotenberg v7.
+      Upgraded to support Gotenberg v7 -- this version no longer works with Gotenberg v6.
     </PackageReleaseNotes>    
     <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/ChangemakerStudios/GotenbergSharpApiClient</PackageProjectUrl>
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
     <PackageReference Include="MimeMapping" Version="1.0.1.37" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

lib/GotenbergSharpClient.cs

@@ -132,13 +132,20 @@ public async Task FireWebhookAndForgetAsync(IApiRequest request, CancellationTok
         async Task<Stream> ExecuteRequestAsync(IApiRequest request, CancellationToken cancelToken)
         {
             if (request == null) throw new ArgumentNullException(nameof(request));
-            var response = await SendRequest(request, HttpCompletionOption.ResponseHeadersRead, cancelToken);
 
-            #if NET5_0_OR_GREATER
-                return await response.Content.ReadAsStreamAsync(cancelToken);
-            #else
-                return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            #endif
+            using var response = await this.SendRequest(request, HttpCompletionOption.ResponseHeadersRead, cancelToken);
+
+            var ms = new MemoryStream();
+
+#if NET5_0_OR_GREATER
+            await response.Content.CopyToAsync(ms, cancelToken);
+#else
+            await response.Content.CopyToAsync(ms).ConfigureAwait(false);
+#endif
+
+            ms.Position = 0;
+
+            return ms;
         }
 
         async Task<HttpResponseMessage> SendRequest(