Merge pull request #3 from ShawnLaMountain/main

Now supporting .Net Standard v1.1 - v2.1

Author: ShawnLaMountain

.github/workflows/CD.yml

@@ -24,7 +24,7 @@ env:
 jobs:
   pack:
 
-    runs-on: [windows-latest]
+    runs-on: [windows-2019]
 
     steps:
     - name: Checkout

.github/workflows/CI.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   build:
 
-    runs-on: [windows-latest]
+    runs-on: [windows-2019]
 
     steps:
     - name: Checkout

README.md

@@ -3,7 +3,7 @@
 [![CD](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.HttpClientService/actions/workflows/CD.yml/badge.svg)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.HttpClientService/actions/workflows/CD.yml)
 [![Nuget](https://img.shields.io/nuget/v/ThunderDesign.Net-PCL.HttpClientService)](https://www.nuget.org/packages/ThunderDesign.Net-PCL.HttpClientService)
 [![License](https://img.shields.io/github/license/ThunderDesign/ThunderDesign.Net-PCL.HttpClientService)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.HttpClientService/blob/main/LICENSE)
-[![Net](https://img.shields.io/badge/.net%20standard-2.0-blue)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.HttpClientService/blob/main/README.md)
+[![Net](https://img.shields.io/badge/.net%20standard-v1.1%20--%20v2.1-blue)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.HttpClientService/blob/main/README.md)
 
 A wrapper around 'System.Net.Http.HttpClient' enhancing AutoRedirect and Cookies. Can be used in all application types.
 

src/ThunderDesign.Net-PCL.HttpClientService/Extentions/CookieContainerExtention.cs

@@ -20,8 +20,11 @@ static public void SetCookies(this CookieContainer cookieContainer, HttpHeaders
                 foreach (var value in header.Value)
                 {
                     var cookieCollection = ParseCookieString(value, defaultDomain);
-
+#if NETSTANDARD2_0 || NETSTANDARD2_1
                     cookieContainer.Add(cookieCollection);
+#else
+                    cookieContainer.Add(new Uri(defaultDomain), cookieCollection);
+#endif
                     handler?.Invoke(cookieContainer, new CookieContainerChangedEventArgs(cookieCollection));
                 }
             }
@@ -102,6 +105,6 @@ static private CookieCollection ParseCookieString(string cookieString, string de
             }
             return cookieCollection;
         }
-        #endregion
+#endregion
     }
 }

src/ThunderDesign.Net-PCL.HttpClientService/Http/HttpClientAutoRedirect.cs

@@ -49,6 +49,7 @@ public HttpClientAutoRedirect(HttpMessageHandler handler, bool disposeHandler) :
                 if (httpClientHandler.AllowAutoRedirect)
                     httpClientHandler.AllowAutoRedirect = false;
             }
+#if NETSTANDARD2_0 || NETSTANDARD2_1
             //using reflection to read property values
             else
             {
@@ -69,6 +70,7 @@ public HttpClientAutoRedirect(HttpMessageHandler handler, bool disposeHandler) :
                     //need to turn off AllowAutoRedirect since we are using our own
                     handler.GetType().GetProperty(nameof(ICustomHttpMessageHandler.AllowAutoRedirect)).SetValue(handler, false);
             }
+#endif
         }
         #endregion
 

src/ThunderDesign.Net-PCL.HttpClientService/ThunderDesign.Net-PCL.HttpClientService.csproj

@@ -1,12 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>ThunderDesign.Net_PCL.HttpClientService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.5" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFrameworks>netstandard1.1;netstandard2.0;net461</TargetFrameworks>
+		<RootNamespace>ThunderDesign.Net_PCL.HttpClientService</RootNamespace>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+	</PropertyGroup>
+	
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+		<DefineConstants>NETSTANDARD1_4</DefineConstants>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="..\..\README.md">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.6" />
+	</ItemGroup>
 
 </Project>