Version 5.3.1: Fixed JScriptEngine dynamic binding issue.

Author: ClearScriptLib

ClearScript/Exports/VersionSymbols.h

@@ -63,5 +63,5 @@
 
 #pragma once
 
-#define CLEARSCRIPT_VERSION_STRING "5.3.0.0"
-#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,3,0,0
+#define CLEARSCRIPT_VERSION_STRING "5.3.1.0"
+#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,3,1,0

ClearScript/Properties/AssemblyInfo.cs

@@ -73,5 +73,5 @@
 [assembly: InternalsVisibleTo("ClearScriptTest")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.3.0.0")]
-[assembly: AssemblyFileVersion("5.3.0.0")]
+[assembly: AssemblyVersion("5.3.1.0")]
+[assembly: AssemblyFileVersion("5.3.1.0")]

ClearScript/Util/DynamicHelpers.cs

@@ -62,6 +62,7 @@
 using System;
 using System.Diagnostics;
 using System.Dynamic;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -130,6 +131,17 @@ public static bool TryBindAndInvoke(DynamicMetaObjectBinder binder, object targe
                                         return true;
                                     }
                                 }
+                                else
+                                {
+                                    var invokeMemberBinder = binder as InvokeMemberBinder;
+                                    if (invokeMemberBinder != null)
+                                    {
+                                        if (TryInvokeMethod(reflect, invokeMemberBinder.Name, false, args, out result))
+                                        {
+                                            return true;
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
@@ -197,6 +209,25 @@ private static bool TrySetProperty(IReflect target, string name, bool ignoreCase
             return false;
         }
 
+        private static bool TryInvokeMethod(IReflect target, string name, bool ignoreCase, object[] args, out object result)
+        {
+            var flags = BindingFlags.InvokeMethod | BindingFlags.Public;
+            if (ignoreCase)
+            {
+                flags |= BindingFlags.IgnoreCase;
+            }
+
+            var method = target.GetMethod(name, flags);
+            if (method != null)
+            {
+                result = method.Invoke(target, flags, null, args, CultureInfo.InvariantCulture);
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
         private static DynamicMetaObject CreateDynamicTarget(object target)
         {
             var byRefArg = target as IByRefArg;

ClearScript/V8/V8/V8Patch.txt

@@ -1,6 +1,6 @@
 Index: tools/gyp/v8.gyp
 ===================================================================
---- tools/gyp/v8.gyp	(revision 14724)
+--- tools/gyp/v8.gyp	(revision 14901)
 +++ tools/gyp/v8.gyp	(working copy)
 @@ -30,6 +30,7 @@
    'targets': [

ClearScript/Windows/WindowsScriptItem.cs

@@ -220,7 +220,7 @@ protected override bool TryBindAndInvoke(DynamicMetaObjectBinder binder, object[
         protected override object[] AdjustInvokeArgs(object[] args)
         {
             // WORKAROUND: JScript seems to require at least one argument to invoke a function
-            return ((engine is JScriptEngine) && (args.Length < 1)) ? new object[] { 0 } : args;
+            return ((engine is JScriptEngine) && (args.Length < 1)) ? new object[] { Undefined.Value } : args;
         }
 
         #endregion

ClearScriptBenchmarks/Properties/AssemblyInfo.cs

@@ -69,5 +69,5 @@
 [assembly: AssemblyCopyright("© Microsoft Corporation")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.3.0.0")]
-[assembly: AssemblyFileVersion("5.3.0.0")]
+[assembly: AssemblyVersion("5.3.1.0")]
+[assembly: AssemblyFileVersion("5.3.1.0")]

ClearScriptConsole/Properties/AssemblyInfo.cs

@@ -69,5 +69,5 @@
 [assembly: AssemblyCopyright("© Microsoft Corporation")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.3.0.0")]
-[assembly: AssemblyFileVersion("5.3.0.0")]
+[assembly: AssemblyVersion("5.3.1.0")]
+[assembly: AssemblyFileVersion("5.3.1.0")]

ClearScriptTest/BugFixTest.cs

@@ -63,6 +63,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CSharp.RuntimeBinder;
 using Microsoft.ClearScript.V8;
+using Microsoft.ClearScript.Windows;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.ClearScript.Test
@@ -129,6 +130,18 @@ public void BugFix_DelegateConstructionSyntax_DoubleWrap()
             Assert.AreEqual(25, func(5));
         }
 
+        [TestMethod, TestCategory("BugFix")]
+        public void BugFix_JScriptCaseInsensitivity()
+        {
+            engine.Dispose();
+            engine = new JScriptEngine();
+            engine.Execute("abc = 1; ABC = 2; function foo() { return 3; } function FOO() { return 4; }");
+            Assert.AreEqual(1, engine.Script.abc);
+            Assert.AreEqual(2, engine.Script.ABC);
+            Assert.AreEqual(3, engine.Script.foo());
+            Assert.AreEqual(4, engine.Script.FOO());
+        }
+
         // ReSharper restore InconsistentNaming
 
         #endregion

ClearScriptTest/Properties/AssemblyInfo.cs

@@ -69,5 +69,5 @@
 [assembly: AssemblyCopyright("© Microsoft Corporation")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.3.0.0")]
-[assembly: AssemblyFileVersion("5.3.0.0")]
+[assembly: AssemblyVersion("5.3.1.0")]
+[assembly: AssemblyFileVersion("5.3.1.0")]

V8Update.cmd

@@ -5,7 +5,7 @@ setlocal
 :: process arguments
 ::-----------------------------------------------------------------------------
 
-set testedV8rev=14721
+set testedV8rev=14901
 
 :ProcessArgs