Skip to content

Commit 927ae04

Browse files
committed
Version 2.0.0 Beta 2
1 parent 00b3ca6 commit 927ae04

File tree

9 files changed

+30
-32
lines changed

9 files changed

+30
-32
lines changed

CHANGELOG.md

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

4+
## September 17, 2016 - v2.0.0 Beta 2
5+
* Added support of .NET Core 1.0.1
6+
47
## September 9, 2016 - v2.0.0 Beta 1
58
* Added the `CollectGarbage` method
69

NuGet/MsieJavaScriptEngine.nuspec

+2-2
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.0.0-beta1</version>
5+
<version>2.0.0-beta2</version>
66
<title>MSIE JavaScript Engine for .NET</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>
@@ -12,7 +12,7 @@
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>Added the `CollectGarbage` method.</releaseNotes>
15+
<releaseNotes>Added support of .NET Core 1.0.1.</releaseNotes>
1616
<copyright>Copyright (c) 2012-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1717
<language>en-US</language>
1818
<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>

NuGet/readme.txt

+2-2
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.0.0 Beta 1
4+
README file for MSIE JavaScript Engine for .NET v2.0.0 Beta 2
55

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

@@ -21,7 +21,7 @@
2121
=============
2222
RELEASE NOTES
2323
=============
24-
Added the `CollectGarbage` method.
24+
Added support of .NET Core 1.0.1.
2525

2626
============
2727
PROJECT SITE

build.cmd

+1-1
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=preview
6-
set KOREBUILD_DOTNET_VERSION=1.0.0-preview2-003121
6+
set KOREBUILD_DOTNET_VERSION=1.0.0-preview2-003131
77

88
cd %~dp0
99

build.sh

+1-1
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=preview
4-
KOREBUILD_DOTNET_VERSION=1.0.0-preview2-003121
4+
KOREBUILD_DOTNET_VERSION=1.0.0-preview2-003131
55

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

src/MsieJavaScriptEngine/JsRt/Edge/ChakraEdgeJsRtJsEngine.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ public ChakraEdgeJsRtJsEngine(bool enableDebugging)
102102
/// <returns>Instance of JavaScript runtime with special settings</returns>
103103
private static EdgeJsRuntime CreateJsRuntime()
104104
{
105-
var jsRuntime = EdgeJsRuntime.Create(JsRuntimeAttributes.AllowScriptInterrupt, null);
106-
107-
return jsRuntime;
105+
return EdgeJsRuntime.Create(JsRuntimeAttributes.None, null);
108106
}
109107

110108
/// <summary>

src/MsieJavaScriptEngine/JsRt/Edge/EdgeJsRuntime.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,10 @@ public bool Disabled
101101
/// <summary>
102102
/// Creates a new runtime
103103
/// </summary>
104-
/// <param name="attributes">The attributes of the runtime to be created</param>
105-
/// <param name="threadServiceCallback">The thread service for the runtime. Can be null</param>
106104
/// <returns>The runtime created</returns>
107-
public static EdgeJsRuntime Create(JsRuntimeAttributes attributes, JsThreadServiceCallback threadServiceCallback)
105+
public static EdgeJsRuntime Create()
108106
{
109-
EdgeJsRuntime handle;
110-
EdgeJsErrorHelpers.ThrowIfError(EdgeNativeMethods.JsCreateRuntime(attributes, threadServiceCallback, out handle));
111-
112-
return handle;
107+
return Create(JsRuntimeAttributes.None, null);
113108
}
114109

115110
/// <summary>
@@ -125,10 +120,15 @@ public static EdgeJsRuntime Create(JsRuntimeAttributes attributes)
125120
/// <summary>
126121
/// Creates a new runtime
127122
/// </summary>
123+
/// <param name="attributes">The attributes of the runtime to be created</param>
124+
/// <param name="threadServiceCallback">The thread service for the runtime. Can be null</param>
128125
/// <returns>The runtime created</returns>
129-
public static EdgeJsRuntime Create()
126+
public static EdgeJsRuntime Create(JsRuntimeAttributes attributes, JsThreadServiceCallback threadServiceCallback)
130127
{
131-
return Create(JsRuntimeAttributes.None, null);
128+
EdgeJsRuntime handle;
129+
EdgeJsErrorHelpers.ThrowIfError(EdgeNativeMethods.JsCreateRuntime(attributes, threadServiceCallback, out handle));
130+
131+
return handle;
132132
}
133133

134134
/// <summary>

src/MsieJavaScriptEngine/JsRt/Ie/ChakraIeJsRtJsEngine.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@ public ChakraIeJsRtJsEngine(bool enableDebugging)
109109
/// <returns>Instance of JavaScript runtime with special settings</returns>
110110
private static IeJsRuntime CreateJsRuntime()
111111
{
112-
var jsRuntime = IeJsRuntime.Create(JsRuntimeAttributes.AllowScriptInterrupt,
113-
JsRuntimeVersion.VersionEdge, null);
114-
115-
return jsRuntime;
112+
return IeJsRuntime.Create(JsRuntimeAttributes.None, JsRuntimeVersion.VersionEdge, null);
116113
}
117114

118115
/// <summary>

src/MsieJavaScriptEngine/JsRt/Ie/IeJsRuntime.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,10 @@ public bool Disabled
103103
/// <summary>
104104
/// Creates a new runtime
105105
/// </summary>
106-
/// <param name="attributes">The attributes of the runtime to be created</param>
107-
/// <param name="version">The version of the runtime to be created</param>
108-
/// <param name="threadServiceCallback">The thread service for the runtime. Can be null.</param>
109106
/// <returns>The runtime created</returns>
110-
public static IeJsRuntime Create(JsRuntimeAttributes attributes, JsRuntimeVersion version, JsThreadServiceCallback threadServiceCallback)
107+
public static IeJsRuntime Create()
111108
{
112-
IeJsRuntime handle;
113-
IeJsErrorHelpers.ThrowIfError(IeNativeMethods.JsCreateRuntime(attributes, version, threadServiceCallback, out handle));
114-
115-
return handle;
109+
return Create(JsRuntimeAttributes.None, JsRuntimeVersion.Version11, null);
116110
}
117111

118112
/// <summary>
@@ -129,10 +123,16 @@ public static IeJsRuntime Create(JsRuntimeAttributes attributes, JsRuntimeVersio
129123
/// <summary>
130124
/// Creates a new runtime
131125
/// </summary>
126+
/// <param name="attributes">The attributes of the runtime to be created</param>
127+
/// <param name="version">The version of the runtime to be created</param>
128+
/// <param name="threadServiceCallback">The thread service for the runtime. Can be null.</param>
132129
/// <returns>The runtime created</returns>
133-
public static IeJsRuntime Create()
130+
public static IeJsRuntime Create(JsRuntimeAttributes attributes, JsRuntimeVersion version, JsThreadServiceCallback threadServiceCallback)
134131
{
135-
return Create(JsRuntimeAttributes.None, JsRuntimeVersion.Version11, null);
132+
IeJsRuntime handle;
133+
IeJsErrorHelpers.ThrowIfError(IeNativeMethods.JsCreateRuntime(attributes, version, threadServiceCallback, out handle));
134+
135+
return handle;
136136
}
137137

138138
/// <summary>

0 commit comments

Comments
 (0)