Skip to content

Commit 14c22a9

Browse files
committed
In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 2.2.5
1 parent 381b81f commit 14c22a9

File tree

6 files changed

+71
-9
lines changed

6 files changed

+71
-9
lines changed

NuGet/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>JavaScriptEngineSwitcher.Msie contains adapter `MsieJsEngine` (wrapper for the MSIE JavaScript Engine for .Net (http://github.com/Taritsyn/MsieJavaScriptEngine)). For correct working of the MSIE JavaScript Engine it is recommended to install Internet Explorer 9+ or Microsoft Edge on the machine.</description>
1414
<summary>JavaScriptEngineSwitcher.Msie contains adapter `MsieJsEngine` (wrapper for the MSIE JavaScript Engine for .Net).</summary>
15-
<releaseNotes>Added support of MSIE JavaScript Engine version 2.2.3.</releaseNotes>
15+
<releaseNotes>Added support of MSIE JavaScript Engine version 2.2.5.</releaseNotes>
1616
<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1717
<language>en-US</language>
1818
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript MSIE IE Chakra</tags>
1919
<dependencies>
2020
<group targetFramework=".NETFramework4.0-Client">
21-
<dependency id="MsieJavaScriptEngine" version="2.2.3" />
21+
<dependency id="MsieJavaScriptEngine" version="2.2.5" />
2222
<dependency id="JavaScriptEngineSwitcher.Core" version="2.4.10" />
2323
</group>
2424
<group targetFramework=".NETFramework4.5">
25-
<dependency id="MsieJavaScriptEngine" version="2.2.3" />
25+
<dependency id="MsieJavaScriptEngine" version="2.2.5" />
2626
<dependency id="JavaScriptEngineSwitcher.Core" version="2.4.10" />
2727
</group>
2828
<group targetFramework=".NETStandard1.3">
2929
<dependency id="NETStandard.Library" version="1.6.0" />
30-
<dependency id="MsieJavaScriptEngine" version="2.2.3" />
30+
<dependency id="MsieJavaScriptEngine" version="2.2.5" />
3131
<dependency id="JavaScriptEngineSwitcher.Core" version="2.4.10" />
3232
</group>
3333
</dependencies>

NuGet/JavaScriptEngineSwitcher.Msie/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
=============
2020
RELEASE NOTES
2121
=============
22-
Added support of MSIE JavaScript Engine version 2.2.3.
22+
Added support of MSIE JavaScript Engine version 2.2.5.
2323

2424
=============
2525
DOCUMENTATION

src/JavaScriptEngineSwitcher.Msie.Net4/JavaScriptEngineSwitcher.Msie.Net40.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
</ProjectReference>
4646
</ItemGroup>
4747
<ItemGroup>
48-
<Reference Include="MsieJavaScriptEngine, Version=2.2.3.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\MsieJavaScriptEngine.2.2.3\lib\net40-client\MsieJavaScriptEngine.dll</HintPath>
48+
<Reference Include="MsieJavaScriptEngine, Version=2.2.5.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\MsieJavaScriptEngine.2.2.5\lib\net40-client\MsieJavaScriptEngine.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="System" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MsieJavaScriptEngine" version="2.2.3" targetFramework="net40-Client" />
3+
<package id="MsieJavaScriptEngine" version="2.2.5" targetFramework="net40-Client" />
44
</packages>

src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="MsieJavaScriptEngine" Version="2.2.3" />
26+
<PackageReference Include="MsieJavaScriptEngine" Version="2.2.5" />
2727

2828
<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
2929
</ItemGroup>

test/JavaScriptEngineSwitcher.Tests/InteropTestsBase.cs

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,37 @@ public virtual void EmbeddingOfInstanceOfDelegateWithTwoParametersIsCorrect()
499499

500500
#endregion
501501

502+
#region Removal
503+
504+
[Fact]
505+
public virtual void RemovingOfEmbeddedInstanceOfCustomReferenceTypeIsCorrect()
506+
{
507+
// Arrange
508+
var person = new Person("Vasya", "Pupkin");
509+
510+
// Act
511+
Exception currentException = null;
512+
513+
using (var jsEngine = CreateJsEngine())
514+
{
515+
jsEngine.EmbedHostObject("person", person);
516+
517+
try
518+
{
519+
jsEngine.RemoveVariable("person");
520+
}
521+
catch (Exception e)
522+
{
523+
currentException = e;
524+
}
525+
}
526+
527+
// Assert
528+
Assert.Null(currentException);
529+
}
530+
531+
#endregion
532+
502533
#endregion
503534

504535

@@ -980,6 +1011,37 @@ public virtual void EmbeddingOfCustomReferenceTypeWithMethodIsCorrect()
9801011

9811012
#endregion
9821013

1014+
#region Removal
1015+
1016+
[Fact]
1017+
public virtual void RemovingOfEmbeddedCustomReferenceTypeIsCorrect()
1018+
{
1019+
// Arrange
1020+
Type personType = typeof(Person);
1021+
1022+
// Act
1023+
Exception currentException = null;
1024+
1025+
using (var jsEngine = CreateJsEngine())
1026+
{
1027+
jsEngine.EmbedHostType("Person", personType);
1028+
1029+
try
1030+
{
1031+
jsEngine.RemoveVariable("Person");
1032+
}
1033+
catch (Exception e)
1034+
{
1035+
currentException = e;
1036+
}
1037+
}
1038+
1039+
// Assert
1040+
Assert.Null(currentException);
1041+
}
1042+
1043+
#endregion
1044+
9831045
#endregion
9841046
}
9851047
}

0 commit comments

Comments
 (0)