Skip to content

Commit 734974e

Browse files
TaritsynTaritsyn
committed
Version 1.4.0:
1. In JavaScriptEngineSwitcher.ConfigurationIntelliSense updated definitions for configuration settings of MSIE JavaScript engine; 2. In JavaScriptEngineSwitcher.Msie: 2.1. Added support of MSIE JavaScript Engine version 1.6.0; 2.2. `ChakraJsRt` mode was renamed to `ChakraIeJsRt`; 3. In JavaScriptEngineSwitcher.V8 NuGet package solved the problem with restoring native assemblies.
1 parent 7a1fc1f commit 734974e

File tree

24 files changed

+72
-54
lines changed

24 files changed

+72
-54
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Change log
22
==========
33

4+
## December 3, 2015 - v1.4.0
5+
* In JavaScriptEngineSwitcher.ConfigurationIntelliSense updated definitions for configuration settings of MSIE JavaScript engine
6+
* In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 1.6.0 and `ChakraJsRt` mode was renamed to `ChakraIeJsRt`
7+
* In JavaScriptEngineSwitcher.V8 NuGet package solved the problem with restoring native assemblies
8+
49
## November 5, 2015 - v1.3.1
510
* In JavaScriptEngineSwitcher.Jurassic added support of Jurassic version of August 24, 2015
611
* In JavaScriptEngineSwitcher.Jint added support of Jint version 2.7.1

‎JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<AssemblyOriginatorKeyFile>..\JavaScriptEngineSwitcher.snk</AssemblyOriginatorKeyFile>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="MsieJavaScriptEngine, Version=1.5.6.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
43-
<HintPath>..\packages\MsieJavaScriptEngine.1.5.6\lib\net40\MsieJavaScriptEngine.dll</HintPath>
42+
<Reference Include="MsieJavaScriptEngine, Version=1.6.0.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
43+
<HintPath>..\packages\MsieJavaScriptEngine.1.6.0\lib\net40\MsieJavaScriptEngine.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="System" />

‎JavaScriptEngineSwitcher.Msie/JsEngineMode.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ public enum JsEngineMode
2525
ChakraActiveScript,
2626

2727
/// <summary>
28-
/// JsRT version of Chakra JavaScript engine (supports ECMAScript 5).
28+
/// “Legacy” JsRT version of Chakra JavaScript engine (supports ECMAScript 5).
2929
/// Requires Internet Explorer 11 or higher on the machine.
3030
/// </summary>
31-
ChakraJsRt
31+
ChakraIeJsRt,
32+
33+
/// <summary>
34+
/// “Edge” JsRT version of Chakra JavaScript engine (supports ECMAScript 5).
35+
/// Requires Microsoft Edge on the machine.
36+
/// </summary>
37+
ChakraEdgeJsRt
3238
}
3339
}

‎JavaScriptEngineSwitcher.Msie/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("1c5512ac-5d2f-45dc-92d4-725624a0016c")]
1515

16-
[assembly: AssemblyVersion("1.2.11.0")]
17-
[assembly: AssemblyFileVersion("1.2.11.0")]
16+
[assembly: AssemblyVersion("1.4.0.0")]
17+
[assembly: AssemblyFileVersion("1.4.0.0")]

‎JavaScriptEngineSwitcher.Msie/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="MsieJavaScriptEngine" version="1.5.6" targetFramework="net40-Client" />
3+
<package id="MsieJavaScriptEngine" version="1.6.0" targetFramework="net40-Client" />
44
</packages>

‎JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Configuration.xsd‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,14 @@
116116
<xs:documentation>ActiveScript version of Chakra JavaScript engine (supports ECMAScript 3 with possibility of using the ECMAScript 5 Polyfill and the JSON2 library). Requires Internet Explorer 9 or higher on the machine.</xs:documentation>
117117
</xs:annotation>
118118
</xs:enumeration>
119-
<xs:enumeration value="ChakraJsRt">
119+
<xs:enumeration value="ChakraIeJsRt">
120120
<xs:annotation>
121-
<xs:documentation>JsRT version of Chakra JavaScript engine (supports ECMAScript 5). Requires Internet Explorer 11 or higher on the machine.</xs:documentation>
121+
<xs:documentation>“Legacy” JsRT version of Chakra JavaScript engine (supports ECMAScript 5). Requires Internet Explorer 11 or higher on the machine.</xs:documentation>
122+
</xs:annotation>
123+
</xs:enumeration>
124+
<xs:enumeration value="ChakraEdgeJsRt">
125+
<xs:annotation>
126+
<xs:documentation>“Edge” JsRT version of Chakra JavaScript engine (supports ECMAScript 5). Requires Microsoft Edge on the machine.</xs:documentation>
122127
</xs:annotation>
123128
</xs:enumeration>
124129
</xs:restriction>

‎JavaScriptEngineSwitcher.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("4cfa9f30-6718-4b7e-8329-7602278b8e31")]
1515

16-
[assembly: AssemblyVersion("1.2.9.0")]
17-
[assembly: AssemblyFileVersion("1.2.9.0")]
16+
[assembly: AssemblyVersion("1.4.0.0")]
17+
[assembly: AssemblyFileVersion("1.4.0.0")]

‎JavaScriptEngineSwitcher.V8/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("684edd94-43fe-4486-a4f3-6b9197d10ebf")]
1515

16-
[assembly: AssemblyVersion("1.3.0.0")]
17-
[assembly: AssemblyFileVersion("1.3.0.0")]
16+
[assembly: AssemblyVersion("1.4.0.0")]
17+
[assembly: AssemblyFileVersion("1.4.0.0")]

‎NuGet/JavaScriptEngineSwitcher.ConfigurationIntelliSense/JavaScriptEngineSwitcher.ConfigurationIntelliSense.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>JavaScriptEngineSwitcher.ConfigurationIntelliSense</id>
5-
<version>1.2.9</version>
5+
<version>1.4.0</version>
66
<title>JavaScript Engine Switcher for .Net: IntelliSense</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>
@@ -12,7 +12,7 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>JavaScriptEngineSwitcher.ConfigurationIntelliSense adds IntelliSense support when editing the `jsEngineSwitcher` configuration section in the Web.config or App.config file.</description>
1414
<summary>JavaScriptEngineSwitcher.ConfigurationIntelliSense adds IntelliSense support when editing the `jsEngineSwitcher` configuration section in the Web.config or App.config file.</summary>
15-
<releaseNotes>Updated definitions for configuration settings of MSIE and Jint JavaScript engines.</releaseNotes>
15+
<releaseNotes>Updated definitions for configuration settings of MSIE JavaScript engine.</releaseNotes>
1616
<copyright>Copyright (c) 2013-2015 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1717
<language>en-US</language>
1818
<tags>App.config Web.config IntelliSense</tags>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
..\nuget.exe pack ..\JavaScriptEngineSwitcher.ConfigurationIntelliSense\JavaScriptEngineSwitcher.ConfigurationIntelliSense.nuspec
1+
..\..\.nuget\nuget.exe pack ..\JavaScriptEngineSwitcher.ConfigurationIntelliSense\JavaScriptEngineSwitcher.ConfigurationIntelliSense.nuspec

0 commit comments

Comments
 (0)