In test projects added support of .NET 8

Taritsyn · Jan 9, 2024 · 0134af1 · 0134af1
1 parent 9f032d7
commit 0134af1
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 54 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,11 +1,11 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="JavaScriptEngineSwitcher.ChakraCore" Version="3.21.0" />
+    <PackageVersion Include="JavaScriptEngineSwitcher.ChakraCore" Version="3.23.7" />
     <PackageVersion Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.21.0" />
     <PackageVersion Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.21.0" />
     <PackageVersion Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.21.0" />
     <PackageVersion Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.21.0" />
-    <PackageVersion Include="JavaScriptEngineSwitcher.Msie" Version="3.21.1" />
-    <PackageVersion Include="JavaScriptEngineSwitcher.NiL" Version="3.23.0" />
+    <PackageVersion Include="JavaScriptEngineSwitcher.Msie" Version="3.23.7" />
+    <PackageVersion Include="JavaScriptEngineSwitcher.NiL" Version="3.23.5" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.401"
+    "version": "8.0.100"
   }
 }
diff --git a/test/AutoprefixerHost.Benchmarks/AutoprefixerHost.Benchmarks.csproj b/test/AutoprefixerHost.Benchmarks/AutoprefixerHost.Benchmarks.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>Autoprefixer Host for .NET: Benchmarks</Product>
     <VersionPrefix>3.0.31</VersionPrefix>
-    <TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
@@ -14,22 +14,15 @@
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.12" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" />
 
     <ProjectReference Include="../../src/AutoprefixerHost/AutoprefixerHost.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.3" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
-    <PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.8" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />
   </ItemGroup>

diff --git a/test/AutoprefixerHost.Tests/AutoprefixerHost.Tests.csproj b/test/AutoprefixerHost.Tests/AutoprefixerHost.Tests.csproj
@@ -3,54 +3,38 @@
   <PropertyGroup>
     <Product>Autoprefixer Host for .NET: Tests</Product>
     <VersionPrefix>3.0.31</VersionPrefix>
-    <TargetFrameworks>net40;net45;net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsTestProject>true</IsTestProject>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <IsPackable>false</IsPackable>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.8.0" />
+    <PackageReference Include="NUnit" VersionOverride="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" VersionOverride="4.5.0" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" />
     <PackageReference Include="JavaScriptEngineSwitcher.Msie" />
-    <PackageReference Include="NUnit" VersionOverride="3.13.3" />
+    <PackageReference Include="JavaScriptEngineSwitcher.NiL" />
 
     <ProjectReference Include="../../src/AutoprefixerHost/AutoprefixerHost.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" VersionOverride="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net45' And '$(TargetFramework)' != 'net461' And '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.7.2" />
-    <PackageReference Include="NUnit3TestAdapter" VersionOverride="4.5.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40-client' ">
-    <PackageReference Include="PolyfillsForOldDotNet.System.Runtime.InteropServices.RuntimeInformation" VersionOverride="0.1.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" VersionOverride="4.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" VersionOverride="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net45' And '$(TargetFramework)' != 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
     <PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net45' And '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="JavaScriptEngineSwitcher.NiL" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="Files/**/*.*">
       <Link>Files/%(RecursiveDir)/%(Filename)%(Extension)</Link>

diff --git a/test/AutoprefixerHost.Tests/ErrorTests.cs b/test/AutoprefixerHost.Tests/ErrorTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using JavaScriptEngineSwitcher.Core;
-#if NET461 || NETCOREAPP3_1_OR_GREATER
+#if !NET8_0_OR_GREATER
 using JavaScriptEngineSwitcher.NiL;
 #endif
 
@@ -44,13 +44,9 @@ public void MappingJsonError()
 			};
 
 			string targetErrorDescription = "The value of 'Stats' property has an incorrect format.";
-			string targetErrorMessage = targetErrorDescription + " See the original error message: “" +
-#if NET461 || NETCOREAPP2_1_OR_GREATER
-				"'0xE2' is an invalid start of a property name. Expected a '\"'. LineNumber: 7 | BytePositionInLine: 4." +
-#else
-				"Invalid property identifier character: …. Path 'chrome', line 8, position 4." +
-#endif
-				"”."
+			string targetErrorMessage = targetErrorDescription + " See the original error message: " +
+				"“'0xE2' is an invalid start of a property name. Expected a '\"'. " +
+				"LineNumber: 7 | BytePositionInLine: 4.”."
 				;
 
 			// Act
@@ -90,7 +86,7 @@ public void MappingJsonError()
 			Assert.AreEqual(targetErrorMessage, processingException.Message);
 			Assert.AreEqual(targetErrorDescription, processingException.Description);
 		}
-#if NET461 || NETCOREAPP3_1_OR_GREATER
+#if !NET8_0_OR_GREATER
 
 		[Test]
 		public void MappingJavaScriptError()

diff --git a/test/AutoprefixerHost.Tests/OldJsEngineTests.cs b/test/AutoprefixerHost.Tests/OldJsEngineTests.cs
@@ -1,14 +1,8 @@
-using System;
-#if !NET40
-using System.Runtime.InteropServices;
-#endif
+using System.Runtime.InteropServices;
 
 using JavaScriptEngineSwitcher.Core;
 using JavaScriptEngineSwitcher.Msie;
 using NUnit.Framework;
-#if NET40
-using PolyfillsForOldDotNet.System.Runtime.InteropServices;
-#endif
 
 namespace AutoprefixerHost.Tests
 {