Skip to content

Commit 799f21a

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.Jint added support of Jint version 2.10.1
1 parent 6e46ef8 commit 799f21a

File tree

10 files changed

+31
-19
lines changed

10 files changed

+31
-19
lines changed

‎NuGet/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.nuspec‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,24 @@
1010
<projectUrl>http://github.com/Taritsyn/JavaScriptEngineSwitcher</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.9.1).</description>
14-
<summary>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine version 2.9.1).</summary>
15-
<releaseNotes>1. Removed dependency on `System.Configuration.dll` (no longer supported configuration by using the `Web.config` and `App.config` files);
16-
2. Added support of .NET Framework 4.5.1.</releaseNotes>
13+
<description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.10.1).</description>
14+
<summary>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine version 2.10.1).</summary>
15+
<releaseNotes>1. Jint was updated to version 2.10.1;
16+
2. Added support of .NET Core 1.0.1.</releaseNotes>
1717
<copyright>Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1818
<language>en-US</language>
1919
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript Jint</tags>
2020
<dependencies>
2121
<group targetFramework=".NETFramework4.0-Client">
22-
<dependency id="Jint" version="2.9.1" />
22+
<dependency id="Jint" version="2.10.1" />
2323
<dependency id="JavaScriptEngineSwitcher.Core" version="2.0.0" />
2424
</group>
2525
<group targetFramework=".NETFramework4.5.1">
26-
<dependency id="Jint" version="2.9.1" />
26+
<dependency id="Jint" version="2.10.1" />
27+
<dependency id="JavaScriptEngineSwitcher.Core" version="2.0.0" />
28+
</group>
29+
<group targetFramework=".NETStandard1.3">
30+
<dependency id="Jint" version="2.10.1" />
2731
<dependency id="JavaScriptEngineSwitcher.Core" version="2.0.0" />
2832
</group>
2933
</dependencies>

‎NuGet/JavaScriptEngineSwitcher.Jint/build-package.cmd‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ xcopy "%dotnet_project_bin_dir%\net451\%project_name%.dll" lib\net451\
2020
xcopy "%dotnet_project_bin_dir%\net451\%project_name%.xml" lib\net451\
2121
xcopy "%dotnet_project_bin_dir%\net451\ru-ru\%project_name%.resources.dll" lib\net451\ru-ru\
2222

23+
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard1.3 --configuration Release --no-dependencies --no-incremental
24+
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstandard1.3\
25+
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
26+
xcopy "%dotnet_project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
27+
2328
copy "%licenses_dir%\jint-license.txt" jint-license.txt /Y
2429

2530
%nuget_package_manager% pack "..\%project_name%\%project_name%.nuspec"

‎NuGet/JavaScriptEngineSwitcher.Jint/readme.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
DESCRIPTION
1313
===========
1414
JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
15-
Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.9.1).
15+
Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.10.1).
1616

1717
=============
1818
RELEASE NOTES
1919
=============
20-
1. Removed dependency on `System.Configuration.dll` (no longer supported
21-
configuration by using the `Web.config` and `App.config` files);
22-
2. Added support of .NET Framework 4.5.1.
20+
1. Jint was updated to version 2.10.1;
21+
2. Added support of .NET Core 1.0.1.
2322

2423
=============
2524
DOCUMENTATION

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Startup.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using JavaScriptEngineSwitcher.ChakraCore;
99
using JavaScriptEngineSwitcher.Extensions.MsDependencyInjection;
1010
using JavaScriptEngineSwitcher.Msie;
11+
using JavaScriptEngineSwitcher.Jint;
1112
using JavaScriptEngineSwitcher.Sample.Logic.Services;
1213
using JavaScriptEngineSwitcher.Vroom;
1314

@@ -59,6 +60,7 @@ public void ConfigureServices(IServiceCollection services)
5960
options.UseEcmaScript5Polyfill = true;
6061
options.UseJson2Library = true;
6162
})
63+
.AddJint()
6264
.AddVroom()
6365
;
6466

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"JavaScriptEngineSwitcher.ChakraCore": "2.0.0",
2626
"JavaScriptEngineSwitcher.Extensions.MsDependencyInjection": "2.0.0",
2727
"JavaScriptEngineSwitcher.Msie": "2.0.0",
28+
"JavaScriptEngineSwitcher.Jint": "2.0.0",
2829
"JavaScriptEngineSwitcher.Sample.Logic": "2.0.0",
2930
"JavaScriptEngineSwitcher.Vroom": "2.0.1"
3031
},

‎src/JavaScriptEngineSwitcher.Jint.Net4/JavaScriptEngineSwitcher.Jint.Net40.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
</ProjectReference>
4646
</ItemGroup>
4747
<ItemGroup>
48-
<Reference Include="Jint, Version=2.9.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\Jint.2.9.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
48+
<Reference Include="jint, Version=2.10.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\Jint.2.10.1\lib\portable40-net40+sl5+win8+wp8+wpa81\jint.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="System" />

‎src/JavaScriptEngineSwitcher.Jint.Net4/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Jint" version="2.9.1" targetFramework="net40-Client" />
3+
<package id="Jint" version="2.10.1" targetFramework="net40-Client" />
44
</packages>

‎src/JavaScriptEngineSwitcher.Jint/project.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "2.0.0",
33

44
"dependencies": {
5-
"Jint": "2.9.1",
5+
"Jint": "2.10.1",
66
"JavaScriptEngineSwitcher.Core": "2.0.0"
77
},
88

@@ -16,10 +16,11 @@
1616
},
1717

1818
"frameworks": {
19+
"netstandard1.3": {},
1920
"net451": {}
2021
},
2122

2223
"scripts": {
2324
"precompile": "../../build resx"
2425
}
25-
}
26+
}

‎test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using JavaScriptEngineSwitcher.ChakraCore;
22
using JavaScriptEngineSwitcher.Core;
33
using JavaScriptEngineSwitcher.Msie;
4+
using JavaScriptEngineSwitcher.Jint;
45
using JavaScriptEngineSwitcher.Vroom;
56
#if !NETCOREAPP1_0
6-
using JavaScriptEngineSwitcher.Jint;
77
using JavaScriptEngineSwitcher.Jurassic;
88
using JavaScriptEngineSwitcher.V8;
99
#endif
@@ -25,9 +25,9 @@ public static void Initialize()
2525
{
2626
EngineMode = JsEngineMode.ChakraIeJsRt
2727
})
28+
.AddJint()
2829
.AddVroom()
2930
#if !NETCOREAPP1_0
30-
.AddJint()
3131
.AddJurassic()
3232
.AddV8()
3333
#endif

‎test/JavaScriptEngineSwitcher.Tests/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"JavaScriptEngineSwitcher.ChakraCore": "2.0.0",
1010
"JavaScriptEngineSwitcher.Core": "2.0.0",
1111
"JavaScriptEngineSwitcher.Msie": "2.0.0",
12+
"JavaScriptEngineSwitcher.Jint": "2.0.0",
1213
"JavaScriptEngineSwitcher.Vroom": "2.0.1"
1314
},
1415

@@ -36,13 +37,12 @@
3637
},
3738
"buildOptions": {
3839
"compile": {
39-
"exclude": [ "Jint/**/*.*", "Jurassic/**/*.*", "V8/**/*.*" ]
40+
"exclude": [ "Jurassic/**/*.*", "V8/**/*.*" ]
4041
}
4142
}
4243
},
4344
"net451": {
4445
"dependencies": {
45-
"JavaScriptEngineSwitcher.Jint": "2.0.0",
4646
"JavaScriptEngineSwitcher.Jurassic": "2.0.0",
4747
"JavaScriptEngineSwitcher.V8": "2.0.0"
4848
},

0 commit comments

Comments
 (0)