test: replace .NET Core 3.1 with .NET 4.6.2 to avoid EOL warnings/tes…

…t failures in CI
skwasjer · Dec 15, 2024 · 306507a · 306507a
1 parent 6407054
commit 306507a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git 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;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0;net462</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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0;net462</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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0;net462</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
@@ -14,7 +14,7 @@
     <Serilog_Extensions_Logging>3.1.0</Serilog_Extensions_Logging>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2')) Or '$(TargetFramework)'=='netcoreapp3.1'">
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2')) Or '$(TargetFramework)'=='net462'">
     <Serilog_Extensions_Logging>3.1.0</Serilog_Extensions_Logging>
   </PropertyGroup>
 

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -9,6 +9,7 @@
     <Using Include="FluentAssertions" />
     <Using Include="NSubstitute" />
     <Using Include="Xunit" />
+    <Using Include="System.Net.Http" />
   </ItemGroup>
 
   <ItemGroup>