Skip to content

Commit c204653

Browse files
TaritsynTaritsyn
committed
Version 0.9.5.0:
1. In JavaScriptEngineSwitcher.V8 the Noesis Javascript .NET was replaced by the Microsoft ClearScript.V8 library (solves a problem of `V8JsEngine` stable work on 64-bit version of IIS 8.X); 2. In JavaScriptEngineSwitcher.Jurassic added support of Jurassic version of September 30 2013.
1 parent 64a2657 commit c204653

File tree

30 files changed

+91
-103
lines changed

30 files changed

+91
-103
lines changed

‎Binaries/Jurassic/Jurassic.dll‎

342 KB
Binary file not shown.

‎Binaries/Jurassic/License.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Microsoft Public License (Ms-PL)
2+
3+
This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
4+
5+
1. Definitions
6+
7+
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
8+
9+
A "contribution" is the original software, or any additions or changes to the software.
10+
11+
A "contributor" is any person that distributes its contribution under this license.
12+
13+
"Licensed patents" are a contributor's patent claims that read directly on its contribution.
14+
15+
2. Grant of Rights
16+
17+
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
18+
19+
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
20+
21+
3. Conditions and Limitations
22+
23+
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
24+
25+
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
26+
27+
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
28+
29+
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
30+
31+
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

‎JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
<Reference Include="System" />
4040
<Reference Include="System.configuration" />
4141
<Reference Include="System.Core" />
42-
<Reference Include="System.Xml.Linq" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Xml" />
4542
</ItemGroup>
4643
<ItemGroup>
4744
<Compile Include="Configuration\CoreConfiguration.cs" />

‎JavaScriptEngineSwitcher.Core/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("9f7e9fff-da85-4609-8bee-bdead5a3afe2")]
1515

16-
[assembly: AssemblyVersion("0.9.2.0")]
17-
[assembly: AssemblyFileVersion("0.9.2.0")]
16+
[assembly: AssemblyVersion("0.9.5.0")]
17+
[assembly: AssemblyFileVersion("0.9.5.0")]

‎JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,34 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<PropertyGroup>
33-
<SignAssembly>false</SignAssembly>
33+
<SignAssembly>true</SignAssembly>
3434
</PropertyGroup>
3535
<PropertyGroup>
3636
<AssemblyOriginatorKeyFile>..\JavaScriptEngineSwitcher.snk</AssemblyOriginatorKeyFile>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Jurassic">
40-
<HintPath>..\packages\Jurassic.2.1.1\lib\Jurassic.dll</HintPath>
39+
<Reference Include="Jurassic, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<SpecificVersion>False</SpecificVersion>
41+
<HintPath>..\Binaries\Jurassic\Jurassic.dll</HintPath>
4142
</Reference>
4243
<Reference Include="System" />
4344
<Reference Include="System.Core" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Xml" />
4945
</ItemGroup>
5046
<ItemGroup>
5147
<Compile Include="JurassicJsEngine.cs" />
5248
<Compile Include="Properties\AssemblyInfo.cs" />
5349
</ItemGroup>
54-
<ItemGroup>
55-
<None Include="packages.config" />
56-
</ItemGroup>
5750
<ItemGroup>
5851
<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj">
5952
<Project>{5c903eef-bad1-43b8-bfe2-e4ee4d204410}</Project>
6053
<Name>JavaScriptEngineSwitcher.Core</Name>
6154
</ProjectReference>
6255
</ItemGroup>
56+
<ItemGroup>
57+
<None Include="..\JavaScriptEngineSwitcher.snk">
58+
<Link>JavaScriptEngineSwitcher.snk</Link>
59+
</None>
60+
</ItemGroup>
6361
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6462
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6563
Other similar extension points exist, see Microsoft.Common.targets.

‎JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public sealed class JurassicJsEngine : JsEngineBase
2121
/// <summary>
2222
/// Jurassic JS engine
2323
/// </summary>
24-
private readonly OriginalJsEngine _jsEngine;
24+
private OriginalJsEngine _jsEngine;
2525

2626

2727
/// <summary>
@@ -213,19 +213,16 @@ protected override void InnerSetVariableValue(string variableName, object value)
213213

214214
protected override void InnerRemoveVariable(string variableName)
215215
{
216-
try
217-
{
218-
_jsEngine.SetGlobalValue(variableName, OriginalUndefined.Value);
219-
}
220-
catch (OriginJsException e)
221-
{
222-
throw ConvertJavascriptExceptionToJsRuntimeException(e);
223-
}
216+
string code = string.Format(@"if (typeof {0} !== 'undefined') {{
217+
{0} = undefined;
218+
}}", variableName);
219+
220+
InnerExecute(code);
224221
}
225222

226223
public override void Dispose()
227224
{
228-
// Not used
225+
_jsEngine = null;
229226
}
230227
}
231228
}

‎JavaScriptEngineSwitcher.Jurassic/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("1e4eb77e-0771-4109-832f-20e3475315ed")]
1515

16-
[assembly: AssemblyVersion("0.9.2.0")]
17-
[assembly: AssemblyFileVersion("0.9.2.0")]
16+
[assembly: AssemblyVersion("0.9.5.0")]
17+
[assembly: AssemblyFileVersion("0.9.5.0")]

‎JavaScriptEngineSwitcher.Jurassic/packages.config‎

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

‎JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.Core" />
45-
<Reference Include="System.Xml.Linq" />
46-
<Reference Include="System.Data.DataSetExtensions" />
47-
<Reference Include="Microsoft.CSharp" />
48-
<Reference Include="System.Data" />
49-
<Reference Include="System.Xml" />
5045
</ItemGroup>
5146
<ItemGroup>
5247
<Compile Include="MsieJsEngine.cs" />

‎JavaScriptEngineSwitcher.Msie/MsieJsEngine.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public sealed class MsieJsEngine : JsEngineBase
1717
/// <summary>
1818
/// MSIE JS engine
1919
/// </summary>
20-
private readonly OriginalJsEngine _jsEngine;
20+
private OriginalJsEngine _jsEngine;
2121

2222
/// <summary>
2323
/// Flag that object is destroyed
@@ -219,6 +219,7 @@ public override void Dispose()
219219
if (_jsEngine != null)
220220
{
221221
_jsEngine.Dispose();
222+
_jsEngine = null;
222223
}
223224
}
224225
}

0 commit comments

Comments
 (0)