Now when you call the overloaded version of the ExecuteResource method, that takes the type, need to pass the resource name without the namespace

Author: Taritsyn

NuGet/MsieJavaScriptEngine.nuspec

@@ -12,7 +12,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee), Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host) and jsrt-dotnet (http://github.com/robpaveza/jsrt-dotnet).</description>
 		<summary>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
-		<releaseNotes>Another attempt to prevent occurrence of the access violation exception in the `CallFunction` method.</releaseNotes>
+		<releaseNotes>Now when you call the overloaded version of the `ExecuteResource` method, that takes the type, need to pass the resource name without the namespace.</releaseNotes>
 		<copyright>Copyright (c) 2012-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>

NuGet/readme.txt

@@ -21,8 +21,8 @@
    =============
    RELEASE NOTES
    =============
-   Another attempt to prevent occurrence of the access violation exception in the
-   `CallFunction` method.
+   Now when you call the overloaded version of the `ExecuteResource` method, that
+   takes the type, need to pass the resource name without the namespace.
 
    ============
    PROJECT SITE

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -512,39 +512,45 @@ private void InnerCollectGarbage(ScriptGCType type)
 		/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
 		private void LoadResources(bool useEcmaScript5Polyfill, bool useJson2Library)
 		{
-			Type type = GetType();
+			Assembly assembly = GetType().GetTypeInfo().Assembly;
 
 			if (useEcmaScript5Polyfill)
 			{
-				ExecuteResource(ES5_POLYFILL_RESOURCE_NAME, type);
+				ExecuteResource(ES5_POLYFILL_RESOURCE_NAME, assembly);
 			}
 
 			if (useJson2Library)
 			{
-				ExecuteResource(JSON2_LIBRARY_RESOURCE_NAME, type);
+				ExecuteResource(JSON2_LIBRARY_RESOURCE_NAME, assembly);
 			}
 		}
 
 		/// <summary>
 		/// Executes a code from embedded JS-resource
 		/// </summary>
-		/// <param name="resourceName">JS-resource name</param>
-		/// <param name="type">Type from assembly that containing an embedded resource</param>
-		private void ExecuteResource(string resourceName, Type type)
+		/// <param name="resourceName">The case-sensitive resource name</param>
+		/// <param name="assembly">The assembly, which contains the embedded resource</param>
+		private void ExecuteResource(string resourceName, Assembly assembly)
 		{
-			if (string.IsNullOrWhiteSpace(resourceName))
+			if (resourceName == null)
 			{
-				throw new ArgumentException(
-					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+				throw new ArgumentNullException(
+					"resourceName", string.Format(CommonStrings.Common_ArgumentIsNull, "resourceName"));
 			}
 
-			if (type == null)
+			if (assembly == null)
 			{
 				throw new ArgumentNullException(
-					"type", string.Format(CommonStrings.Common_ArgumentIsNull, "type"));
+					"assembly", string.Format(CommonStrings.Common_ArgumentIsNull, "assembly"));
+			}
+
+			if (string.IsNullOrWhiteSpace(resourceName))
+			{
+				throw new ArgumentException(
+					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
 			}
 
-			string code = Utils.GetResourceAsString(resourceName, type);
+			string code = Utils.GetResourceAsString(resourceName, assembly);
 			Execute(code);
 		}
 

src/MsieJavaScriptEngine/MsieJsEngine.cs

@@ -305,8 +305,9 @@ public void ExecuteFile(string path, Encoding encoding = null)
 		/// <summary>
 		/// Executes a code from embedded JS-resource
 		/// </summary>
-		/// <param name="resourceName">JS-resource name</param>
-		/// <param name="type">Type from assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name without the namespace of the specified type</param>
+		/// <param name="type">The type, that determines the assembly and whose namespace is used to scope
+		/// the resource name</param>
 		/// <exception cref="System.ObjectDisposedException">Operation is performed on a disposed MSIE
 		/// JavaScript engine.</exception>
 		/// <exception cref="System.ArgumentException" />
@@ -316,10 +317,10 @@ public void ExecuteResource(string resourceName, Type type)
 		{
 			VerifyNotDisposed();
 
-			if (string.IsNullOrWhiteSpace(resourceName))
+			if (resourceName == null)
 			{
-				throw new ArgumentException(
-					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+				throw new ArgumentNullException(
+					"resourceName", string.Format(CommonStrings.Common_ArgumentIsNull, "resourceName"));
 			}
 
 			if (type == null)
@@ -328,15 +329,21 @@ public void ExecuteResource(string resourceName, Type type)
 					"type", string.Format(CommonStrings.Common_ArgumentIsNull, "type"));
 			}
 
+			if (string.IsNullOrWhiteSpace(resourceName))
+			{
+				throw new ArgumentException(
+					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+			}
+
 			string code = Utils.GetResourceAsString(resourceName, type);
 			Execute(code);
 		}
 
 		/// <summary>
 		/// Executes a code from embedded JS-resource
 		/// </summary>
-		/// <param name="resourceName">JS-resource name</param>
-		/// <param name="assembly">Assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name</param>
+		/// <param name="assembly">The assembly, which contains the embedded resource</param>
 		/// <exception cref="System.ObjectDisposedException">Operation is performed on a disposed MSIE
 		/// JavaScript engine.</exception>
 		/// <exception cref="System.ArgumentException" />
@@ -346,10 +353,10 @@ public void ExecuteResource(string resourceName, Assembly assembly)
 		{
 			VerifyNotDisposed();
 
-			if (string.IsNullOrWhiteSpace(resourceName))
+			if (resourceName == null)
 			{
-				throw new ArgumentException(
-					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+				throw new ArgumentNullException(
+					"resourceName", string.Format(CommonStrings.Common_ArgumentIsNull, "resourceName"));
 			}
 
 			if (assembly == null)
@@ -358,6 +365,12 @@ public void ExecuteResource(string resourceName, Assembly assembly)
 					"assembly", string.Format(CommonStrings.Common_ArgumentIsNull, "assembly"));
 			}
 
+			if (string.IsNullOrWhiteSpace(resourceName))
+			{
+				throw new ArgumentException(
+					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+			}
+
 			string code = Utils.GetResourceAsString(resourceName, assembly);
 			Execute(code);
 		}

src/MsieJavaScriptEngine/Utilities/Utils.cs

@@ -29,23 +29,67 @@ public static bool Is64BitProcess()
 		/// <summary>
 		/// Gets a content of the embedded resource as string
 		/// </summary>
-		/// <param name="resourceName">Resource name</param>
-		/// <param name="type">Type from assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name without the namespace of the specified type</param>
+		/// <param name="type">The type, that determines the assembly and whose namespace is used to scope
+		/// the resource name</param>
 		/// <returns>Сontent of the embedded resource as string</returns>
 		public static string GetResourceAsString(string resourceName, Type type)
 		{
+			if (resourceName == null)
+			{
+				throw new ArgumentNullException(
+					"resourceName", string.Format(CommonStrings.Common_ArgumentIsNull, "resourceName"));
+			}
+
+			if (type == null)
+			{
+				throw new ArgumentNullException(
+					"type", string.Format(CommonStrings.Common_ArgumentIsNull, "type"));
+			}
+
+			if (string.IsNullOrWhiteSpace(resourceName))
+			{
+				throw new ArgumentException(
+					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+			}
+
 			Assembly assembly = type.GetTypeInfo().Assembly;
+			string nameSpace = type.Namespace;
+			string resourceFullName = nameSpace != null ? nameSpace + "." + resourceName : resourceName;
 
-			return GetResourceAsString(resourceName, assembly);
+			return InnerGetResourceAsString(resourceFullName, assembly);
 		}
 
 		/// <summary>
 		/// Gets a content of the embedded resource as string
 		/// </summary>
-		/// <param name="resourceName">Resource name</param>
-		/// <param name="assembly">Assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name</param>
+		/// <param name="assembly">The assembly, which contains the embedded resource</param>
 		/// <returns>Сontent of the embedded resource as string</returns>
 		public static string GetResourceAsString(string resourceName, Assembly assembly)
+		{
+			if (resourceName == null)
+			{
+				throw new ArgumentNullException(
+					"resourceName", string.Format(CommonStrings.Common_ArgumentIsNull, "resourceName"));
+			}
+
+			if (assembly == null)
+			{
+				throw new ArgumentNullException(
+					"assembly", string.Format(CommonStrings.Common_ArgumentIsNull, "assembly"));
+			}
+
+			if (string.IsNullOrWhiteSpace(resourceName))
+			{
+				throw new ArgumentException(
+					string.Format(CommonStrings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
+			}
+
+			return InnerGetResourceAsString(resourceName, assembly);
+		}
+
+		private static string InnerGetResourceAsString(string resourceName, Assembly assembly)
 		{
 			using (Stream stream = assembly.GetManifestResourceStream(resourceName))
 			{

test/MsieJavaScriptEngine.Test.Common/CommonTestsBase.cs

@@ -201,10 +201,10 @@ public virtual void ExecutionOfFileIsCorrect()
 		}
 
 		[Test]
-		public virtual void ExecutionOfResourceByTypeIsCorrect()
+		public virtual void ExecutionOfResourceByNameAndTypeIsCorrect()
 		{
 			// Arrange
-			const string resourceName = "MsieJavaScriptEngine.Test.Common.Resources.cube.js";
+			const string resourceName = "Resources.cube.js";
 			const string input = "cube(5);";
 			const int targetOutput = 125;
 
@@ -222,7 +222,7 @@ public virtual void ExecutionOfResourceByTypeIsCorrect()
 		}
 
 		[Test]
-		public virtual void ExecutionOfResourceByAssemblyIsCorrect()
+		public virtual void ExecutionOfResourceByNameAndAssemblyIsCorrect()
 		{
 			// Arrange
 			const string resourceName = "MsieJavaScriptEngine.Test.Common.Resources.power.js";