In test projects added support of .NET 8

Taritsyn · Taritsyn · commit 0e59be14e67a · 2023-12-01T20:49:17.000+03:00
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.203"
+    "version": "8.0.100"
   }
 }
diff --git a/src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj b/src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj
@@ -40,7 +40,7 @@
   <ItemGroup>
     <PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="ResxToCs.MSBuild" Version="1.0.0-alpha6" PrivateAssets="All" />
+    <PackageReference Include="ResxToCs.MSBuild" Version="1.0.0-alpha7" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' ">
diff --git a/src/MsieJavaScriptEngine/Resources/CommonStrings.Designer.cs b/src/MsieJavaScriptEngine/Resources/CommonStrings.Designer.cs
diff --git a/src/MsieJavaScriptEngine/Resources/NetCoreStrings.Designer.cs b/src/MsieJavaScriptEngine/Resources/NetCoreStrings.Designer.cs
diff --git a/src/MsieJavaScriptEngine/Resources/NetFrameworkStrings.Designer.cs b/src/MsieJavaScriptEngine/Resources/NetFrameworkStrings.Designer.cs
diff --git a/test/MsieJavaScriptEngine.Benchmarks/HostObjectsEmbeddingBenchmark.cs b/test/MsieJavaScriptEngine.Benchmarks/HostObjectsEmbeddingBenchmark.cs
@@ -66,7 +66,11 @@ private static void EmbedAndUseHostObjects(Func<MsieJsEngine> createJsEngine)
 
 	return result;
 }(someObj, log));";
+#if NET462
 			const string targetOutput = "RmFsc2V8MjkxNHwwLjg3Mjg1OTEwNzM4ODQyNHxBU0RG0KTQq9CS0JA=";
+#else
+			const string targetOutput = "RmFsc2V8MjkxNHwwLjg3Mjg1OTEwNzM4ODQyMzV8QVNERtCk0KvQktCQ";
+#endif
 			string targetLogOutput = "-= Start code execution =-" + Environment.NewLine +
 				"-= End of code execution =-" + Environment.NewLine;
 
@@ -89,7 +93,7 @@ private static void EmbedAndUseHostObjects(Func<MsieJsEngine> createJsEngine)
 			Assert.Equal(targetOutput, output);
 			Assert.Equal(targetLogOutput, logOutput);
 		}
-#if NET461
+#if NET462
 
 		[Benchmark]
 		public void Classic()
diff --git a/test/MsieJavaScriptEngine.Benchmarks/HostTypesEmbeddingBenchmark.cs b/test/MsieJavaScriptEngine.Benchmarks/HostTypesEmbeddingBenchmark.cs
@@ -52,7 +52,11 @@ private static void EmbedAndUseHostTypes(Func<MsieJsEngine> createJsEngine)
 
 	return result;
 }(SomeClass, Point, SomeOtherClass));";
+#if NET462
 			const string targetOutput = "RmFsc2V8MjkyMHwwLjg3Mjg1OTEwNzM4ODQyNHxBU0RG0KTQq9CS0JA=";
+#else
+			const string targetOutput = "RmFsc2V8MjkyMHwwLjg3Mjg1OTEwNzM4ODQyMzV8QVNERtCk0KvQktCQ";
+#endif
 
 			// Act
 			string output;
@@ -69,7 +73,7 @@ private static void EmbedAndUseHostTypes(Func<MsieJsEngine> createJsEngine)
 			// Assert
 			Assert.Equal(targetOutput, output);
 		}
-#if NET461
+#if NET462
 
 		[Benchmark]
 		public void Classic()
diff --git a/test/MsieJavaScriptEngine.Benchmarks/JsExecutionBenchmark.cs b/test/MsieJavaScriptEngine.Benchmarks/JsExecutionBenchmark.cs
@@ -182,7 +182,7 @@ private static void TransliterateStrings(Func<MsieJsEngine> createJsEngine, bool
 				Assert.Equal(_targetOutputStrings[itemIndex], outputStrings[itemIndex]);
 			}
 		}
-#if NET461
+#if NET462
 
 		[Benchmark]
 		public void Classic()
diff --git a/test/MsieJavaScriptEngine.Benchmarks/MsieJavaScriptEngine.Benchmarks.csproj b/test/MsieJavaScriptEngine.Benchmarks/MsieJavaScriptEngine.Benchmarks.csproj
@@ -3,25 +3,18 @@
   <PropertyGroup>
     <Product>MSIE JavaScript Engine: Benchmarks</Product>
     <VersionPrefix>3.2.2</VersionPrefix>
-    <TargetFrameworks>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>Exe</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsPackable>false</IsPackable>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
-    <ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
-  </ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net461' And '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+    <ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/MsieJavaScriptEngine.Test.Auto/MsieJavaScriptEngine.Test.Auto.csproj b/test/MsieJavaScriptEngine.Test.Auto/MsieJavaScriptEngine.Test.Auto.csproj
@@ -3,27 +3,20 @@
   <PropertyGroup>
     <Product>MSIE JavaScript Engine: Tests for Auto Mode</Product>
     <VersionPrefix>3.2.2</VersionPrefix>
-    <TargetFrameworks>net40;net45;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>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
-    <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net45' And '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.ChakraActiveScript/MsieJavaScriptEngine.Test.ChakraActiveScript.csproj b/test/MsieJavaScriptEngine.Test.ChakraActiveScript/MsieJavaScriptEngine.Test.ChakraActiveScript.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>MSIE JavaScript Engine: Tests for Chakra ActiveScript Mode</Product>
     <VersionPrefix>3.2.2</VersionPrefix>
-    <TargetFrameworks>net40;net45</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <OutputType>Library</OutputType>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -14,7 +14,7 @@
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 
     <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
   </ItemGroup>
diff --git a/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.csproj b/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.csproj
@@ -3,27 +3,20 @@
   <PropertyGroup>
     <Product>MSIE JavaScript Engine: Tests for Chakra Edge JsRT Mode</Product>
     <VersionPrefix>3.2.2</VersionPrefix>
-    <TargetFrameworks>net40;net45;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>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
-    <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net45' And '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/MsieJavaScriptEngine.Test.ChakraIeJsRt.csproj b/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/MsieJavaScriptEngine.Test.ChakraIeJsRt.csproj
@@ -3,27 +3,20 @@
   <PropertyGroup>
     <Product>MSIE JavaScript Engine: Tests for Chakra IE JsRT Mode</Product>
     <VersionPrefix>3.2.2</VersionPrefix>
-    <TargetFrameworks>net40;net45;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>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
-    <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net45' And '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.Classic/MsieJavaScriptEngine.Test.Classic.csproj b/test/MsieJavaScriptEngine.Test.Classic/MsieJavaScriptEngine.Test.Classic.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>MSIE JavaScript Engine: Tests for Classic Mode</Product>
     <VersionPrefix>3.2.2</VersionPrefix>
-    <TargetFrameworks>net40;net45</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <OutputType>Library</OutputType>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -14,7 +14,7 @@
   <Import Project="../../build/common.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 
     <ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
   </ItemGroup>
diff --git a/test/MsieJavaScriptEngine.Test.Common/CommonTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/CommonTestsBase.cs
@@ -1,8 +1,6 @@
 ﻿using System;
 using System.IO;
-#if !NET40
 using System.Reflection;
-#endif
 using System.Threading;
 
 using NUnit.Framework;
@@ -247,9 +245,7 @@ public virtual void ExecutionOfResourceByNameAndAssembly()
 			using (var jsEngine = CreateJsEngine())
 			{
 				jsEngine.ExecuteResource(resourceName, typeof(CommonTestsBase)
-#if !NET40
 					.GetTypeInfo()
-#endif
 					.Assembly
 				);
 				output = jsEngine.Evaluate<int>(input);
diff --git a/test/MsieJavaScriptEngine.Test.Common/Interop/LoginFailedException.cs b/test/MsieJavaScriptEngine.Test.Common/Interop/LoginFailedException.cs
@@ -1,5 +1,7 @@
 ﻿using System;
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace MsieJavaScriptEngine.Test.Common.Interop
 {
@@ -25,6 +27,7 @@ public LoginFailedException(string message)
 		public LoginFailedException(string message, Exception innerException)
 			: base(message, innerException)
 		{ }
+#if !NET8_0_OR_GREATER
 
 		protected LoginFailedException(SerializationInfo info, StreamingContext context)
 			: base(info, context)
@@ -46,5 +49,6 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 			base.GetObjectData(info, context);
 			info.AddValue("UserName", this._userName);
 		}
+#endif
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj b/test/MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj
@@ -3,41 +3,26 @@
   <PropertyGroup>
     <Product>MSIE JavaScript Engine: Common Tests</Product>
     <VersionPrefix>3.2.2</VersionPrefix>
-    <TargetFrameworks>net40;net45;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>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="../../build/common.props" />
   <Import Project="../../build/strong-name-signing.props" />
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
 
     <ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net45' And '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.Drawing" />
   </ItemGroup>
 
diff --git a/test/MsieJavaScriptEngine.Test.Common/PrecompilationTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/PrecompilationTestsBase.cs
@@ -1,7 +1,5 @@
 ﻿using System.IO;
-#if !NET40
 using System.Reflection;
-#endif
 using System.Threading.Tasks;
 
 using NUnit.Framework;
@@ -207,9 +205,7 @@ public virtual void ExecutionOfPrecompiledResourceByNameAndAssembly()
 				if (supportsScriptPrecompilation)
 				{
 					precompiledResource = jsEngine.PrecompileResource(resourceName, typeof(PrecompilationTestsBase)
-#if !NET40
 						.GetTypeInfo()
-#endif
 						.Assembly
 					);
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "7.0.203"`
	`3`	`+ "version": "8.0.100"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private static void TransliterateStrings(Func<MsieJsEngine> createJsEngine, bool`
`182`	`182`	`Assert.Equal(_targetOutputStrings[itemIndex], outputStrings[itemIndex]);`
`183`	`183`	`}`
`184`	`184`	`}`
`185`		`-#if NET461`
	`185`	`+#if NET462`
`186`	`186`
`187`	`187`	`[Benchmark]`
`188`	`188`	`public void Classic()`