Version 1.6.0

Taritsyn · Dec 3, 2015 · de40351 · de40351
1 parent e149667
commit de40351
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change log
 ==========
 
+## December 3, 2015 - v1.6.0
+ * Added support of “Edge” JsRT version of Chakra JavaScript engine
+ * `ChakraJsRt` mode was renamed to `ChakraIeJsRt`
+
 ## June 29, 2015 - v1.5.5
  * Fixed an error, that occurs on computers with IE 6
  * Removed `Obsolete` attribute from parameterless constructor

diff --git a/NuGet/MsieJavaScriptEngine.nuspec b/NuGet/MsieJavaScriptEngine.nuspec
@@ -1,31 +1,32 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-  <metadata>
-    <id>MsieJavaScriptEngine</id>
-    <version>1.5.6</version>
-	<title>MSIE JavaScript Engine for .NET</title>
-    <authors>Andrey Taritsyn</authors>
-    <owners>Andrey Taritsyn</owners>
-    <licenseUrl>http://github.com/Taritsyn/MsieJavaScriptEngine/blob/master/LICENSE.md</licenseUrl>
-    <projectUrl>http://github.com/Taritsyn/MsieJavaScriptEngine</projectUrl>
-    <iconUrl>http://i.imgur.com/cbiHK.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee) and Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host).</description>
-    <summary>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
-	<releaseNotes>Source code of the `ChakraJsRtJsEngine` was synchronized with the Chakra Sample Hosts version of July 11, 2015.</releaseNotes>
-	<copyright>Copyright (c) 2012-2015 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
-    <language>en-US</language>
-    <tags>JavaScript ECMAScript MSIE IE Chakra</tags>
-    <references>
-      <reference file="MsieJavaScriptEngine.dll" />
-    </references>
-  </metadata>
-  <files>
-    <file src="..\MsieJavaScriptEngine\bin\Release\MsieJavaScriptEngine.dll" target="lib\net40" />
-	<file src="..\MsieJavaScriptEngine\bin\Release\**\MsieJavaScriptEngine.resources.dll" target="lib\net40" />
-	<file src="readme.txt" />
-	<file src="..\Licenses\sass-and-coffee-license.txt" />
-	<file src="..\Licenses\chakra-host-license.txt" />
-	<file src="..\Licenses\microsoft-ajax-minifier-license.txt" />
-  </files>
+	<metadata>
+		<id>MsieJavaScriptEngine</id>
+		<version>1.6.0</version>
+		<title>MSIE JavaScript Engine for .NET</title>
+		<authors>Andrey Taritsyn</authors>
+		<owners>Andrey Taritsyn</owners>
+		<licenseUrl>http://github.com/Taritsyn/MsieJavaScriptEngine/blob/master/LICENSE.md</licenseUrl>
+		<projectUrl>http://github.com/Taritsyn/MsieJavaScriptEngine</projectUrl>
+		<iconUrl>http://i.imgur.com/cbiHK.png</iconUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee) and Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host).</description>
+		<summary>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
+		<releaseNotes>1. Added support of “Edge” JsRT version of Chakra JavaScript engine;
+2. `ChakraJsRt` mode was renamed to `ChakraIeJsRt`.</releaseNotes>
+		<copyright>Copyright (c) 2012-2015 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
+		<language>en-US</language>
+		<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>
+		<references>
+			<reference file="MsieJavaScriptEngine.dll" />
+		</references>
+	</metadata>
+	<files>
+		<file src="..\src\MsieJavaScriptEngine\bin\Release\MsieJavaScriptEngine.dll" target="lib\net40" />
+		<file src="..\src\MsieJavaScriptEngine\bin\Release\**\MsieJavaScriptEngine.resources.dll" target="lib\net40" />
+		<file src="readme.txt" />
+		<file src="..\Licenses\sass-and-coffee-license.txt" />
+		<file src="..\Licenses\chakra-host-license.txt" />
+		<file src="..\Licenses\microsoft-ajax-minifier-license.txt" />
+	</files>
 </package>
diff --git a/NuGet/build-package.cmd b/NuGet/build-package.cmd
@@ -1,2 +1,2 @@
-\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\MsieJavaScriptEngine\MsieJavaScriptEngine.csproj /p:Configuration=Release
+\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\MsieJavaScriptEngine\MsieJavaScriptEngine.csproj /p:Configuration=Release
 ..\.nuget\nuget.exe pack MsieJavaScriptEngine.nuspec
diff --git a/NuGet/readme.txt b/NuGet/readme.txt
@@ -1,7 +1,7 @@
 
 
    ----------------------------------------------------------------------
-           README file for MSIE JavaScript Engine for .NET 1.5.6
+           README file for MSIE JavaScript Engine for .NET v1.6.0
 
    ----------------------------------------------------------------------
 
@@ -11,18 +11,18 @@
    ===========
    DESCRIPTION
    ===========
-   This project is a .NET wrapper for working with the Internet Explorer's
-   JavaScript engines (JsRT version of Chakra, ActiveScript version of
-   Chakra and Classic JavaScript Engine).
+   This library is a .NET wrapper for working with the JavaScript engines
+   of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript
+   version of Chakra and Classic JavaScript Engine).
    Project was based on the code of SassAndCoffee.JavaScript
    (http://github.com/paulcbetts/SassAndCoffee) and Chakra Sample Hosts
    (http://github.com/panopticoncentral/chakra-host).
 
    =============
    RELEASE NOTES
    =============
-   Source code of the `ChakraJsRtJsEngine` was synchronized with the
-   Chakra Sample Hosts version of July 11, 2015.
+   1. Added support of “Edge” JsRT version of Chakra JavaScript engine;
+   2. `ChakraJsRt` mode was renamed to `ChakraIeJsRt`.
 
    ============
    PROJECT SITE

diff --git a/README.md b/README.md
@@ -3,15 +3,16 @@ MSIE JavaScript Engine for .NET
 
 ![MSIE JS Engine Logo](http://i.imgur.com/T3K5q.png)
 
-This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). 
+This project is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). 
 Project was based on the code of [SassAndCoffee.JavaScript](http://github.com/paulcbetts/SassAndCoffee) and [Chakra Sample Hosts](http://github.com/panopticoncentral/chakra-host).
 
-MSIE JavaScript Engine requires a installation of Internet Explorer on the machine and can work in 4 modes, that are defined in the `MsieJavaScriptEngine.JsEngineMode` enumeration:
+MSIE JavaScript Engine requires a installation of Internet Explorer or Edge on the machine and can work in 5 modes, that are defined in the `MsieJavaScriptEngine.JsEngineMode` enumeration:
 
  * `Auto`. Automatically selects the most modern JavaScript engine from available on the machine.
  * `Classic`. Classic MSIE JavaScript engine (supports ECMAScript 3 with possibility of using the ECMAScript 5 Polyfill and the JSON2 library). Requires Internet Explorer 6 or higher on the machine.
  * `ChakraActiveScript`. ActiveScript version of Chakra JavaScript engine (supports ECMAScript 5). Requires Internet Explorer 9 or higher on the machine.
- * `ChakraJsRt`. JsRT version of Chakra JavaScript engine (supports ECMAScript 5). Requires Internet Explorer 11 or higher on the machine. Detailed information about JsRT you can read in the [Paul Vick's blog](http://www.panopticoncentral.net/category/javascript/).
+ * `ChakraIeJsRt`. “Legacy” JsRT version of Chakra JavaScript engine (supports ECMAScript 5). Requires Internet Explorer 11 or higher on the machine.
+ * `ChakraEdgeJsRt`. “Edge” JsRT version of Chakra JavaScript engine (supports ECMAScript 5). Requires Microsoft Edge on the machine.
 
 The supported .NET types are as follows:
 
@@ -40,8 +41,12 @@ Consider a simple example of usage of the MSIE JavaScript Engine:
 			{
 				try
 				{
-					using (var jsEngine = new MsieJsEngine(engineMode: JsEngineMode.Auto, 
-						useEcmaScript5Polyfill: false, useJson2Library: false))
+					using (var jsEngine = new MsieJsEngine(new JsEngineSettings
+					{
+						EngineMode = JsEngineMode.Auto,
+						UseEcmaScript5Polyfill = false,
+						UseJson2Library = false
+					}))
 					{
 						const string expression = "7 * 8 - 20";
 						var result = jsEngine.Evaluate<int>(expression);

diff --git a/src/MsieJavaScriptEngine/Properties/AssemblyInfo.cs b/src/MsieJavaScriptEngine/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("ae6911c9-e2a9-4386-ab90-3722a9166564")]
 
-[assembly: AssemblyVersion("1.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 
 [module: DefaultCharSet(CharSet.Unicode)]
diff --git a/test/MsieJavaScriptEngine.Test.Auto/Properties/AssemblyInfo.cs b/test/MsieJavaScriptEngine.Test.Auto/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("e9baa5d3-59fe-4c0f-82ee-d415ffe53903")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/test/MsieJavaScriptEngine.Test.ChakraActiveScript/Properties/AssemblyInfo.cs b/test/MsieJavaScriptEngine.Test.ChakraActiveScript/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("34feac4f-a145-465e-aa36-0eceb5242dd4")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/Properties/AssemblyInfo.cs b/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("ebd8a69f-5bb3-47ab-9a8d-b8f35035c278")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/Properties/AssemblyInfo.cs b/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("2c54c249-206c-45f4-bd1b-6e67a07775af")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/test/MsieJavaScriptEngine.Test.Classic/Properties/AssemblyInfo.cs b/test/MsieJavaScriptEngine.Test.Classic/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("d0f98404-f422-4cab-82a7-6edfce1514d2")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/test/MsieJavaScriptEngine.Test.Common/Properties/AssemblyInfo.cs b/test/MsieJavaScriptEngine.Test.Common/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("dad7743e-f458-4009-b96d-26ebcf5146f0")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]