Skip to content

Commit f7c6a52

Browse files
TaritsynTaritsyn
committed
Added a net471 target to remaining projects
1 parent 79d18a5 commit f7c6a52

File tree

33 files changed

+76
-65
lines changed

33 files changed

+76
-65
lines changed

‎build/common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
66
</PropertyGroup>
77

8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net452' ">
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net471' ">
99
<DefineConstants>$(DefineConstants);NETFULL</DefineConstants>
1010
</PropertyGroup>
1111

‎samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Product>JS Engine Switcher: Logic for Samples</Product>
55
<VersionPrefix>3.0.0</VersionPrefix>
66
<VersionSuffix>beta3</VersionSuffix>
7-
<TargetFrameworks>net40;net451;netstandard1.6;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net40;net451;net471;netstandard1.6;netstandard2.0</TargetFrameworks>
88
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
99
<OutputType>Library</OutputType>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -25,7 +25,7 @@
2525
<PackageReference Include="Microsoft.AspNet.Mvc" Version="4.0.30506.0" />
2626
</ItemGroup>
2727

28-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' Or '$(TargetFramework)' == 'net451' ">
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netstandard1.6' ">
2929
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.0.6" />
3030
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="1.0.6" />
3131
</ItemGroup>

‎samples/JavaScriptEngineSwitcher.Sample.Logic/Models/JsEvaluationViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22
using System.ComponentModel.DataAnnotations;
3-
#if NET451 || NETSTANDARD
3+
#if NET451 || NET471 || NETSTANDARD
44
using Microsoft.AspNetCore.Mvc.Rendering;
55
#elif NET40
66
using System.Web.Mvc;

‎samples/JavaScriptEngineSwitcher.Sample.Logic/Services/FileContentService.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.IO;
3-
#if NET451 || NETSTANDARD
3+
#if NET451 || NET471 || NETSTANDARD
44
using Microsoft.AspNetCore.Hosting;
55
#elif NET40
66
using System.Web;
@@ -15,12 +15,12 @@ namespace JavaScriptEngineSwitcher.Sample.Logic.Services
1515
public sealed class FileContentService
1616
{
1717
private readonly string _textContentDirectoryPath;
18-
#if NET451 || NETSTANDARD
18+
#if NET451 || NET471 || NETSTANDARD
1919
private readonly IHostingEnvironment _hostingEnvironment;
2020
#endif
2121

2222

23-
#if NET451 || NETSTANDARD
23+
#if NET451 || NET471 || NETSTANDARD
2424
public FileContentService(
2525
string textContentDirectoryPath,
2626
IHostingEnvironment hostingEnvironment
@@ -76,7 +76,7 @@ public string GetFileContent(string filePath)
7676

7777
private string GetPhysicalFilePath(string filePath)
7878
{
79-
#if NET451 || NETSTANDARD
79+
#if NET451 || NET471 || NETSTANDARD
8080
string applicationDirectoryPath = _hostingEnvironment.ContentRootPath;
8181
#elif NET40
8282
HttpContext context = HttpContext.Current;

‎samples/JavaScriptEngineSwitcher.Sample.Logic/Services/JsEvaluationService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3-
#if NET451 || NETSTANDARD
3+
#if NET451 || NET471 || NETSTANDARD
44
using Microsoft.AspNetCore.Mvc.Rendering;
55
#elif NET40
66
using System.Web.Mvc;

‎samples/JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Product>JS Engine Switcher: Resources for Samples</Product>
55
<VersionPrefix>3.0.0</VersionPrefix>
66
<VersionSuffix>beta3</VersionSuffix>
7-
<TargetFrameworks>net40-client;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net40-client;net45;net471;netstandard1.3;netstandard2.0</TargetFrameworks>
88
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
99
<OutputType>Library</OutputType>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Product>JS Engine Switcher: ChakraCore</Product>
55
<VersionPrefix>3.0.0</VersionPrefix>
66
<VersionSuffix>beta3</VersionSuffix>
7-
<TargetFrameworks>net40-client;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net40-client;net45;net471;netstandard1.3;netstandard2.0</TargetFrameworks>
88
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
99
<OutputType>Library</OutputType>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -22,7 +22,8 @@ This package does not contain the native implementations of ChakraCore. Therefor
2222
* JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</Description>
2323
<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_ChakraCore_Logo128x128.png</PackageIconUrl>
2424
<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;ChakraCore</PackageTags>
25-
<PackageReleaseNotes>Fixed a implementation of the `JsSerializedLoadScriptCallback` delegate.</PackageReleaseNotes>
25+
<PackageReleaseNotes>1. Added support of .NET Framework 4.7.1;
26+
2. Fixed a implementation of the `JsSerializedLoadScriptCallback` delegate.</PackageReleaseNotes>
2627
</PropertyGroup>
2728

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

‎src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Text;
3-
#if NET45 || NETSTANDARD
3+
#if NET45 || NET471 || NETSTANDARD
44
using System.Runtime.InteropServices;
55
#endif
66
#if NET40

‎src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsPropertyId.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System;
2-
#if NET45 || NETSTANDARD
2+
#if NET45 || NET471 || NETSTANDARD
33
using System.Runtime.InteropServices;
44
#endif
55
using System.Text;

‎src/JavaScriptEngineSwitcher.ChakraCore/ScriptDispatcher.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Runtime.CompilerServices;
4-
#if NET45 || NETSTANDARD
4+
#if NET45 || NET471 || NETSTANDARD
55
using System.Runtime.ExceptionServices;
66
#endif
77
using System.Threading;
@@ -150,7 +150,7 @@ private object InnnerInvoke(Func<object> del)
150150
Exception exception = task.Exception;
151151
if (exception != null)
152152
{
153-
#if NET45 || NETSTANDARD
153+
#if NET45 || NET471 || NETSTANDARD
154154
ExceptionDispatchInfo.Capture(exception).Throw();
155155
#elif NET40
156156
exception.PreserveStackTrace();

0 commit comments

Comments
 (0)