Skip to content

Commit 7476222

Browse files
TaritsynTaritsyn
committed
Version 2.0.0 Alpha 1
1 parent 13f4e8d commit 7476222

File tree

9 files changed

+108
-227
lines changed

9 files changed

+108
-227
lines changed

‎.nuget/NuGet.exe

2.19 MB
Binary file not shown.

‎CHANGELOG.md

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

4+
## September 3, 2016 - v2.0.0 Alpha 1
5+
* Added support of .NET Core 1.0 (only supported `ChakraIeJsRt` and `ChakraEdgeJsRt` modes) and .NET Framework 4.5.1
6+
47
## August 17, 2016 - v1.7.2
58
* An attempt was made to prevent occurrence of the access violation exception in the `CallFunction` method
69

‎Licenses/chakra-sample-hosts-license.txt

-201
This file was deleted.

‎Licenses/jsrt-dotnet-license.txt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Rob Paveza
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎NuGet/MsieJavaScriptEngine.nuspec

+29-9
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,50 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>MsieJavaScriptEngine</id>
5-
<version>1.7.2</version>
5+
<version>2.0.0-alpha1</version>
66
<title>MSIE JavaScript Engine for .NET</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>
99
<licenseUrl>http://github.com/Taritsyn/MsieJavaScriptEngine/blob/master/LICENSE.md</licenseUrl>
1010
<projectUrl>http://github.com/Taritsyn/MsieJavaScriptEngine</projectUrl>
1111
<iconUrl>http://i.imgur.com/cbiHK.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<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>
13+
<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>An attempt was made to prevent occurrence of the access violation exception in the `CallFunction` method.</releaseNotes>
15+
<releaseNotes>Added support of .NET Core 1.0 (only supported `ChakraIeJsRt` and `ChakraEdgeJsRt` modes) and .NET Framework 4.5.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>
19+
<dependencies>
20+
<group targetFramework=".NETFramework4.0-Client" />
21+
<group targetFramework=".NETFramework4.5.1" />
22+
<group targetFramework=".NETStandard1.3">
23+
<dependency id="System.Collections" version="4.0.11" />
24+
<dependency id="System.ComponentModel.TypeConverter" version="4.1.0" />
25+
<dependency id="System.Diagnostics.Tools" version="4.0.1" />
26+
<dependency id="System.Globalization" version="4.0.11" />
27+
<dependency id="System.IO" version="4.1.0" />
28+
<dependency id="System.IO.FileSystem" version="4.0.1" />
29+
<dependency id="System.Linq" version="4.1.0" />
30+
<dependency id="System.Reflection" version="4.1.0" />
31+
<dependency id="System.Reflection.Extensions" version="4.0.1" />
32+
<dependency id="System.Reflection.TypeExtensions" version="4.1.0" />
33+
<dependency id="System.Resources.ResourceManager" version="4.0.1" />
34+
<dependency id="System.Runtime.Extensions" version="4.1.0" />
35+
<dependency id="System.Runtime.InteropServices" version="4.1.0" />
36+
<dependency id="System.Text.Encoding" version="4.0.11" />
37+
<dependency id="System.Text.RegularExpressions" version="4.1.0" />
38+
<dependency id="System.Threading" version="4.0.11" />
39+
</group>
40+
</dependencies>
41+
<frameworkAssemblies>
42+
<frameworkAssembly assemblyName="WindowsBase" targetFramework=".NETFramework4.5.1" />
43+
</frameworkAssemblies>
1944
<references>
2045
<reference file="MsieJavaScriptEngine.dll" />
2146
</references>
2247
</metadata>
2348
<files>
24-
<file src="..\src\MsieJavaScriptEngine\bin\Release\MsieJavaScriptEngine.dll" target="lib\net40-client" />
25-
<file src="..\src\MsieJavaScriptEngine\bin\Release\**\MsieJavaScriptEngine.resources.dll" target="lib\net40-client" />
26-
<file src="readme.txt" />
27-
<file src="..\Licenses\sass-and-coffee-license.txt" />
28-
<file src="..\Licenses\chakra-host-license.txt" />
29-
<file src="..\Licenses\microsoft-ajax-minifier-license.txt" />
49+
<file src="**\*.*" exclude="build-package.cmd" />
3050
</files>
3151
</package>

‎NuGet/build-package.cmd

+37-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,37 @@
1-
\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\MsieJavaScriptEngine\MsieJavaScriptEngine.csproj /p:Configuration=Release
2-
..\.nuget\nuget.exe pack MsieJavaScriptEngine.nuspec
1+
set project_name=MsieJavaScriptEngine
2+
set project_source_dir=..\src\%project_name%
3+
set project_bin_dir=%project_source_dir%\bin\Release
4+
set licenses_dir=..\Licenses
5+
set net40_msbuild="\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
6+
set dotnet_cli="%ProgramFiles%\dotnet\dotnet.exe"
7+
set nuget_package_manager=..\.nuget\nuget.exe
8+
9+
rmdir lib /Q/S
10+
11+
del sass-and-coffee-license.txt /Q/S
12+
del chakra-host-license.txt /Q/S
13+
del jsrt-dotnet-license.txt /Q/S
14+
del cross-browser-split-license.txt /Q/S
15+
del bundler-and-minifier-license.txt /Q/S
16+
17+
%net40_msbuild% "%project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
18+
xcopy "%project_bin_dir%\%project_name%.dll" lib\net40-client\
19+
xcopy "%project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
20+
21+
%dotnet_cli% build "%project_source_dir%" --framework net451 --configuration Release --no-dependencies --no-incremental
22+
xcopy "%project_bin_dir%\net451\%project_name%.dll" lib\net451\
23+
xcopy "%project_bin_dir%\net451\%project_name%.xml" lib\net451\
24+
xcopy "%project_bin_dir%\net451\ru-ru\%project_name%.resources.dll" lib\net451\ru-ru\
25+
26+
%dotnet_cli% build "%project_source_dir%" --framework netstandard1.3 --configuration Release --no-dependencies --no-incremental
27+
xcopy "%project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstandard1.3\
28+
xcopy "%project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
29+
xcopy "%project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
30+
31+
copy "%licenses_dir%\sass-and-coffee-license.txt" sass-and-coffee-license.txt /Y
32+
copy "%licenses_dir%\chakra-host-license.txt" chakra-host-license.txt /Y
33+
copy "%licenses_dir%\jsrt-dotnet-license.txt" jsrt-dotnet-license.txt /Y
34+
copy "%licenses_dir%\cross-browser-split-license.txt" cross-browser-split-license.txt /Y
35+
copy "%licenses_dir%\bundler-and-minifier-license.txt" bundler-and-minifier-license.txt /Y
36+
37+
%nuget_package_manager% pack "%project_name%.nuspec"

0 commit comments

Comments
 (0)