Skip to content

Commit d3a7ba8

Browse files
TaritsynTaritsyn
committed
In tests was added the .NET Core App 3.0 target
1 parent 9e075f3 commit d3a7ba8

10 files changed

Lines changed: 25 additions & 41 deletions

File tree

‎build/common.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<DefineConstants>$(DefineConstants);NETFULL</DefineConstants>
88
</PropertyGroup>
99

10-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard2.0' ">
10+
<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' ">
14+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'netcoreapp3.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": "2.2.109"
3+
"version": "3.0.100"
44
}
55
}

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

Lines changed: 1 addition & 1 deletion
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.3</VersionPrefix>
6-
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
6+
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<IsPackable>false</IsPackable>

‎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.3</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
77
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.16</RuntimeFrameworkVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -14,7 +14,7 @@
1414
<Import Project="../../build/common.props" />
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1818

1919
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
2020
</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="16.0.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.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.3</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
77
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.16</RuntimeFrameworkVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -14,7 +14,7 @@
1414
<Import Project="../../build/common.props" />
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1818

1919
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
2020
</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.3</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
77
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.16</RuntimeFrameworkVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -14,7 +14,7 @@
1414
<Import Project="../../build/common.props" />
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1818

1919
<ProjectReference Include="../MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj" />
2020
</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="16.0.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1717

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

‎test/MsieJavaScriptEngine.Test.Common/FileSystemTestsBase.cs‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,26 @@
1-
#if NET451 || NETCOREAPP
1+
using System;
2+
using System.IO;
3+
#if NETCOREAPP1_0
4+
25
using Microsoft.Extensions.PlatformAbstractions;
3-
#elif NET40
4-
using System;
5-
using System.Text.RegularExpressions;
6-
#else
7-
#error No implementation for this target
86
#endif
9-
using System.IO;
107

118
namespace MsieJavaScriptEngine.Test.Common
129
{
1310
public abstract class FileSystemTestsBase : TestsBase
1411
{
15-
#if NET40
16-
/// <summary>
17-
/// Regular expression for working with the `bin` directory path
18-
/// </summary>
19-
private readonly Regex _binDirRegex = new Regex(@"\\bin\\(?:Debug|Release)\\?$", RegexOptions.IgnoreCase);
20-
21-
#endif
2212
private string _baseDirectoryPath;
2313

2414

2515
protected FileSystemTestsBase()
2616
{
27-
#if NET451 || NETCOREAPP
17+
#if NETCOREAPP1_0
2818
var appEnv = PlatformServices.Default.Application;
29-
_baseDirectoryPath = Path.Combine(appEnv.ApplicationBasePath, "../../../../");
30-
#elif NET40
31-
string baseDirectoryPath = AppDomain.CurrentDomain.BaseDirectory;
32-
_baseDirectoryPath = Path.Combine(baseDirectoryPath, "../../../../");
19+
string appDirectoryPath = appEnv.ApplicationBasePath;
3320
#else
34-
#error No implementation for this target
21+
string appDirectoryPath = AppDomain.CurrentDomain.BaseDirectory;
3522
#endif
23+
_baseDirectoryPath = Path.Combine(appDirectoryPath, "../../../../");
3624
}
3725

3826

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

Lines changed: 5 additions & 9 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.3</VersionPrefix>
6-
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
6+
<TargetFrameworks>net40;net451;netcoreapp1.0;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
77
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.16</RuntimeFrameworkVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -15,9 +15,9 @@
1515
<Import Project="../../build/strong-name-signing.props" />
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
19-
<PackageReference Include="NUnit" Version="3.11.0" />
20-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
19+
<PackageReference Include="NUnit" Version="3.12.0" />
20+
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
2121

2222
<ProjectReference Include="../../src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj" />
2323
</ItemGroup>
@@ -26,14 +26,10 @@
2626
<Reference Include="System.Drawing" />
2727
</ItemGroup>
2828

29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'netcoreapp1.0' ">
29+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
3030
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.0.0" />
3131
</ItemGroup>
3232

33-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
34-
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
35-
</ItemGroup>
36-
3733
<ItemGroup>
3834
<EmbeddedResource Include="Resources/cube.js;Resources/declinationOfDays.js;Resources/declinationOfHours.js;Resources/power.js" />
3935
</ItemGroup>

0 commit comments

Comments
 (0)