From 6e7bdab66580b94b5d013041305b8a05b44be2e4 Mon Sep 17 00:00:00 2001
From: skwasjer <11424653+skwasjer@users.noreply.github.com>
Date: Fri, 17 Nov 2023 23:45:09 +0100
Subject: [PATCH] test: replace .NET Core 3.1 with .NET 6.0 (testing our
 runtime .NET Standard 2.0 packages) to avoid EOL warnings/test failures in CI

---
 test/Correlate.Core.Tests/Correlate.Core.Tests.csproj         | 2 +-
 .../Correlate.DependencyInjection.Tests.csproj                | 2 +-
 .../IHttpClientBuilderExtensionsTests.cs                      | 4 ----
 test/Correlate.Testing/Correlate.Testing.csproj               | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj b/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj
index 8562823..af6df51 100644
--- a/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj
+++ b/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <RootNamespace>Correlate</RootNamespace>
diff --git a/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj b/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj
index 479e78f..a87a19b 100644
--- a/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj
+++ b/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <RootNamespace>Correlate.DependencyInjection</RootNamespace>
diff --git a/test/Correlate.DependencyInjection.Tests/IHttpClientBuilderExtensionsTests.cs b/test/Correlate.DependencyInjection.Tests/IHttpClientBuilderExtensionsTests.cs
index 8051e8e..2d9d0a7 100644
--- a/test/Correlate.DependencyInjection.Tests/IHttpClientBuilderExtensionsTests.cs
+++ b/test/Correlate.DependencyInjection.Tests/IHttpClientBuilderExtensionsTests.cs
@@ -60,11 +60,7 @@ protected override IEnumerable<ExpectedRegistration> TestCases()
 
             // AddHttpMessageHandler with options:
             yield return new ExpectedRegistration<IConfigureOptions<CorrelateClientOptions>, ConfigureNamedOptions<CorrelateClientOptions>>(ServiceLifetime.Singleton);
-#if NETCOREAPP3_1_OR_GREATER
             yield return new ExpectedRegistration<IConfigureOptions<HttpClientFactoryOptions>>(ServiceLifetime.Singleton);
-#else
-				yield return new ExpectedRegistration<IConfigureOptions<HttpClientFactoryOptions>>(ServiceLifetime.Transient);
-#endif
             yield return new ExpectedRegistration<MyService>(ServiceLifetime.Transient);
         }
     }
diff --git a/test/Correlate.Testing/Correlate.Testing.csproj b/test/Correlate.Testing/Correlate.Testing.csproj
index c4be9b5..f4dc285 100644
--- a/test/Correlate.Testing/Correlate.Testing.csproj
+++ b/test/Correlate.Testing/Correlate.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
@@ -10,7 +10,7 @@
     <Serilog_Extensions_Logging>8.0.0</Serilog_Extensions_Logging>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2')) Or '$(TargetFramework)'=='netcoreapp3.1'">
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2')) Or '$(TargetFramework)'=='net6.0'">
     <Serilog_Extensions_Logging>3.1.0</Serilog_Extensions_Logging>
   </PropertyGroup>