Remove support for .NET Core 3.1 (#185)

dnperfors · web-flow · commit c9d562bdb34e · 2022-11-09T20:47:02.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          3.1.x
           6.0.x
           7.0.x
     - name: Dump .NET info
@@ -77,9 +76,8 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          3.1
-          6.0
-          7.0
+          6.0.x
+          7.0.x
     - name: Dump .NET info
       run: dotnet --info
     - name: Restore dependencies
@@ -100,7 +98,7 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          7.0
+          7.0.x
     - uses: actions/download-artifact@v2
       with:
         name: artifacts
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -26,15 +26,14 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          3.1
-          6.0
-          7.0
+          6.0.x
+          7.0.x
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         queries: security-and-quality
         languages: csharp
     - name: Build source code
-      run: dotnet build --configuration Release
+      run: dotnet build --configuration Release --framework net6.0
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to TestableHttpClient will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and 
 this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.9] - unplanned
+### Removed
+- Official support for .NET Core 3.1 has been removed. This means we no longer provide a specific version for .NET Core 3.0 and we no longer test this version explicitly. Since we support .NET Standard 2.0, the library could still be used.
+
 ## [0.8] - 2022-11-08
 ### Deprecated
 - `TestableHttpMessageHandler.SimulateTimeout` is deprecated, and can be replaced with `RespondWith(Responses.Timeout())`.
diff --git a/README.md b/README.md
@@ -60,7 +60,6 @@ TestableHttpClient is build as a netstandard2.0 library, so theoretically it can
 The following versions are being actively tested and thus supported:
 
 - .NET Framework 4.6 and up
-- .NET Core 3.1
 - .NET 6.0
 - .NET 7.0
 
diff --git a/src/TestableHttpClient.NFluent/TestableHttpClient.NFluent.csproj b/src/TestableHttpClient.NFluent/TestableHttpClient.NFluent.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
 
     <Description>NFluent checks for checking HttpResponseMessages.</Description>
     <PackageTags>httpclient;unittesting;dotnet;nfluent</PackageTags>
diff --git a/src/TestableHttpClient/TestableHttpClient.csproj b/src/TestableHttpClient/TestableHttpClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
 
     <Description>A simple library to make testing HttpClient and related classes easier.</Description>
     <PackageTags>httpclient;unittesting;dotnet;mock</PackageTags>
diff --git a/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj b/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj
@@ -1,20 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net47;net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;net47;net48;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="System.Net.Http.Json" Version="[3.1.*,5.0.0)" />
   </ItemGroup>
   
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[3.1.*,5.0.0)" />
-    <PackageReference Include="System.Net.Http.Json" Version="[3.1.*,5.0.0)" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="[3.1.*,5.0.0)" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[3.1.*,5.0.0)" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.*,7.0.0)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="[6.0.*,7.0.0)" />
diff --git a/test/TestableHttpClient.IntegrationTests/TestingRetryMechanisms.cs b/test/TestableHttpClient.IntegrationTests/TestingRetryMechanisms.cs
@@ -1,4 +1,4 @@
-﻿#if NETCOREAPP || NET
+﻿#if NET
 using Microsoft.Extensions.Http;
 
 using Polly;
diff --git a/test/TestableHttpClient.IntegrationTests/UsingIHttpClientFactory.cs b/test/TestableHttpClient.IntegrationTests/UsingIHttpClientFactory.cs
@@ -1,4 +1,4 @@
-﻿#if NETCOREAPP || NET
+﻿#if NET
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
diff --git a/test/TestableHttpClient.NFluent.Tests/TestableHttpClient.NFluent.Tests.csproj b/test/TestableHttpClient.NFluent.Tests/TestableHttpClient.NFluent.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net47;net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;net47;net48;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj b/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net47;net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;net47;net48;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,8 +17,4 @@
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.8",
+  "version": "0.9-beta",
   "versionHeightOffset": -1,
   "publicReleaseRefSpec": [
     "^refs/tags/v\\d+(?:\\.\\d+)?$"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NETCOREAPP \|\| NET`
	`1`	`+#if NET`
`2`	`2`	`using Microsoft.Extensions.Http;`
`3`	`3`
`4`	`4`	`using Polly;`