Skip to content

Commit 2ccb65f

Browse files
TaritsynTaritsyn
committed
Version 1.0.8
1 parent 31a372f commit 2ccb65f

File tree

9 files changed

+58
-25
lines changed

9 files changed

+58
-25
lines changed

‎MsieJavaScriptEngine.sln‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,33 @@ EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
11+
Debug|Mixed Platforms = Debug|Mixed Platforms
12+
Debug|x86 = Debug|x86
1113
Release|Any CPU = Release|Any CPU
14+
Release|Mixed Platforms = Release|Mixed Platforms
15+
Release|x86 = Release|x86
1216
EndGlobalSection
1317
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1418
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1519
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
21+
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
22+
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Debug|x86.ActiveCfg = Debug|Any CPU
1623
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
1724
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Release|Any CPU.Build.0 = Release|Any CPU
25+
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
26+
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
27+
{0097B831-FFB7-4012-9D8A-6BEED3BD71FF}.Release|x86.ActiveCfg = Release|Any CPU
1828
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1929
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
31+
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
32+
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Debug|x86.ActiveCfg = Debug|Any CPU
2033
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
2134
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
36+
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
37+
{1321404B-291F-4A07-8120-3DA4DAEFA3B4}.Release|x86.ActiveCfg = Release|Any CPU
2238
EndGlobalSection
2339
GlobalSection(SolutionProperties) = preSolution
2440
HideSolutionNode = FALSE

‎MsieJavaScriptEngine/ActiveScript/ActiveScriptErrorFormatter.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ public static class ActiveScriptErrorFormatter
1313
/// Generates a detailed error message
1414
/// </summary>
1515
/// <param name="activeScriptException">Active script exception</param>
16-
/// <param name="filePath">File path</param>
1716
/// <returns>Detailed error message</returns>
18-
public static string Format(ActiveScriptException activeScriptException, string filePath)
17+
public static string Format(ActiveScriptException activeScriptException)
1918
{
2019
var errorMessage = new StringBuilder();
2120
errorMessage.AppendFormatLine("{0}: {1}", Strings.ErrorDetails_Message,
@@ -34,7 +33,13 @@ public static string Format(ActiveScriptException activeScriptException, string
3433
errorMessage.AppendFormatLine("{0}: {1}", Strings.ErrorDetails_HelpKeyword,
3534
activeScriptException.HelpLink);
3635
}
37-
errorMessage.AppendFormatLine("{0}: {1}", Strings.ErrorDetails_File, filePath);
36+
errorMessage.AppendFormatLine("{0}: {1}", Strings.ErrorDetails_LineNumber,
37+
activeScriptException.LineNumber.ToString());
38+
if (!string.IsNullOrWhiteSpace(activeScriptException.SourceError))
39+
{
40+
errorMessage.AppendFormatLine("{0}: {1}", Strings.ErrorDetails_LineSource,
41+
activeScriptException.SourceError);
42+
}
3843

3944
return errorMessage.ToString();
4045
}

‎MsieJavaScriptEngine/ActiveScript/ActiveScriptSite.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static bool IsSupported
6868
public ActiveScriptSite()
6969
: this(DateTime.UtcNow.ToString("o"))
7070
{ }
71-
71+
7272
/// <summary>
7373
/// Constructs instance of ActiveScriptSiteWrapper
7474
/// </summary>
@@ -106,7 +106,7 @@ public ActiveScriptSite(string documentVersion)
106106
throw new JsEngineLoadException(Strings.Runtime_JsEngineNotLoaded);
107107
}
108108
}
109-
109+
110110
/// <summary>
111111
/// Destructs instance of ActiveScriptSiteWrapper
112112
/// </summary>
@@ -260,10 +260,7 @@ public object ExecuteScriptText(string code, bool isExpression)
260260
{
261261
throw last;
262262
}
263-
else
264-
{
265-
throw;
266-
}
263+
throw;
267264
}
268265

269266
// Check for parse error

‎MsieJavaScriptEngine/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.7.0")]
35-
[assembly: AssemblyFileVersion("1.0.7.0")]
34+
[assembly: AssemblyVersion("1.0.8.0")]
35+
[assembly: AssemblyFileVersion("1.0.8.0")]

‎MsieJavaScriptEngine/Resources/Strings.Designer.cs‎

Lines changed: 15 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MsieJavaScriptEngine/Resources/Strings.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,15 @@
135135
<data name="ErrorDetails_ErrorWCode" xml:space="preserve">
136136
<value>WCode</value>
137137
</data>
138-
<data name="ErrorDetails_File" xml:space="preserve">
139-
<value>File</value>
140-
</data>
141138
<data name="ErrorDetails_HelpKeyword" xml:space="preserve">
142139
<value>Help keyword</value>
143140
</data>
141+
<data name="ErrorDetails_LineNumber" xml:space="preserve">
142+
<value>Line number</value>
143+
</data>
144+
<data name="ErrorDetails_LineSource" xml:space="preserve">
145+
<value>Line source</value>
146+
</data>
144147
<data name="ErrorDetails_Message" xml:space="preserve">
145148
<value>Message</value>
146149
</data>

‎MsieJavaScriptEngine/Resources/Strings.ru-ru.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,15 @@
135135
<data name="ErrorDetails_ErrorWCode" xml:space="preserve">
136136
<value>WCode</value>
137137
</data>
138-
<data name="ErrorDetails_File" xml:space="preserve">
139-
<value>Файл</value>
140-
</data>
141138
<data name="ErrorDetails_HelpKeyword" xml:space="preserve">
142139
<value>Ключевые слова из справки</value>
143140
</data>
141+
<data name="ErrorDetails_LineNumber" xml:space="preserve">
142+
<value>Номер строки</value>
143+
</data>
144+
<data name="ErrorDetails_LineSource" xml:space="preserve">
145+
<value>Содержимое строки</value>
146+
</data>
144147
<data name="ErrorDetails_Message" xml:space="preserve">
145148
<value>Сообщение об ошибке</value>
146149
</data>

‎NuGet/MsieJavaScriptEngine.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>MsieJavaScriptEngine</id>
5-
<version>1.0.7</version>
5+
<version>1.0.8</version>
66
<title>MSIE JavaScript Engine for .NET</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>

‎NuGet/readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
----------------------------------------------------------------------
4-
README file for MSIE JavaScript Engine for .NET 1.0.7
4+
README file for MSIE JavaScript Engine for .NET 1.0.8
55

66
----------------------------------------------------------------------
77

0 commit comments

Comments
 (0)