Removal of dotnet6 (#287)

* Remove .NET 6 support

* Update nuget packages

* revert build machine

* Fix warnings

* Update codeql yaml and dependabot config

Author: dnperfors

.config/dotnet-tools.json

@@ -3,18 +3,18 @@
   "isRoot": true,
   "tools": {
     "dotnet-sonarscanner": {
-      "version": "9.0.0",
+      "version": "9.0.2",
       "commands": [
         "dotnet-sonarscanner"
       ],
       "rollForward": false
     },
     "nbgv": {
-      "version": "3.6.143",
+      "version": "3.7.112",
       "commands": [
         "nbgv"
       ],
       "rollForward": false
     }
   }
-}
+}

.github/dependabot.yaml

@@ -11,7 +11,7 @@ updates:
   reviewers:
   - "dnperfors"
 - package-ecosystem: "github-actions"
-  directory: ".github/"
+  directory: "/"
   schedule:
     interval: "daily"
   reviewers:

.github/workflows/ci.yml

@@ -27,10 +27,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
           9.0.x
-        include-prerelease: true
     - name: Dump .NET info
       run: dotnet --info
     - name: Restore dotnet tools
@@ -45,7 +43,7 @@ jobs:
     - name: Build source code
       run: dotnet build --configuration Release --no-restore
     - name: Test with dotnet
-      run: dotnet test --configuration Release --no-build --collect="Code Coverage" --framework="net6.0"
+      run: dotnet test --configuration Release --no-build --collect="Code Coverage" --framework="net8.0"
     - name: Upload sonarqube results
       if: ${{ github.actor != 'dependabot[bot]' }}
       env:
@@ -69,7 +67,7 @@ jobs:
   testOnSupportedDotnetVersions:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
@@ -80,10 +78,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
           9.0.x
-        include-prerelease: true
     - name: Dump .NET info
       run: dotnet --info
     - name: Restore dependencies
@@ -105,7 +101,6 @@ jobs:
       with:
         dotnet-version: |
           9.0.x
-        include-prerelease: true
     - uses: actions/download-artifact@v4
       with:
         name: artifacts

.github/workflows/codeql.yml

@@ -19,24 +19,22 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Fetch all history for all tags and branches
       run: git fetch --prune --unshallow
     - name: Setup .NET versions
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
           9.0.x
-        include-prerelease: true
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         queries: security-and-quality
         languages: csharp
         config-file: ./.github/codeql-config.yml
     - name: Build source code
       run: dotnet build --configuration Release --framework net8.0
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [0.12] - unplanned
+### Removed
+- .NET 6.0 target, since it is no longer supported
 ### Added
 - Support for .NET 9.0
 

src/TestableHttpClient/TestableHttpClient.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,7 +24,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <DebugType>full</DebugType>
-    
+
     <IncludeSource>true</IncludeSource>
     <RepositoryUrl>https://github.com/testablehttpclient/TestableHttpClient</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -39,16 +39,12 @@
     <PackageReference Include="PolyKit.Embedded" Version="3.0.9" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Perfors.UnreachableException" Version="1.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

test/Directory.Build.targets

@@ -1,8 +1,7 @@
 <Project>
   <ItemGroup>
-    <!-- <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" /> -->
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj

@@ -1,19 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net47;net48;net6.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net462;net47;net48;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Net.Http.Json" Version="[8.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)" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[6.0.*,7.0.0)" />
-  </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0.*,9.0.0)" />

test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net47;net48;net6.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net462;net47;net48;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.2" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>