Skip to content

Commit 20da404

Browse files
TaritsynTaritsyn
committed
In JsRT modes during calling of the CollectGarbage method is no longer performed blocking
1 parent 2e65b63 commit 20da404

File tree

19 files changed

+22
-27
lines changed

19 files changed

+22
-27
lines changed

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru
1+
Copyright (c) 2012-2018 Andrey Taritsyn - http://www.taritsyn.ru
22

33
Apache License
44
Version 2.0, January 2004

‎NuGet/MsieJavaScriptEngine.nuspec‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<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), Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host) and jsrt-dotnet (http://github.com/robpaveza/jsrt-dotnet).</description>
1414
<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>
15-
<releaseNotes>1. Removed a redundant code;
16-
2. Fixed a error, that occurred in the `Classic` mode during removing the embedded host objects and types;
17-
3. Fixed a error, that occurred during finding the suitable method overload, that receives numeric values and interfaces as parameters, of the host object.</releaseNotes>
18-
<copyright>Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
15+
<releaseNotes>In JsRT modes during calling of the `CollectGarbage` method is no longer performed blocking.</releaseNotes>
16+
<copyright>Copyright (c) 2012-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1917
<language>en-US</language>
2018
<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>
2119
<dependencies>

‎NuGet/readme.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru
8+
Copyright (c) 2012-2018 Andrey Taritsyn - http://www.taritsyn.ru
99

1010

1111
===========
@@ -21,11 +21,8 @@
2121
=============
2222
RELEASE NOTES
2323
=============
24-
1. Removed a redundant code;
25-
2. Fixed a error, that occurred in the `Classic` mode during removing the
26-
embedded host objects and types;
27-
3. Fixed a error, that occurred during finding the suitable method overload,
28-
that receives numeric values and interfaces as parameters, of the host object.
24+
In JsRT modes during calling of the `CollectGarbage` method is no longer
25+
performed blocking.
2926

3027
============
3128
PROJECT SITE

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
setlocal
44
set ORIGINAL_CURRENT_DIR=%cd%
55
set KOREBUILD_DOTNET_CHANNEL=rel-1.0.0
6-
set KOREBUILD_DOTNET_VERSION=1.1.5
6+
set KOREBUILD_DOTNET_VERSION=1.1.7
77

88
cd %~dp0
99

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
ORIGINAL_CURRENT_DIR=%cd%
33
KOREBUILD_DOTNET_CHANNEL=rel-1.0.0
4-
KOREBUILD_DOTNET_VERSION=1.1.5
4+
KOREBUILD_DOTNET_VERSION=1.1.7
55

66
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
77
cd $repoFolder

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "1.1.5"
3+
"version": "1.1.7"
44
}
55
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ public override void EmbedHostType(string itemName, Type type)
11591159

11601160
public override void CollectGarbage()
11611161
{
1162-
_dispatcher.Invoke(() => _jsRuntime.CollectGarbage());
1162+
_jsRuntime.CollectGarbage();
11631163
}
11641164

11651165
#endregion

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ public override void EmbedHostType(string itemName, Type type)
11971197

11981198
public override void CollectGarbage()
11991199
{
1200-
_dispatcher.Invoke(() => _jsRuntime.CollectGarbage());
1200+
_jsRuntime.CollectGarbage();
12011201
}
12021202

12031203
#endregion

‎src/MsieJavaScriptEngine/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfiguration("")]
99
[assembly: AssemblyCompany("")]
1010
[assembly: AssemblyProduct("MSIE JavaScript Engine")]
11-
[assembly: AssemblyCopyright("Copyright © 2012-2017 Andrey Taritsyn")]
11+
[assembly: AssemblyCopyright("Copyright © 2012-2018 Andrey Taritsyn")]
1212
[assembly: AssemblyTrademark("")]
1313
[assembly: AssemblyCulture("")]
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<VersionPrefix>2.2.5</VersionPrefix>
55
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
6-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.8</RuntimeFrameworkVersion>
6+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.9</RuntimeFrameworkVersion>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99

0 commit comments

Comments
 (0)