In JavaScriptEngineSwitcher.V8 fixed a error #73 “Trying to Run this in the GAC”

Author: Taritsyn

Diff for: src/JavaScriptEngineSwitcher.V8/AssemblyResolver.cs

@@ -2,6 +2,8 @@
 using System.IO;
 using System.Reflection;
 
+using Microsoft.ClearScript.V8;
+
 using JavaScriptEngineSwitcher.V8.Constants;
 
 namespace JavaScriptEngineSwitcher.V8
@@ -45,17 +47,28 @@ private static Assembly AssemblyResolveHandler(object sender, ResolveEventArgs a
 					platformBitness = 32;
 				}
 
+				string assemblyName = DllName.ClearScriptV8Universal + "-" + platformBitness;
 				string assemblyDirectoryPath = Path.Combine(baseDirectoryPath, platformName);
-				string assemblyFileName = DllName.ClearScriptV8Universal + "-" + platformBitness + ".dll";
+				string assemblyFileName = assemblyName + ".dll";
 				string assemblyFilePath = Path.Combine(assemblyDirectoryPath, assemblyFileName);
 				bool assemblyFileExists = File.Exists(assemblyFilePath);
 
-				if (!assemblyFileExists)
+				if (assemblyFileExists)
 				{
-					return null;
+					return Assembly.LoadFile(assemblyFilePath);
 				}
 
-				return Assembly.LoadFile(assemblyFilePath);
+				Assembly clearScriptAssembly = typeof(V8ScriptEngine).Assembly;
+				string clearScriptAssemblyFullName = clearScriptAssembly.FullName;
+				int commaPosition = clearScriptAssemblyFullName.IndexOf(',');
+
+				if (commaPosition != -1)
+				{
+					string assemblyFullName = assemblyName +
+						clearScriptAssemblyFullName.Substring(commaPosition);
+
+					return Assembly.Load(assemblyFullName);
+				}
 			}
 
 			return null;

Diff for: src/JavaScriptEngineSwitcher.V8/Constants/DllName.cs

@@ -6,7 +6,7 @@
 	internal static class DllName
 	{
 		public const string ClearScriptV8Universal = "ClearScriptV8";
-		public const string V8Base32Bit = "v8-base-ia32.dll";
-		public const string V8Base64Bit = "v8-base-x64.dll";
+		public const string V8LibCpp32Bit = "v8-libcpp-ia32.dll";
+		public const string V8LibCpp64Bit = "v8-libcpp-x64.dll";
 	}
 }

Diff for: src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj

@@ -17,7 +17,7 @@ This package does not contain the native ClearScript and V8 assemblies. Therefor
  * JavaScriptEngineSwitcher.V8.Native.win-x64</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_V8_Logo128x128.png</PackageIconUrl>
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;V8;ClearScript</PackageTags>
-		<PackageReleaseNotes>Microsoft ClearScript.V8 was updated to version 5.6.0.</PackageReleaseNotes>
+		<PackageReleaseNotes>Fixed a error #73 “Trying to Run this in the GAC”.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

Diff for: src/JavaScriptEngineSwitcher.V8/V8JsEngine.cs

@@ -367,10 +367,10 @@ private static WrapperEngineLoadException WrapTypeLoadException(
 				StringBuilder descriptionBuilder = stringBuilderPool.Rent();
 				descriptionBuilder.AppendFormat(CoreStrings.Engine_AssemblyNotFound, assemblyFileName);
 				descriptionBuilder.Append(" ");
-				if (assemblyFileName == DllName.V8Base64Bit || assemblyFileName == DllName.V8Base32Bit)
+				if (assemblyFileName == DllName.V8LibCpp64Bit || assemblyFileName == DllName.V8LibCpp32Bit)
 				{
 					descriptionBuilder.AppendFormat(CoreStrings.Engine_NuGetPackageInstallationRequired,
-						assemblyFileName == DllName.V8Base64Bit ?
+						assemblyFileName == DllName.V8LibCpp64Bit ?
 							"JavaScriptEngineSwitcher.V8.Native.win-x64"
 							:
 							"JavaScriptEngineSwitcher.V8.Native.win-x86"

Diff for: src/JavaScriptEngineSwitcher.V8/readme.txt

@@ -25,7 +25,7 @@
    =============
    RELEASE NOTES
    =============
-   Microsoft ClearScript.V8 was updated to version 5.6.0.
+   Fixed a error #73 “Trying to Run this in the GAC”.
 
    =============
    DOCUMENTATION