Skip to content

Commit ed93ad3

Browse files
TaritsynTaritsyn
committed
Version 1.5.0:
1. Removed dependency on `System.Web.Extensions`; 2. Assembly is now targeted on the .NET Framework 4 Client Profile.
1 parent f294087 commit ed93ad3

File tree

14 files changed

+423
-86
lines changed

14 files changed

+423
-86
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Change log
22
==========
33

4+
## October 12, 2014 - v1.5.0
5+
* Removed dependency on `System.Web.Extensions`
6+
* Assembly is now targeted on the .NET Framework 4 Client Profile
7+
48
## July 22, 2014 - v1.4.4
59
* Source code of the `ChakraJsRtJsEngine` was synchronized with the Chakra Sample Hosts version of July 22, 2014
610

‎MsieJavaScriptEngine.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("37677738-d94d-4df9-b32d-61573ece8990")]
1515

16-
[assembly: AssemblyVersion("1.4.1.0")]
17-
[assembly: AssemblyFileVersion("1.4.1.0")]
16+
[assembly: AssemblyVersion("1.5.0.0")]
17+
[assembly: AssemblyFileVersion("1.5.0.0")]

‎MsieJavaScriptEngine/JsRt/ChakraJsRtJsEngine.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
using Constants;
88
using Resources;
9+
using Utilities;
910

1011
/// <summary>
1112
/// JsRT version of Chakra JavaScript engine
@@ -352,7 +353,7 @@ public object CallFunction(string functionName, params object[] args)
352353
if (argumentCount == 1)
353354
{
354355
object value = args[0];
355-
serializedArguments = JsTypeConverter.Serialize(value);
356+
serializedArguments = SimplisticJsSerializer.Serialize(value);
356357
}
357358
else if (argumentCount > 1)
358359
{
@@ -361,7 +362,7 @@ public object CallFunction(string functionName, params object[] args)
361362
for (int argumentIndex = 0; argumentIndex < argumentCount; argumentIndex++)
362363
{
363364
object value = args[argumentIndex];
364-
string serializedValue = JsTypeConverter.Serialize(value);
365+
string serializedValue = SimplisticJsSerializer.Serialize(value);
365366

366367
if (argumentIndex > 0)
367368
{

‎MsieJavaScriptEngine/JsTypeConverter.cs‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎MsieJavaScriptEngine/MsieJavaScriptEngine.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>MsieJavaScriptEngine</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
14+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -66,6 +66,7 @@
6666
<Compile Include="Helpers\JsErrorHelpers.cs" />
6767
<Compile Include="Helpers\ValidationHelpers.cs" />
6868
<Compile Include="IInnerJsEngine.cs" />
69+
<Compile Include="Utilities\SimplisticJsSerializer.cs" />
6970
<Compile Include="JsException.cs" />
7071
<Compile Include="JsRuntimeException.cs" />
7172
<Compile Include="JsEngineLoadException.cs" />
@@ -93,7 +94,6 @@
9394
<Compile Include="JsRt\JavaScriptValueType.cs" />
9495
<Compile Include="JsRt\ChakraJsRtJsEngine.cs" />
9596
<Compile Include="JsRt\Native.cs" />
96-
<Compile Include="JsTypeConverter.cs" />
9797
<Compile Include="MsieJsEngine.cs" />
9898
<Compile Include="NotSupportedTypeException.cs" />
9999
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -107,13 +107,13 @@
107107
<DesignTime>True</DesignTime>
108108
<DependentUpon>Strings.ru-ru.resx</DependentUpon>
109109
</Compile>
110+
<Compile Include="Utilities\TypeConverter.cs" />
110111
<Compile Include="Undefined.cs" />
111112
<Compile Include="Utilities\StringBuilderExtensions.cs" />
112113
<Compile Include="Utilities\Utils.cs" />
113114
</ItemGroup>
114115
<ItemGroup>
115116
<Reference Include="System" />
116-
<Reference Include="System.Web.Extensions" />
117117
<Reference Include="WindowsBase" />
118118
</ItemGroup>
119119
<ItemGroup>

‎MsieJavaScriptEngine/MsieJsEngine.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public T Evaluate<T>(string expression)
196196

197197
object result = _jsEngine.Evaluate(expression);
198198

199-
return JsTypeConverter.ConvertToType<T>(result);
199+
return TypeConverter.ConvertToType<T>(result);
200200
}
201201

202202
/// <summary>
@@ -419,7 +419,7 @@ public T CallFunction<T>(string functionName, params object[] args)
419419

420420
object result = _jsEngine.CallFunction(functionName, args);
421421

422-
return JsTypeConverter.ConvertToType<T>(result);
422+
return TypeConverter.ConvertToType<T>(result);
423423
}
424424

425425
/// <summary>
@@ -518,7 +518,7 @@ public T GetVariableValue<T>(string variableName)
518518

519519
object result = _jsEngine.GetVariableValue(variableName);
520520

521-
return JsTypeConverter.ConvertToType<T>(result);
521+
return TypeConverter.ConvertToType<T>(result);
522522
}
523523

524524
/// <summary>

‎MsieJavaScriptEngine/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("ae6911c9-e2a9-4386-ab90-3722a9166564")]
1515

16-
[assembly: AssemblyVersion("1.4.4.0")]
17-
[assembly: AssemblyFileVersion("1.4.4.0")]
16+
[assembly: AssemblyVersion("1.5.0.0")]
17+
[assembly: AssemblyFileVersion("1.5.0.0")]
1818

1919
[module: DefaultCharSet(CharSet.Unicode)]

‎MsieJavaScriptEngine/Resources/Strings.Designer.cs‎

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MsieJavaScriptEngine/Resources/Strings.resx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,21 @@
123123
<data name="Common_ArgumentIsNull" xml:space="preserve">
124124
<value>The parameter '{0}' must be a non-nullable.</value>
125125
</data>
126+
<data name="Common_CannotConvertObjectToType" xml:space="preserve">
127+
<value>Cannot convert object of type `{0}` to type `{1}`.</value>
128+
</data>
129+
<data name="Common_CannotSerializeType" xml:space="preserve">
130+
<value>Serialization of type `{0}` is not supported.</value>
131+
</data>
126132
<data name="Common_FileNotExist" xml:space="preserve">
127133
<value>File '{0}' not exist.</value>
128134
</data>
129135
<data name="Common_ValueIsNull" xml:space="preserve">
130136
<value>Value cannot be null.</value>
131137
</data>
138+
<data name="Common_ValueTypeCannotBeNull" xml:space="preserve">
139+
<value>Cannot convert null to a value type.</value>
140+
</data>
132141
<data name="ErrorDetails_Category" xml:space="preserve">
133142
<value>Category</value>
134143
</data>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,21 @@
123123
<data name="Common_ArgumentIsNull" xml:space="preserve">
124124
<value>Параметр с именем "{0}" не должен содержать значение равное null!</value>
125125
</data>
126+
<data name="Common_CannotConvertObjectToType" xml:space="preserve">
127+
<value>Невозможно преобразовать объект типа `{0}` в тип `{1}`!</value>
128+
</data>
129+
<data name="Common_CannotSerializeType" xml:space="preserve">
130+
<value>Сериализация типа `{0}` не поддерживается!</value>
131+
</data>
126132
<data name="Common_FileNotExist" xml:space="preserve">
127133
<value>Файл "{0}" не существует!</value>
128134
</data>
129135
<data name="Common_ValueIsNull" xml:space="preserve">
130136
<value>Значение не должно быть равно null!</value>
131137
</data>
138+
<data name="Common_ValueTypeCannotBeNull" xml:space="preserve">
139+
<value>Невозможно преобразовать null в значимый тип!</value>
140+
</data>
132141
<data name="ErrorDetails_Category" xml:space="preserve">
133142
<value>Категория</value>
134143
</data>

0 commit comments

Comments
 (0)