Skip to content

Commit cecb1ee

Browse files
committed
In JavaScriptEngineSwitcher.V8 fixed a error that caused incorrect generation of error description for an JsEngineLoadException exception
1 parent 99ea9f8 commit cecb1ee

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

src/JavaScriptEngineSwitcher.V8/Constants/DllName.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
internal static class DllName
77
{
88
public const string ClearScriptV8Universal = "ClearScriptV8";
9-
public const string V8LibCpp32Bit = "v8-libcpp-ia32.dll";
10-
public const string V8LibCpp64Bit = "v8-libcpp-x64.dll";
9+
public const string V8Prefix = "v8-";
10+
public const string V8Postfix32Bit = "-ia32.dll";
11+
public const string V8Postfix64Bit = "-x64.dll";
1112
}
1213
}

src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This package does not contain the native ClearScript and V8 assemblies. Therefor
1717
* JavaScriptEngineSwitcher.V8.Native.win-x64</Description>
1818
<PackageIcon>icon.png</PackageIcon>
1919
<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;V8;ClearScript</PackageTags>
20-
<PackageReleaseNotes>Microsoft ClearScript.V8 was updated to version 6.0.1.</PackageReleaseNotes>
20+
<PackageReleaseNotes>Fixed a error that caused incorrect generation of error description for an `JsEngineLoadException` exception.</PackageReleaseNotes>
2121
</PropertyGroup>
2222

2323
<Import Project="../../build/common.props" />

src/JavaScriptEngineSwitcher.V8/V8JsEngine.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,11 @@ private static WrapperEngineLoadException WrapTypeLoadException(
328328
StringBuilder descriptionBuilder = stringBuilderPool.Rent();
329329
descriptionBuilder.AppendFormat(CoreStrings.Engine_AssemblyNotFound, assemblyFileName);
330330
descriptionBuilder.Append(" ");
331-
if (assemblyFileName == DllName.V8LibCpp64Bit || assemblyFileName == DllName.V8LibCpp32Bit)
331+
if (assemblyFileName.StartsWith(DllName.V8Prefix)
332+
&& (assemblyFileName.EndsWith(DllName.V8Postfix64Bit) || assemblyFileName.EndsWith(DllName.V8Postfix32Bit)))
332333
{
333334
descriptionBuilder.AppendFormat(CoreStrings.Engine_NuGetPackageInstallationRequired,
334-
assemblyFileName == DllName.V8LibCpp64Bit ?
335+
assemblyFileName.EndsWith(DllName.V8Postfix64Bit) ?
335336
"JavaScriptEngineSwitcher.V8.Native.win-x64"
336337
:
337338
"JavaScriptEngineSwitcher.V8.Native.win-x86"

src/JavaScriptEngineSwitcher.V8/readme.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
=============
2626
RELEASE NOTES
2727
=============
28-
Microsoft ClearScript.V8 was updated to version 6.0.1.
28+
Fixed a error that caused incorrect generation of error description for an
29+
`JsEngineLoadException` exception.
2930

3031
=============
3132
DOCUMENTATION

0 commit comments

Comments
 (0)