feat(net8): add .NET 8 target framework (#86)

skwasjer · Nov 18, 2023 · b91050e · b91050e
1 parent e86fc17
commit b91050e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
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>net7.0;net6.0;netstandard2.1;netstandard2.0;net48;net472;net462</TargetFrameworks>
+ <TargetFrameworks>net8.0;net7.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>net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks>net8.0;net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
  <PackageId>skwas.MockHttp.Server</PackageId>
  <AssemblyName>skwas.MockHttp.Server</AssemblyName>
  <RootNamespace>MockHttp</RootNamespace>

diff --git a/src/MockHttp/MockHttp.csproj b/src/MockHttp/MockHttp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;net48;net472;net462</TargetFrameworks>
+ <TargetFrameworks>net8.0;net7.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>net7.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
+ <TargetFrameworks>net8.0;net7.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,12 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks>net8.0;net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
 
  <IsTestProject>true</IsTestProject>
 
  <RootNamespace>MockHttp</RootNamespace>
- <SerilogExtensionsLoggingVersion>7.0.0</SerilogExtensionsLoggingVersion>
+ <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">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
+ <TargetFrameworks>net8.0;net7.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
@@ -48,9 +48,17 @@ public void Given_single_header_string_when_parsing_should_return_key_with_one_o
 
  [Theory]
  [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.")]

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>net7.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
+ <TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net48;net472;net462</TargetFrameworks>
 
  <IsTestProject>true</IsTestProject>