Skip to content

Commit 65e2fb6

Browse files
TaritsynTaritsyn
committed
Added support of .NET Standard 2.0
1 parent f4b00e7 commit 65e2fb6

File tree

117 files changed

+238
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+238
-408
lines changed

‎_exec.shade

-61
This file was deleted.

‎build.cmd

-17
This file was deleted.

‎build.ps1

-67
This file was deleted.

‎build.sh

-57
This file was deleted.

‎build/common.props

+12
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,16 @@
22
<PropertyGroup>
33
<Copyright>Copyright © 2012-2017 Andrey Taritsyn</Copyright>
44
</PropertyGroup>
5+
6+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' ">
7+
<DefineConstants>$(DefineConstants);NETFULL</DefineConstants>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard2.0' ">
11+
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
12+
</PropertyGroup>
13+
14+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
15+
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
16+
</PropertyGroup>
517
</Project>

‎makefile.shade

-58
This file was deleted.

‎run-dotnet-tests.cmd

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
@echo off
2+
setlocal
3+
4+
set common_test_project_name=MsieJavaScriptEngine.Test.Common
5+
set auto_test_project_name=MsieJavaScriptEngine.Test.Auto
6+
set chakra_edge_jsrt_test_project_name=MsieJavaScriptEngine.Test.ChakraEdgeJsRt
7+
set chakra_ie_jsrt_test_project_name=MsieJavaScriptEngine.Test.ChakraIeJsRt
8+
set chakra_activescript_test_project_name=MsieJavaScriptEngine.Test.ChakraActiveScript
9+
set classic_test_project_name=MsieJavaScriptEngine.Test.Classic
10+
11+
set common-args=--configuration Release --no-build --verbosity minimal
12+
set test_dir_path=test
13+
set common_test_project_file_path=%test_dir_path%\%common_test_project_name%\%common_test_project_name%.csproj
14+
set auto_test_project_file_path=%test_dir_path%\%auto_test_project_name%\%auto_test_project_name%.csproj
15+
set chakra_edge_jsrt_test_project_file_path=%test_dir_path%\%chakra_edge_jsrt_test_project_name%\%chakra_edge_jsrt_test_project_name%.csproj
16+
set chakra_ie_jsrt_test_project_file_path=%test_dir_path%\%chakra_ie_jsrt_test_project_name%\%chakra_ie_jsrt_test_project_name%.csproj
17+
set chakra_activescript_test_project_file_path=%test_dir_path%\%chakra_activescript_test_project_name%\%chakra_activescript_test_project_name%.csproj
18+
set classic_test_project_file_path=%test_dir_path%\%classic_test_project_name%\%classic_test_project_name%.csproj
19+
20+
@echo Run unit tests for DotNet version...
21+
@echo.
22+
23+
dotnet test --framework net451 %common-args% "%common_test_project_file_path%"
24+
@echo.
25+
dotnet test --framework netcoreapp1.0 %common-args% "%common_test_project_file_path%"
26+
@echo.
27+
dotnet test --framework netcoreapp2.0 %common-args% "%common_test_project_file_path%"
28+
@echo.
29+
30+
dotnet test --framework net451 %common-args% "%auto_test_project_file_path%"
31+
@echo.
32+
dotnet test --framework netcoreapp1.0 %common-args% "%auto_test_project_file_path%"
33+
@echo.
34+
dotnet test --framework netcoreapp2.0 %common-args% "%auto_test_project_file_path%"
35+
@echo.
36+
37+
dotnet test --framework net451 %common-args% "%chakra_edge_jsrt_test_project_file_path%"
38+
@echo.
39+
dotnet test --framework netcoreapp1.0 %common-args% "%chakra_edge_jsrt_test_project_file_path%"
40+
@echo.
41+
dotnet test --framework netcoreapp2.0 %common-args% "%chakra_edge_jsrt_test_project_file_path%"
42+
@echo.
43+
44+
dotnet test --framework net451 %common-args% "%chakra_ie_jsrt_test_project_file_path%"
45+
@echo.
46+
dotnet test --framework netcoreapp1.0 %common-args% "%chakra_ie_jsrt_test_project_file_path%"
47+
@echo.
48+
dotnet test --framework netcoreapp2.0 %common-args% "%chakra_ie_jsrt_test_project_file_path%"
49+
@echo.
50+
51+
dotnet test --framework net451 %common-args% "%chakra_activescript_test_project_file_path%"
52+
@echo.
53+
54+
dotnet test --framework net451 %common-args% "%classic_test_project_file_path%"
55+
@echo.

‎run-net4-tests.cmd

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@echo off
2+
setlocal
3+
4+
set local_nuget_package_manager=.nuget\NuGet.exe
5+
set package_dir=packages
6+
set nunit_console_path=%package_dir%\NUnit.ConsoleRunner\tools\nunit3-console.exe
7+
8+
if not exist %package_dir%\NUnit.Console (
9+
%local_nuget_package_manager% install NUnit.Console -Version 3.7.0 -O %package_dir% -ExcludeVersion -NoCache
10+
)
11+
12+
@echo Run unit tests for .NET 4.0 version...
13+
@echo.
14+
%nunit_console_path% test\MsieJavaScriptEngine.Test.Net4.nunit --process=Multiple --domain=Single --work=test\ --noheader --trace=Off

‎src/MsieJavaScriptEngine/ActiveScript/ActiveScriptException.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD1_3
1+
#if !NETSTANDARD
22
using System;
33
using System.Runtime.Serialization;
44
using System.Security.Permissions;

‎src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.ScriptSiteBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD1_3
1+
#if !NETSTANDARD
22
using System;
33
using System.Globalization;
44
using System.Runtime.InteropServices;

‎src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD1_3
1+
#if !NETSTANDARD
22
using System;
33
using System.Collections.Generic;
44
using System.Globalization;

‎src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper32.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD1_3
1+
#if !NETSTANDARD
22
using System;
33

44
using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;

‎src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper64.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD1_3
1+
#if !NETSTANDARD
22
using System;
33

44
using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;

‎src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapperBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD1_3
1+
#if !NETSTANDARD
22
using System;
33
using System.Runtime.InteropServices;
44
using System.Runtime.InteropServices.ComTypes;

0 commit comments

Comments
 (0)