From 2be9adf37441f1d583fa850aeafd0fde045b7ec4 Mon Sep 17 00:00:00 2001 From: Georgios Diamantopoulos Date: Sat, 29 Apr 2017 20:47:20 +0300 Subject: [PATCH 1/4] update packages --- ...arp.Scripting.JavaScript.Generator.Tests.csproj | 14 +++++++------- .../packages.config | 4 ++-- ...ngleSharp.Scripting.JavaScript.Generator.csproj | 4 ++-- .../packages.config | 2 +- .../AngleSharp.Scripting.JavaScript.Tests.csproj | 8 ++++---- .../packages.config | 5 ++--- .../AngleSharp.Scripting.JavaScript.csproj | 8 ++++---- .../SystemTypeConverter.cs | 4 ++-- .../packages.config | 4 ++-- 9 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj index ad07959..63a3280 100644 --- a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj +++ b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj @@ -35,13 +35,13 @@ 4 - - ..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll + + ..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll True - - ..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll True @@ -50,15 +50,15 @@ - - - {2bebf4ad-1660-43a6-b452-109716f42fa6} AngleSharp.Scripting.JavaScript.Generator + + + diff --git a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config index 7476793..50bd0e3 100644 --- a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config +++ b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj b/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj index 6fd295f..2e09322 100644 --- a/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj +++ b/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj @@ -31,8 +31,8 @@ 4 - - ..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll + + ..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll True diff --git a/src/AngleSharp.Scripting.JavaScript.Generator/packages.config b/src/AngleSharp.Scripting.JavaScript.Generator/packages.config index 076afb7..474fbe0 100644 --- a/src/AngleSharp.Scripting.JavaScript.Generator/packages.config +++ b/src/AngleSharp.Scripting.JavaScript.Generator/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj b/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj index 29ddced..dcff6e0 100644 --- a/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj +++ b/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj @@ -35,12 +35,12 @@ 4 - - ..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll + + ..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll True - - ..\packages\Jint.2.9.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll + + ..\packages\jint.2.10.4\lib\net45\jint.dll True diff --git a/src/AngleSharp.Scripting.JavaScript.Tests/packages.config b/src/AngleSharp.Scripting.JavaScript.Tests/packages.config index ce18064..7cdc85e 100644 --- a/src/AngleSharp.Scripting.JavaScript.Tests/packages.config +++ b/src/AngleSharp.Scripting.JavaScript.Tests/packages.config @@ -1,6 +1,5 @@  - - - + + \ No newline at end of file diff --git a/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj b/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj index 1aa0fe8..22b0d5f 100644 --- a/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj +++ b/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj @@ -34,12 +34,12 @@ bin\Release\AngleSharp.Scripting.JavaScript.xml - - ..\packages\AngleSharp.0.9.8.1\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll + + ..\packages\AngleSharp.0.9.9\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll True - - ..\packages\Jint.2.9.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll + + ..\packages\jint.2.10.4\lib\portable40-net40+sl5+win8+wp8+wpa81\jint.dll True diff --git a/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs b/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs index 4c52a19..c659afc 100644 --- a/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs +++ b/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs @@ -48,9 +48,9 @@ public static Object ToObject(JsValue arg) return arg.ToObject(); } - static Object Clr(this JsValue? arg) + static Object Clr(this JsValue arg) { - return arg.HasValue ? arg.Value.ToObject() : null; + return arg; } } } diff --git a/src/AngleSharp.Scripting.JavaScript/packages.config b/src/AngleSharp.Scripting.JavaScript/packages.config index e3e3be2..ac63eed 100644 --- a/src/AngleSharp.Scripting.JavaScript/packages.config +++ b/src/AngleSharp.Scripting.JavaScript/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file From cf21008c4c1ca3c68893b84ca7058932c7bce2fc Mon Sep 17 00:00:00 2001 From: Georgios Diamantopoulos Date: Fri, 5 May 2017 16:03:19 +0300 Subject: [PATCH 2/4] update AngleSharp pkg for CSharp projects --- .../AngleSharp.Scripting.CSharp.Tests.csproj | 4 ++-- src/AngleSharp.Scripting.CSharp.Tests/packages.config | 2 +- .../AngleSharp.Scripting.CSharp.csproj | 4 ++-- src/AngleSharp.Scripting.CSharp/packages.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj b/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj index de99595..5877d6c 100644 --- a/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj +++ b/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj @@ -35,8 +35,8 @@ 4 - - ..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll + + ..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll True diff --git a/src/AngleSharp.Scripting.CSharp.Tests/packages.config b/src/AngleSharp.Scripting.CSharp.Tests/packages.config index 008281b..7cdc85e 100644 --- a/src/AngleSharp.Scripting.CSharp.Tests/packages.config +++ b/src/AngleSharp.Scripting.CSharp.Tests/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj b/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj index d8b3dd5..be142ec 100644 --- a/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj +++ b/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj @@ -42,8 +42,8 @@ - - ..\packages\AngleSharp.0.9.8.1\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll + + ..\packages\AngleSharp.0.9.9\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll True diff --git a/src/AngleSharp.Scripting.CSharp/packages.config b/src/AngleSharp.Scripting.CSharp/packages.config index b6f21f0..53299c0 100644 --- a/src/AngleSharp.Scripting.CSharp/packages.config +++ b/src/AngleSharp.Scripting.CSharp/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 4a670000c8e51c19ee6cbdf6884e8dc99d45c8c9 Mon Sep 17 00:00:00 2001 From: Georgios Diamantopoulos Date: Fri, 5 May 2017 16:03:30 +0300 Subject: [PATCH 3/4] update nunit --- .../AngleSharp.Scripting.CSharp.Tests.csproj | 4 ++-- src/AngleSharp.Scripting.CSharp.Tests/packages.config | 2 +- .../AngleSharp.Scripting.JavaScript.Tests.csproj | 4 ++-- src/AngleSharp.Scripting.JavaScript.Tests/packages.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj b/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj index 5877d6c..b0dcb38 100644 --- a/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj +++ b/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj @@ -40,8 +40,8 @@ True - - ..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll True diff --git a/src/AngleSharp.Scripting.CSharp.Tests/packages.config b/src/AngleSharp.Scripting.CSharp.Tests/packages.config index 7cdc85e..50bd0e3 100644 --- a/src/AngleSharp.Scripting.CSharp.Tests/packages.config +++ b/src/AngleSharp.Scripting.CSharp.Tests/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj b/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj index dcff6e0..9f3151d 100644 --- a/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj +++ b/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj @@ -44,8 +44,8 @@ True - - ..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll True diff --git a/src/AngleSharp.Scripting.JavaScript.Tests/packages.config b/src/AngleSharp.Scripting.JavaScript.Tests/packages.config index 7cdc85e..50bd0e3 100644 --- a/src/AngleSharp.Scripting.JavaScript.Tests/packages.config +++ b/src/AngleSharp.Scripting.JavaScript.Tests/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file From 142eeb429e563830e09b4fd5af6d85a5760ee7ba Mon Sep 17 00:00:00 2001 From: Georgios Diamantopoulos Date: Sun, 7 May 2017 18:53:36 +0300 Subject: [PATCH 4/4] fix object conversion --- src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs b/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs index c659afc..cc0a903 100644 --- a/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs +++ b/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs @@ -50,7 +50,7 @@ public static Object ToObject(JsValue arg) static Object Clr(this JsValue arg) { - return arg; + return arg?.ToObject(); } } }