Add net6.0 compatibility

ProphetLamb · Oct 14, 2023 · 67d052b · 67d052b
1 parent 97a0078
commit 67d052b
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 17 deletions.
diff --git a/examples/RedditDotnetScraper/RedditDotnetScraper.csproj b/examples/RedditDotnetScraper/RedditDotnetScraper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/src/ScrapeAAS.AngleSharp/ScrapeAAS.AngleSharp.csproj b/src/ScrapeAAS.AngleSharp/ScrapeAAS.AngleSharp.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
 
     <RootNamespace>ScrapeAAS</RootNamespace>
   </PropertyGroup>

diff --git a/src/ScrapeAAS.Contracts/ScrapeAAS.Contracts.csproj b/src/ScrapeAAS.Contracts/ScrapeAAS.Contracts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
 
     <RootNamespace>ScrapeAAS</RootNamespace>
   </PropertyGroup>

diff --git a/src/ScrapeAAS.HttpClient/ScrapeAAS.HttpClient.csproj b/src/ScrapeAAS.HttpClient/ScrapeAAS.HttpClient.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ScrapeAAS.InMemory/ScrapeAAS.InMemory.csproj b/src/ScrapeAAS.InMemory/ScrapeAAS.InMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
 
     <RootNamespace>ScrapeAAS</RootNamespace>
   </PropertyGroup>

diff --git a/src/ScrapeAAS.MessagePipe/ScrapeAAS.MessagePipe.csproj b/src/ScrapeAAS.MessagePipe/ScrapeAAS.MessagePipe.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
 
     <RootNamespace>ScrapeAAS</RootNamespace>
   </PropertyGroup>

diff --git a/src/ScrapeAAS.Polly/ScrapeAAS.Polly.csproj b/src/ScrapeAAS.Polly/ScrapeAAS.Polly.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ScrapeAAS.PuppeteerSharp/PuppeteerPageLoader.cs b/src/ScrapeAAS.PuppeteerSharp/PuppeteerPageLoader.cs
@@ -238,8 +238,13 @@ public ValueTask<IPage> GetPageAsync(CancellationToken cancellationToken = defau
 
     private void CheckDisposedOrStarted()
     {
+#if NET7_0_OR_GREATER
         ObjectDisposedException.ThrowIf(_disposed, this);
-
+#else
+        if (_disposed) {
+            throw new ObjectDisposedException(this.GetType().FullName);
+        }
+#endif
         if (_operationStarted)
         {
             throw new InvalidOperationException("The handler has already started one or more requests. Properties can only be modified before sending the first request.");
@@ -249,7 +254,13 @@ private void CheckDisposedOrStarted()
     [MemberNotNull(nameof(_innerHandler))]
     private void SetOperationStarted()
     {
+#if NET7_0_OR_GREATER
         ObjectDisposedException.ThrowIf(_disposed, this);
+#else
+        if (_disposed) {
+            throw new ObjectDisposedException(this.GetType().FullName);
+        }
+#endif
 
         if (_innerHandler is null)
         {

diff --git a/src/ScrapeAAS.PuppeteerSharp/ScrapeAAS.PuppeteerSharp.csproj b/src/ScrapeAAS.PuppeteerSharp/ScrapeAAS.PuppeteerSharp.csproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ScrapeAAS.WebShare/ScrapeAAS.WebShare.csproj b/src/ScrapeAAS.WebShare/ScrapeAAS.WebShare.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
 
     <RootNamespace>ScrapeAAS</RootNamespace>
   </PropertyGroup>

diff --git a/src/ScrapeAAS/ScrapeAAS.csproj b/src/ScrapeAAS/ScrapeAAS.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
   </PropertyGroup>
 
 

diff --git a/test/ScrapeAAS.MessagePipe.Tests/ScrapeAAS.MessagePipe.Tests.csproj b/test/ScrapeAAS.MessagePipe.Tests/ScrapeAAS.MessagePipe.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -22,8 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\ScrapeAAS.MessagePipe\ScrapeAAS.MessagePipe.csproj" />
-    <ProjectReference Include="..\..\src\ScrapeAAS.InMemory\ScrapeAAS.InMemory.csproj" />
+    <ProjectReference Include="..\..\src\ScrapeAAS\ScrapeAAS.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/ScrapeAAS.PuppeteerSharp.Tests/ScrapeAAS.PuppeteerSharp.Tests.csproj b/test/ScrapeAAS.PuppeteerSharp.Tests/ScrapeAAS.PuppeteerSharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -21,8 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\ScrapeAAS.PuppeteerSharp\ScrapeAAS.PuppeteerSharp.csproj" />
-    <ProjectReference Include="..\..\src\ScrapeAAS.InMemory\ScrapeAAS.InMemory.csproj" />
+    <ProjectReference Include="..\..\src\ScrapeAAS\ScrapeAAS.csproj" />
   </ItemGroup>
 
 </Project>