Skip to content

Commit 3975b76

Browse files
TaritsynTaritsyn
committed
In test projects added support of .NET 5.0
1 parent b1ae6c9 commit 3975b76

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

‎build/common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<Copyright>Copyright © 2012-2020 Andrey Taritsyn</Copyright>
44
</PropertyGroup>
55

6-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46' ">
6+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' ">
77
<DefineConstants>$(DefineConstants);NETFULL</DefineConstants>
88
</PropertyGroup>
99

1010
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
1111
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1212
</PropertyGroup>
1313

14-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'netcoreapp3.1' ">
14+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' ">
1515
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
1616
</PropertyGroup>
1717
</Project>

‎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": "3.1.411"
3+
"version": "5.0.302"
44
}
55
}

‎src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<LangVersion>7.3</LangVersion>
99
<OutputType>Library</OutputType>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
<NoWarn>$(NoWarn);CS1591;NU5125</NoWarn>
11+
<NoWarn>$(NoWarn);CS1591;NU1605</NoWarn>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
1414
<Title>$(Product)</Title>
@@ -38,14 +38,14 @@
3838

3939
<ItemGroup>
4040
<PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
41-
<PackageReference Include="BuildBundlerMinifier" Version="2.4.337" PrivateAssets="All" />
41+
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" PrivateAssets="All" />
4242
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
4343
<PackageReference Include="ResxToCs.MSBuild" Version="1.0.0-alpha6" PrivateAssets="All" />
4444
</ItemGroup>
4545

4646
<ItemGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' ">
4747
<Compile Remove="Resources/NetCoreStrings.*" />
48-
<EmbeddedResource Include="Resources/ES5.min.js;Resources/json2.min.js" />
48+
<EmbeddedResource Include="Resources/*.min.js" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard2.0' ">

‎test/MsieJavaScriptEngine.Benchmarks/MsieJavaScriptEngine.Benchmarks.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: Benchmarks</Product>
55
<VersionPrefix>3.0.7</VersionPrefix>
6-
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsPackable>false</IsPackable>
@@ -12,7 +12,7 @@
1212
<Import Project="../../build/common.props" />
1313

1414
<ItemGroup>
15-
<PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
15+
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
1616

1717
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
1818
</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.7</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.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="16.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
1717

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

‎test/MsieJavaScriptEngine.Test.ChakraActiveScript/MsieJavaScriptEngine.Test.ChakraActiveScript.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 ActiveScript Mode</Product>
55
<VersionPrefix>3.0.7</VersionPrefix>
6-
<TargetFrameworks>net40;net451</TargetFrameworks>
6+
<TargetFrameworks>net40;net45</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="16.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
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.7</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.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="16.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
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.7</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.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="16.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
1717

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

‎test/MsieJavaScriptEngine.Test.Classic/MsieJavaScriptEngine.Test.Classic.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 Classic Mode</Product>
55
<VersionPrefix>3.0.7</VersionPrefix>
6-
<TargetFrameworks>net40;net451</TargetFrameworks>
6+
<TargetFrameworks>net40;net45</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="16.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
1717

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

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

Lines changed: 5 additions & 5 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.7</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsTestProject>true</IsTestProject>
@@ -14,14 +14,14 @@
1414
<Import Project="../../build/strong-name-signing.props" />
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
18-
<PackageReference Include="NUnit" Version="3.12.0" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
18+
<PackageReference Include="NUnit" Version="3.13.2" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
2020

2121
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
2222
</ItemGroup>
2323

24-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net451' ">
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' ">
2525
<Reference Include="System.Drawing" />
2626
</ItemGroup>
2727

0 commit comments

Comments
 (0)