Skip to content

Commit 98bd0f8

Browse files
TaritsynTaritsyn
committed
In test and sample projects added support for .NET 9 and 10
1 parent 7c2dced commit 98bd0f8

9 files changed

Lines changed: 23 additions & 15 deletions

File tree

‎global.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.200"
3+
"version": "10.0.100",
4+
"rollForward": "latestFeature"
45
}
56
}

‎src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10-
<NoWarn>$(NoWarn);CS1591;NU1605</NoWarn>
10+
<NoWarn>$(NoWarn);CS1591;NETSDK1215;NU1605</NoWarn>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
1313
<Title>$(Product)</Title>

‎test/MsieJavaScriptEngine.Benchmarks/MsieJavaScriptEngine.Benchmarks.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Benchmarks</Product>
55
<VersionPrefix>3.2.5</VersionPrefix>
6-
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
10+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1011
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
1213

1314
<Import Project="../../build/common.props" />
1415

1516
<ItemGroup>
16-
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
17+
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
1718

1819
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
1920
</ItemGroup>

‎test/MsieJavaScriptEngine.Test.Auto/MsieJavaScriptEngine.Test.Auto.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Tests for Auto Mode</Product>
55
<VersionPrefix>3.2.5</VersionPrefix>
6-
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<TestTfmsInParallel>false</TestTfmsInParallel>
910
<IsTestProject>true</IsTestProject>
1011
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
1213

1314
<Import Project="../../build/common.props" />
1415

1516
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1718

1819
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1920
</ItemGroup>

‎test/MsieJavaScriptEngine.Test.ChakraActiveScript/MsieJavaScriptEngine.Test.ChakraActiveScript.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
<TargetFrameworks>net462</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<TestTfmsInParallel>false</TestTfmsInParallel>
910
<IsTestProject>true</IsTestProject>
1011
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
1213

1314
<Import Project="../../build/common.props" />
1415

1516
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1718

1819
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1920
</ItemGroup>

‎test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Tests for Chakra Edge JsRT Mode</Product>
55
<VersionPrefix>3.2.5</VersionPrefix>
6-
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<TestTfmsInParallel>false</TestTfmsInParallel>
910
<IsTestProject>true</IsTestProject>
1011
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
1213

1314
<Import Project="../../build/common.props" />
1415

1516
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1718

1819
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1920
</ItemGroup>

‎test/MsieJavaScriptEngine.Test.ChakraIeJsRt/MsieJavaScriptEngine.Test.ChakraIeJsRt.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Tests for Chakra IE JsRT Mode</Product>
55
<VersionPrefix>3.2.5</VersionPrefix>
6-
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<TestTfmsInParallel>false</TestTfmsInParallel>
910
<IsTestProject>true</IsTestProject>
1011
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
1213

1314
<Import Project="../../build/common.props" />
1415

1516
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1718

1819
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1920
</ItemGroup>

‎test/MsieJavaScriptEngine.Test.Classic/MsieJavaScriptEngine.Test.Classic.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
<TargetFrameworks>net462</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<TestTfmsInParallel>false</TestTfmsInParallel>
910
<IsTestProject>true</IsTestProject>
1011
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
1213

1314
<Import Project="../../build/common.props" />
1415

1516
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1718

1819
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1920
</ItemGroup>

‎test/MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Common Tests</Product>
55
<VersionPrefix>3.2.5</VersionPrefix>
6-
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<TestTfmsInParallel>false</TestTfmsInParallel>
910
<IsTestProject>true</IsTestProject>
1011
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
@@ -14,9 +15,9 @@
1415
<Import Project="../../build/strong-name-signing.props" />
1516

1617
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1819
<PackageReference Include="NUnit" Version="3.14.0" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
20+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2021

2122
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
2223
</ItemGroup>

0 commit comments

Comments
 (0)