Skip to content

Commit 23955fe

Browse files
TaritsynTaritsyn
committed
Merge branch '2.0'
2 parents 671da2a + ff2ae33 commit 23955fe

File tree

203 files changed

+6878
-1830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+6878
-1830
lines changed

‎.nuget/NuGet.exe‎

2.19 MB
Binary file not shown.

‎Binaries/Microsoft Ajax Minifier/AjaxMinifier.exe‎

-603 KB
Binary file not shown.

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
Change log
22
==========
33

4+
## September 19, 2016 - v2.0.0
5+
* Added support of .NET Core 1.0.1 (only supported `ChakraIeJsRt` and `ChakraEdgeJsRt` modes) and .NET Framework 4.5.1
6+
* Added the `CollectGarbage` method
7+
8+
## September 17, 2016 - v2.0.0 Beta 2
9+
* Added support of .NET Core 1.0.1
10+
11+
## September 9, 2016 - v2.0.0 Beta 1
12+
* Added the `CollectGarbage` method
13+
14+
## September 3, 2016 - v2.0.0 Alpha 1
15+
* Added support of .NET Core 1.0 (only supported `ChakraIeJsRt` and `ChakraEdgeJsRt` modes) and .NET Framework 4.5.1
16+
417
## August 17, 2016 - v1.7.2
518
* An attempt was made to prevent occurrence of the access violation exception in the `CallFunction` method
619

‎Licenses/bundler-and-minifier-license.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2015 Mads Kristensen
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

‎Licenses/cross-browser-split-license.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Cross-Browser Split 1.1.1
2+
Copyright 2007-2012 Steven Levithan <stevenlevithan.com>
3+
Available under the MIT License
4+
ECMAScript compliant, uniform cross-browser split method

‎Licenses/jsrt-dotnet-license.txt‎

Lines changed: 21 additions & 0 deletions
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.

‎Licenses/microsoft-ajax-minifier-license.txt‎

Lines changed: 0 additions & 140 deletions
This file was deleted.

‎MsieJavaScriptEngine.DotNet.sln‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4BC3AE92-2685-4223-AA35-097A54C5FBEA}"
7+
ProjectSection(SolutionItems) = preProject
8+
global.json = global.json
9+
EndProjectSection
10+
EndProject
11+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{262F5A48-E8AC-41F1-9FC6-4DA3785CCD93}"
12+
EndProject
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1F9B41F3-53ED-4254-98B7-F4309EA0D53E}"
14+
EndProject
15+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFiles", "SharedFiles", "{E3F8640B-91D8-4BBE-B807-D69D1DE0D818}"
16+
ProjectSection(SolutionItems) = preProject
17+
test\SharedFiles\link.txt = test\SharedFiles\link.txt
18+
test\SharedFiles\square.js = test\SharedFiles\square.js
19+
EndProjectSection
20+
EndProject
21+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MsieJavaScriptEngine", "src\MsieJavaScriptEngine\MsieJavaScriptEngine.xproj", "{3C9CD486-50AD-476E-9515-3F85EBAFCC38}"
22+
EndProject
23+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MsieJavaScriptEngine.Test.Common", "test\MsieJavaScriptEngine.Test.Common\MsieJavaScriptEngine.Test.Common.xproj", "{6E4AF7B9-3257-4D35-8F5C-CBA1A7158CAB}"
24+
EndProject
25+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MsieJavaScriptEngine.Test.Auto", "test\MsieJavaScriptEngine.Test.Auto\MsieJavaScriptEngine.Test.Auto.xproj", "{3DD423C5-DC32-42D4-9924-B5D8C2F23195}"
26+
EndProject
27+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MsieJavaScriptEngine.Test.ChakraEdgeJsRt", "test\MsieJavaScriptEngine.Test.ChakraEdgeJsRt\MsieJavaScriptEngine.Test.ChakraEdgeJsRt.xproj", "{56218CBF-F251-4A3A-A50F-7C3FCC9258F6}"
28+
EndProject
29+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MsieJavaScriptEngine.Test.ChakraIeJsRt", "test\MsieJavaScriptEngine.Test.ChakraIeJsRt\MsieJavaScriptEngine.Test.ChakraIeJsRt.xproj", "{5864D57D-2EB8-4684-9908-26111127E75B}"
30+
EndProject
31+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MsieJavaScriptEngine.Test.ChakraActiveScript", "test\MsieJavaScriptEngine.Test.ChakraActiveScript\MsieJavaScriptEngine.Test.ChakraActiveScript.xproj", "{EF54F02A-7ECD-4D3E-9163-33BCA969FD1B}"
32+
EndProject
33+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MsieJavaScriptEngine.Test.Classic", "test\MsieJavaScriptEngine.Test.Classic\MsieJavaScriptEngine.Test.Classic.xproj", "{72233C70-DF61-449F-8D53-D456284CDA5D}"
34+
EndProject
35+
Global
36+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
37+
Debug|Any CPU = Debug|Any CPU
38+
Release|Any CPU = Release|Any CPU
39+
EndGlobalSection
40+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
41+
{3C9CD486-50AD-476E-9515-3F85EBAFCC38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{3C9CD486-50AD-476E-9515-3F85EBAFCC38}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{3C9CD486-50AD-476E-9515-3F85EBAFCC38}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{3C9CD486-50AD-476E-9515-3F85EBAFCC38}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{6E4AF7B9-3257-4D35-8F5C-CBA1A7158CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{6E4AF7B9-3257-4D35-8F5C-CBA1A7158CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{6E4AF7B9-3257-4D35-8F5C-CBA1A7158CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{6E4AF7B9-3257-4D35-8F5C-CBA1A7158CAB}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{3DD423C5-DC32-42D4-9924-B5D8C2F23195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{3DD423C5-DC32-42D4-9924-B5D8C2F23195}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{3DD423C5-DC32-42D4-9924-B5D8C2F23195}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{3DD423C5-DC32-42D4-9924-B5D8C2F23195}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{EF54F02A-7ECD-4D3E-9163-33BCA969FD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{EF54F02A-7ECD-4D3E-9163-33BCA969FD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{EF54F02A-7ECD-4D3E-9163-33BCA969FD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{EF54F02A-7ECD-4D3E-9163-33BCA969FD1B}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{56218CBF-F251-4A3A-A50F-7C3FCC9258F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{56218CBF-F251-4A3A-A50F-7C3FCC9258F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{56218CBF-F251-4A3A-A50F-7C3FCC9258F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{56218CBF-F251-4A3A-A50F-7C3FCC9258F6}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{5864D57D-2EB8-4684-9908-26111127E75B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{5864D57D-2EB8-4684-9908-26111127E75B}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{5864D57D-2EB8-4684-9908-26111127E75B}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{5864D57D-2EB8-4684-9908-26111127E75B}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{72233C70-DF61-449F-8D53-D456284CDA5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{72233C70-DF61-449F-8D53-D456284CDA5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{72233C70-DF61-449F-8D53-D456284CDA5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{72233C70-DF61-449F-8D53-D456284CDA5D}.Release|Any CPU.Build.0 = Release|Any CPU
69+
EndGlobalSection
70+
GlobalSection(SolutionProperties) = preSolution
71+
HideSolutionNode = FALSE
72+
EndGlobalSection
73+
GlobalSection(NestedProjects) = preSolution
74+
{3C9CD486-50AD-476E-9515-3F85EBAFCC38} = {262F5A48-E8AC-41F1-9FC6-4DA3785CCD93}
75+
{6E4AF7B9-3257-4D35-8F5C-CBA1A7158CAB} = {1F9B41F3-53ED-4254-98B7-F4309EA0D53E}
76+
{3DD423C5-DC32-42D4-9924-B5D8C2F23195} = {1F9B41F3-53ED-4254-98B7-F4309EA0D53E}
77+
{EF54F02A-7ECD-4D3E-9163-33BCA969FD1B} = {1F9B41F3-53ED-4254-98B7-F4309EA0D53E}
78+
{56218CBF-F251-4A3A-A50F-7C3FCC9258F6} = {1F9B41F3-53ED-4254-98B7-F4309EA0D53E}
79+
{5864D57D-2EB8-4684-9908-26111127E75B} = {1F9B41F3-53ED-4254-98B7-F4309EA0D53E}
80+
{72233C70-DF61-449F-8D53-D456284CDA5D} = {1F9B41F3-53ED-4254-98B7-F4309EA0D53E}
81+
{E3F8640B-91D8-4BBE-B807-D69D1DE0D818} = {1F9B41F3-53ED-4254-98B7-F4309EA0D53E}
82+
EndGlobalSection
83+
EndGlobal

0 commit comments

Comments
 (0)