chore: remove .NET 7 because it is EOL

skwasjer · Sep 5, 2024 · 7af7e7f · 7af7e7f
1 parent de01038
commit 7af7e7f
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 20 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,6 @@ env:
   DOTNET_NOLOGO: true
   dotnet-version: |
     8.0.x
-    7.0.x
     6.0.x
     5.0.x
     3.1.x

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,6 @@ env:
   DOTNET_NOLOGO: true
   dotnet-version: |
     8.0.x
-    7.0.x
     6.0.x
     5.0.x
     3.1.x

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -14,7 +14,6 @@ env:
   DOTNET_NOLOGO: true
   dotnet-version: |
     8.0.x
-    7.0.x
     6.0.x
     5.0.x
     3.1.x

diff --git a/src/MockHttp.Json/MockHttp.Json.csproj b/src/MockHttp.Json/MockHttp.Json.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0;net48;net472;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.1;netstandard2.0;net48;net472;net462</TargetFrameworks>
     <PackageId>skwas.MockHttp.Json</PackageId>
     <AssemblyName>skwas.MockHttp.Json</AssemblyName>
   </PropertyGroup>

diff --git a/src/MockHttp.Server/MockHttp.Server.csproj b/src/MockHttp.Server/MockHttp.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
     <PackageId>skwas.MockHttp.Server</PackageId>
     <AssemblyName>skwas.MockHttp.Server</AssemblyName>
     <RootNamespace>MockHttp</RootNamespace>

diff --git a/src/MockHttp/Matchers/Patterns/RegexPatternMatcher.cs b/src/MockHttp/Matchers/Patterns/RegexPatternMatcher.cs
@@ -7,7 +7,7 @@ internal class RegexPatternMatcher : PatternMatcher
 {
     public RegexPatternMatcher
     (
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
         [StringSyntax(StringSyntaxAttribute.Regex)]
 #endif
         string regex

diff --git a/src/MockHttp/MockHttp.csproj b/src/MockHttp/MockHttp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0;net48;net472;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.1;netstandard2.0;net48;net472;net462</TargetFrameworks>
     <PackageId>skwas.MockHttp</PackageId>
     <AssemblyName>skwas.MockHttp</AssemblyName>
   </PropertyGroup>

diff --git a/test/MockHttp.Json.Tests/MockHttp.Json.Tests.csproj b/test/MockHttp.Json.Tests/MockHttp.Json.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
 
     <IsTestProject>true</IsTestProject>
 

diff --git a/test/MockHttp.Server.Tests/MockHttp.Server.Tests.csproj b/test/MockHttp.Server.Tests/MockHttp.Server.Tests.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
 
     <IsTestProject>true</IsTestProject>
 
     <RootNamespace>MockHttp</RootNamespace>
     <SerilogExtensionsLoggingVersion>8.0.0</SerilogExtensionsLoggingVersion>
-    <SerilogExtensionsLoggingVersion Condition="$(TargetFramework)=='net7.0'">7.0.0</SerilogExtensionsLoggingVersion>
     <SerilogExtensionsLoggingVersion Condition="$(TargetFramework)=='net6.0' Or $(TargetFramework)=='netcoreapp3.1'">3.1.0</SerilogExtensionsLoggingVersion>
   </PropertyGroup>
 

diff --git a/test/MockHttp.Testing/MockHttp.Testing.csproj b/test/MockHttp.Testing/MockHttp.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
 
     <IsTestProject>false</IsTestProject>
 

diff --git a/test/MockHttp.Tests/Http/HttpHeadersCollectionTests.cs b/test/MockHttp.Tests/Http/HttpHeadersCollectionTests.cs
@@ -50,20 +50,13 @@ public void Given_single_header_string_when_parsing_should_return_key_with_one_o
     [InlineData("no-separator", "The value cannot be null or empty.*")]
 #if NET8_0_OR_GREATER
     [InlineData(":value", "The value cannot be an empty string or composed entirely of whitespace.*")]
-#else
-    [InlineData(":value", "The value cannot be null or empty.*")]
-#endif
-#if NET7_0_OR_GREATER
-#if NET8_0_OR_GREATER
     [InlineData(" :value", "The value cannot be an empty string or composed entirely of whitespace.*")]
-#else
-    [InlineData(" :value", "The header name ' ' has an invalid format.")]
-#endif
     [InlineData(" leading-whitespace-not-allowed:value", "The header name ' leading-whitespace-not-allowed' has an invalid format.")]
     [InlineData("\tleading-whitespace-not-allowed:value", "The header name '\tleading-whitespace-not-allowed' has an invalid format.")]
     [InlineData("trailing-whitespace-not-allowed :value", "The header name 'trailing-whitespace-not-allowed ' has an invalid format.")]
     [InlineData("trailing-whitespace-not-allowed\t:value", "The header name 'trailing-whitespace-not-allowed\t' has an invalid format.")]
 #else
+    [InlineData(":value", "The value cannot be null or empty.*")]
     [InlineData(" :value", "The header name format is invalid.")]
     [InlineData(" leading-whitespace-not-allowed:value", "The header name format is invalid.")]
     [InlineData("\tleading-whitespace-not-allowed:value", "The header name format is invalid.")]

diff --git a/test/MockHttp.Tests/MockHttp.Tests.csproj b/test/MockHttp.Tests/MockHttp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
 
     <IsTestProject>true</IsTestProject>