Skip to content

Commit 5412abf

Browse files
committed
Downgraded .NET Framework version from 4.5.1 to 4.5
1 parent d0a6a51 commit 5412abf

File tree

10 files changed

+16
-14
lines changed

10 files changed

+16
-14
lines changed

NuGet/MsieJavaScriptEngine.nuspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
<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>
1515
<releaseNotes>1. Now when you call the overloaded version of the `ExecuteResource` method, that takes the type, need to pass the resource name without the namespace;
1616
2. Fixed a error “Out of stack space”;
17-
3. JSON2 library was updated to version of October 28, 2016.</releaseNotes>
17+
3. JSON2 library was updated to version of October 28, 2016;
18+
4. Downgraded .NET Framework version from 4.5.1 to 4.5.</releaseNotes>
1819
<copyright>Copyright (c) 2012-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1920
<language>en-US</language>
2021
<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>
2122
<dependencies>
2223
<group targetFramework=".NETFramework4.0-Client" />
23-
<group targetFramework=".NETFramework4.5.1" />
24+
<group targetFramework=".NETFramework4.5" />
2425
<group targetFramework=".NETStandard1.3">
2526
<dependency id="System.Collections" version="4.0.11" />
2627
<dependency id="System.ComponentModel.TypeConverter" version="4.1.0" />

NuGet/build-package.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ del bundler-and-minifier-license.txt /Q/S
2020
xcopy "%net4_project_bin_dir%\%project_name%.dll" lib\net40-client\
2121
xcopy "%net4_project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
2222

23-
%dotnet_cli% build "%dotnet_project_source_dir%" --framework net451 --configuration Release --no-dependencies --no-incremental
24-
xcopy "%dotnet_project_bin_dir%\net451\%project_name%.dll" lib\net451\
25-
xcopy "%dotnet_project_bin_dir%\net451\%project_name%.xml" lib\net451\
26-
xcopy "%dotnet_project_bin_dir%\net451\ru-ru\%project_name%.resources.dll" lib\net451\ru-ru\
23+
%dotnet_cli% build "%dotnet_project_source_dir%" --framework net45 --configuration Release --no-dependencies --no-incremental
24+
xcopy "%dotnet_project_bin_dir%\net45\%project_name%.dll" lib\net45\
25+
xcopy "%dotnet_project_bin_dir%\net45\%project_name%.xml" lib\net45\
26+
xcopy "%dotnet_project_bin_dir%\net45\ru-ru\%project_name%.resources.dll" lib\net45\ru-ru\
2727

2828
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard1.3 --configuration Release --no-dependencies --no-incremental
2929
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstandard1.3\

NuGet/readme.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
1. Now when you call the overloaded version of the `ExecuteResource` method, that
2525
takes the type, need to pass the resource name without the namespace;
2626
2. Fixed a error “Out of stack space”;
27-
3. JSON2 library was updated to version of October 28, 2016.
27+
3. JSON2 library was updated to version of October 28, 2016;
28+
4. Downgraded .NET Framework version from 4.5.1 to 4.5.
2829

2930
============
3031
PROJECT SITE

_generate-resx.shade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace {0}
6262
private static Lazy<ResourceManager> _resourceManager =
6363
new Lazy<ResourceManager>(() => new ResourceManager(
6464
""{0}.{1}"",
65-
#if NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6 || NETCOREAPP1_0 || NET451 || NET452 || NET46 || NET461 || NET462 || NET463
65+
#if NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6 || NETCOREAPP1_0 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET463
6666
typeof({1}).GetTypeInfo().Assembly
6767
#elif NET40
6868
typeof({1}).Assembly

src/MsieJavaScriptEngine/Helpers/ComHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#if !NETSTANDARD1_3
22
using System;
3-
#if NET451
3+
#if NET45
44
using System.Reflection;
55
#endif
66
using System.Runtime.InteropServices;

src/MsieJavaScriptEngine/Resources/CommonStrings.Designer.cs

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

src/MsieJavaScriptEngine/Resources/NetCoreStrings.Designer.cs

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

src/MsieJavaScriptEngine/Resources/NetFrameworkStrings.Designer.cs

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

src/MsieJavaScriptEngine/Utilities/TypeConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.ComponentModel;
33
using System.Globalization;
44
using System.Linq;
5-
#if NETSTANDARD1_3 || NET451
5+
#if NETSTANDARD1_3 || NET45
66
using System.Reflection;
77
#endif
88
using OriginalTypeConverter = System.ComponentModel.TypeConverter;

src/MsieJavaScriptEngine/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
}
5454
}
5555
},
56-
"net451": {
56+
"net45": {
5757
"buildOptions": {
5858
"embed": [ "Resources/ES5.min.js", "Resources/json2.min.js" ],
5959
"compile": {

0 commit comments

Comments
 (0)