Skip to content

Commit ff539e3

Browse files
TaritsynTaritsyn
committed
Version 2.2.6
1 parent 20da404 commit ff539e3

File tree

19 files changed

+34
-49
lines changed

19 files changed

+34
-49
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Change log
22
==========
33

4+
## v2.2.6 - February 23, 2018
5+
* In JsRT modes during calling of the `CollectGarbage` method is no longer performed blocking
6+
47
## v2.2.5 - December 23, 2017
58
* Removed a redundant code
69
* Fixed a error, that occurred in the `Classic` mode during removing the embedded host objects and types

‎NuGet/MsieJavaScriptEngine.nuspec

+1-1
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>MsieJavaScriptEngine</id>
5-
<version>2.2.5</version>
5+
<version>2.2.6</version>
66
<title>MSIE JavaScript Engine for .NET</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>

‎NuGet/readme.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
--------------------------------------------------------------------------------
4-
README file for MSIE JavaScript Engine for .NET v2.2.5
4+
README file for MSIE JavaScript Engine for .NET v2.2.6
55

66
--------------------------------------------------------------------------------
77

‎src/MsieJavaScriptEngine/JsRt/Edge/EdgeJsErrorHelpers.cs

+4-13
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,6 @@ public static void ThrowIfError(JsErrorCode error)
8383
#region Script
8484

8585
case JsErrorCode.ScriptException:
86-
{
87-
EdgeJsValue errorObject;
88-
JsErrorCode innerError = EdgeNativeMethods.JsGetAndClearException(out errorObject);
89-
90-
if (innerError != JsErrorCode.NoError)
91-
{
92-
throw new JsFatalException(innerError);
93-
}
94-
95-
throw new EdgeJsScriptException(error, errorObject, "Script threw an exception.");
96-
}
97-
9886
case JsErrorCode.ScriptCompile:
9987
{
10088
EdgeJsValue errorObject;
@@ -105,7 +93,10 @@ public static void ThrowIfError(JsErrorCode error)
10593
throw new JsFatalException(innerError);
10694
}
10795

108-
throw new EdgeJsScriptException(error, errorObject, "Compile error.");
96+
string message = error == JsErrorCode.ScriptCompile ?
97+
"Compile error." : "Script threw an exception.";
98+
99+
throw new EdgeJsScriptException(error, errorObject, message);
109100
}
110101

111102
case JsErrorCode.ScriptTerminated:

‎src/MsieJavaScriptEngine/JsRt/Ie/IeJsErrorHelpers.cs

+4-13
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,6 @@ public static void ThrowIfError(JsErrorCode error)
8383
#region Script
8484

8585
case JsErrorCode.ScriptException:
86-
{
87-
IeJsValue errorObject;
88-
JsErrorCode innerError = IeNativeMethods.JsGetAndClearException(out errorObject);
89-
90-
if (innerError != JsErrorCode.NoError)
91-
{
92-
throw new JsFatalException(innerError);
93-
}
94-
95-
throw new IeJsScriptException(error, errorObject, "Script threw an exception.");
96-
}
97-
9886
case JsErrorCode.ScriptCompile:
9987
{
10088
IeJsValue errorObject;
@@ -105,7 +93,10 @@ public static void ThrowIfError(JsErrorCode error)
10593
throw new JsFatalException(innerError);
10694
}
10795

108-
throw new IeJsScriptException(error, errorObject, "Compile error.");
96+
string message = error == JsErrorCode.ScriptCompile ?
97+
"Compile error." : "Script threw an exception.";
98+
99+
throw new IeJsScriptException(error, errorObject, message);
109100
}
110101

111102
case JsErrorCode.ScriptTerminated:

‎src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.2.5</VersionPrefix>
4+
<VersionPrefix>2.2.6</VersionPrefix>
55
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
66
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
77
<OutputType>Library</OutputType>

‎src/MsieJavaScriptEngine/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
[assembly: Guid("ae6911c9-e2a9-4386-ab90-3722a9166564")]
1818
#endif
1919

20-
[assembly: AssemblyVersion("2.2.5.0")]
21-
[assembly: AssemblyFileVersion("2.2.5.0")]
20+
[assembly: AssemblyVersion("2.2.6.0")]
21+
[assembly: AssemblyFileVersion("2.2.6.0")]

‎test/MsieJavaScriptEngine.Test.Auto/MsieJavaScriptEngine.Test.Auto.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.2.5</VersionPrefix>
4+
<VersionPrefix>2.2.6</VersionPrefix>
55
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
66
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.9</RuntimeFrameworkVersion>
77
<OutputType>Exe</OutputType>

‎test/MsieJavaScriptEngine.Test.Auto/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
[assembly: Guid("e9baa5d3-59fe-4c0f-82ee-d415ffe53903")]
1818
#endif
1919

20-
[assembly: AssemblyVersion("2.2.5.0")]
21-
[assembly: AssemblyFileVersion("2.2.5.0")]
20+
[assembly: AssemblyVersion("2.2.6.0")]
21+
[assembly: AssemblyFileVersion("2.2.6.0")]

‎test/MsieJavaScriptEngine.Test.ChakraActiveScript/MsieJavaScriptEngine.Test.ChakraActiveScript.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.2.5</VersionPrefix>
4+
<VersionPrefix>2.2.6</VersionPrefix>
55
<TargetFramework>net451</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎test/MsieJavaScriptEngine.Test.ChakraActiveScript/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("34feac4f-a145-465e-aa36-0eceb5242dd4")]
1515

16-
[assembly: AssemblyVersion("2.2.5.0")]
17-
[assembly: AssemblyFileVersion("2.2.5.0")]
16+
[assembly: AssemblyVersion("2.2.6.0")]
17+
[assembly: AssemblyFileVersion("2.2.6.0")]

‎test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.2.5</VersionPrefix>
4+
<VersionPrefix>2.2.6</VersionPrefix>
55
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
66
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.9</RuntimeFrameworkVersion>
77
<OutputType>Exe</OutputType>

‎test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
[assembly: Guid("ebd8a69f-5bb3-47ab-9a8d-b8f35035c278")]
1818
#endif
1919

20-
[assembly: AssemblyVersion("2.2.5.0")]
21-
[assembly: AssemblyFileVersion("2.2.5.0")]
20+
[assembly: AssemblyVersion("2.2.6.0")]
21+
[assembly: AssemblyFileVersion("2.2.6.0")]

‎test/MsieJavaScriptEngine.Test.ChakraIeJsRt/MsieJavaScriptEngine.Test.ChakraIeJsRt.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.2.5</VersionPrefix>
4+
<VersionPrefix>2.2.6</VersionPrefix>
55
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
66
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.9</RuntimeFrameworkVersion>
77
<OutputType>Exe</OutputType>

‎test/MsieJavaScriptEngine.Test.ChakraIeJsRt/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
[assembly: Guid("2c54c249-206c-45f4-bd1b-6e67a07775af")]
1818
#endif
1919

20-
[assembly: AssemblyVersion("2.2.5.0")]
21-
[assembly: AssemblyFileVersion("2.2.5.0")]
20+
[assembly: AssemblyVersion("2.2.6.0")]
21+
[assembly: AssemblyFileVersion("2.2.6.0")]

‎test/MsieJavaScriptEngine.Test.Classic/MsieJavaScriptEngine.Test.Classic.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.2.5</VersionPrefix>
4+
<VersionPrefix>2.2.6</VersionPrefix>
55
<TargetFramework>net451</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎test/MsieJavaScriptEngine.Test.Classic/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("d0f98404-f422-4cab-82a7-6edfce1514d2")]
1515

16-
[assembly: AssemblyVersion("2.2.5.0")]
17-
[assembly: AssemblyFileVersion("2.2.5.0")]
16+
[assembly: AssemblyVersion("2.2.6.0")]
17+
[assembly: AssemblyFileVersion("2.2.6.0")]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.2.5</VersionPrefix>
4+
<VersionPrefix>2.2.6</VersionPrefix>
55
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
66
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.9</RuntimeFrameworkVersion>
77
<OutputType>Exe</OutputType>

‎test/MsieJavaScriptEngine.Test.Common/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
[assembly: Guid("dad7743e-f458-4009-b96d-26ebcf5146f0")]
1818
#endif
1919

20-
[assembly: AssemblyVersion("2.2.5.0")]
21-
[assembly: AssemblyFileVersion("2.2.5.0")]
20+
[assembly: AssemblyVersion("2.2.6.0")]
21+
[assembly: AssemblyFileVersion("2.2.6.0")]

0 commit comments

Comments
 (0)