From 535a2cedc009d18c6c7e06ba5791bb2e0a610db8 Mon Sep 17 00:00:00 2001
From: Alex Macocian <amacocian@yahoo.com>
Date: Fri, 6 Sep 2024 23:44:27 +0200
Subject: [PATCH] Argument to dispose inner http client

---
 .../SystemExtensions.NetCore.csproj           |  2 +-
 .../Http/HttpClient.cs                        | 21 ++++++++++++++-----
 .../SystemExtensions.NetStandard.csproj       |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/SystemExtensions.NetCore/SystemExtensions.NetCore.csproj b/SystemExtensions.NetCore/SystemExtensions.NetCore.csproj
index 8238e34..ebc91b2 100644
--- a/SystemExtensions.NetCore/SystemExtensions.NetCore.csproj
+++ b/SystemExtensions.NetCore/SystemExtensions.NetCore.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>System</RootNamespace>
 	  <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-	  <Version>1.6.6</Version>
+	  <Version>1.6.7</Version>
 	  <Authors>Alexandru Macocian</Authors>
 	  <RepositoryUrl>https://github.com/AlexMacocian/SystemExtensions</RepositoryUrl>
 	  <Description>Extensions for the System namespace</Description>
diff --git a/SystemExtensions.NetStandard/Http/HttpClient.cs b/SystemExtensions.NetStandard/Http/HttpClient.cs
index 8bbc872..142d585 100644
--- a/SystemExtensions.NetStandard/Http/HttpClient.cs
+++ b/SystemExtensions.NetStandard/Http/HttpClient.cs
@@ -8,6 +8,7 @@ namespace System.Net.Http;
 
 public sealed class HttpClient<Tscope> : IHttpClient<Tscope>, IDisposable
 {
+    private readonly bool disposeInnerClient = true;
     private readonly HttpClient httpClient;
     private readonly Type scope;
     private EventHandler<HttpClientEventMessage> eventEmitted;
@@ -31,9 +32,10 @@ public sealed class HttpClient<Tscope> : IHttpClient<Tscope>, IDisposable
     public TimeSpan Timeout { get => this.httpClient.Timeout; set => this.httpClient.Timeout = value; }
 
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-    public HttpClient()
+    public HttpClient(bool disposeInnerClient = true)
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
+        this.disposeInnerClient = disposeInnerClient;
         this.httpClient = new HttpClient();
         this.scope = typeof(Tscope);
     }
@@ -41,8 +43,10 @@ public sealed class HttpClient<Tscope> : IHttpClient<Tscope>, IDisposable
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public HttpClient(
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-        HttpMessageHandler handler)
+        HttpMessageHandler handler,
+        bool disposeInnerClient = true)
     {
+        this.disposeInnerClient = disposeInnerClient;
         this.httpClient = new HttpClient(handler);
         this.scope = typeof(Tscope);
     }
@@ -51,8 +55,10 @@ public sealed class HttpClient<Tscope> : IHttpClient<Tscope>, IDisposable
     public HttpClient(
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         HttpMessageHandler handler,
-        bool disposeHandler)
+        bool disposeHandler,
+        bool disposeInnerClient = true)
     {
+        this.disposeInnerClient = disposeInnerClient;
         this.httpClient = new HttpClient(handler, disposeHandler);
         this.scope = typeof(Tscope);
     }
@@ -60,8 +66,10 @@ public sealed class HttpClient<Tscope> : IHttpClient<Tscope>, IDisposable
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public HttpClient(
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-        HttpClient httpClient)
+        HttpClient httpClient,
+        bool disposeInnerClient = true)
     {
+        this.disposeInnerClient = disposeInnerClient;
         this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
         this.scope = typeof(Tscope);
     }
@@ -223,7 +231,10 @@ public sealed class HttpClient<Tscope> : IHttpClient<Tscope>, IDisposable
     }
     public void Dispose()
     {
-        this.httpClient.Dispose();
+        if (this.disposeInnerClient)
+        {
+            this.httpClient.Dispose();
+        }
     }
 
     private void LogInformation(string url, string method)
diff --git a/SystemExtensions.NetStandard/SystemExtensions.NetStandard.csproj b/SystemExtensions.NetStandard/SystemExtensions.NetStandard.csproj
index 40dd059..0347364 100644
--- a/SystemExtensions.NetStandard/SystemExtensions.NetStandard.csproj
+++ b/SystemExtensions.NetStandard/SystemExtensions.NetStandard.csproj
@@ -7,7 +7,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RootNamespace>System</RootNamespace>
-    <Version>1.6.6</Version>
+    <Version>1.6.7</Version>
     <Authors>Alexandru Macocian</Authors>
     <RepositoryUrl>https://github.com/AlexMacocian/SystemExtensions</RepositoryUrl>
     <Description>Extensions for the System namespace</Description>