Skip to content

Commit 1d02b1d

Browse files
TaritsynTaritsyn
committed
In test projects added support of .NET 7
1 parent eac1f2e commit 1d02b1d

8 files changed

Lines changed: 27 additions & 14 deletions

File tree

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.302"
3+
"version": "7.0.102"
44
}
55
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Benchmarks</Product>
55
<VersionPrefix>3.0.9</VersionPrefix>
6-
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsPackable>false</IsPackable>
@@ -12,9 +12,15 @@
1212
<Import Project="../../build/common.props" />
1313

1414
<ItemGroup>
15+
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netcoreapp2.1'">
1519
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
20+
</ItemGroup>
1621

17-
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
22+
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' And '$(TargetFramework)' != 'netcoreapp2.1' ">
23+
<PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
1824
</ItemGroup>
1925

2026
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Tests for Auto Mode</Product>
55
<VersionPrefix>3.0.9</VersionPrefix>
6-
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsTestProject>true</IsTestProject>
@@ -13,7 +13,7 @@
1313
<Import Project="../../build/common.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1717

1818
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1919
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Import Project="../../build/common.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1717

1818
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1919
</ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Tests for Chakra Edge JsRT Mode</Product>
55
<VersionPrefix>3.0.9</VersionPrefix>
6-
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsTestProject>true</IsTestProject>
@@ -13,7 +13,7 @@
1313
<Import Project="../../build/common.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1717

1818
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1919
</ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Tests for Chakra IE JsRT Mode</Product>
55
<VersionPrefix>3.0.9</VersionPrefix>
6-
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsTestProject>true</IsTestProject>
@@ -13,7 +13,7 @@
1313
<Import Project="../../build/common.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1717

1818
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1919
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Import Project="../../build/common.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1717

1818
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
1919
</ItemGroup>

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>MSIE JavaScript Engine: Common Tests</Product>
55
<VersionPrefix>3.0.9</VersionPrefix>
6-
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsTestProject>true</IsTestProject>
@@ -14,13 +14,20 @@
1414
<Import Project="../../build/strong-name-signing.props" />
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1818
<PackageReference Include="NUnit" Version="3.13.3" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
2019

2120
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
2221
</ItemGroup>
2322

23+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
24+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
28+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
29+
</ItemGroup>
30+
2431
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' ">
2532
<Reference Include="System.Drawing" />
2633
</ItemGroup>

0 commit comments

Comments
 (0)