Skip to content

Commit ad9a944

Browse files
committed
In test projects added support of .NET 6
1 parent 729542e commit ad9a944

File tree

111 files changed

+149
-161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+149
-161
lines changed

build/common.props

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,4 @@
22
<PropertyGroup>
33
<Copyright>Copyright © 2012-2021 Andrey Taritsyn</Copyright>
44
</PropertyGroup>
5-
6-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' ">
7-
<DefineConstants>$(DefineConstants);NETFULL</DefineConstants>
8-
</PropertyGroup>
9-
10-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
11-
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
12-
</PropertyGroup>
13-
14-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' ">
15-
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
16-
</PropertyGroup>
175
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "5.0.302"
3+
"version": "6.0.100"
44
}
55
}

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using System;
33
using System.Runtime.Serialization;
44
using System.Security.Permissions;

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.ScriptSiteBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using System;
33
using System.Collections.Generic;
44
using System.Globalization;

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using System;
33
using System.Collections.Generic;
44
using System.Globalization;

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsErrorHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using System;
33
using System.Collections.Generic;
44

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper32.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using System;
33

44
using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapper64.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using System;
33

44
using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptWrapperBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using System;
33
using System.Runtime.InteropServices;
44

src/MsieJavaScriptEngine/ActiveScript/ChakraActiveScriptJsEngine.ScriptSite.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD
1+
#if NETFRAMEWORK
22
using MsieJavaScriptEngine.Constants;
33
using MsieJavaScriptEngine.Helpers;
44
using MsieJavaScriptEngine.Resources;

0 commit comments

Comments
 (0)