Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/guiunit.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ward <matt.ward@microsoft.com>2021-02-22 16:36:13 +0300
committerMatt Ward <matt.ward@microsoft.com>2021-02-22 16:36:13 +0300
commit18cfa13ad7e69730d5f1de5950302ff00c903c71 (patch)
tree885502131af25dc3b9e5d7d38e570c8a4bc7002a
parent9affe4813987b009022ab7b10e55f81f4a37344c (diff)
Add .NET 6 project
-rw-r--r--src/framework/GuiUnit_NET_6.csproj89
-rw-r--r--[-rwxr-xr-x]src/framework/Internal/TestExecutionContext.cs8
2 files changed, 93 insertions, 4 deletions
diff --git a/src/framework/GuiUnit_NET_6.csproj b/src/framework/GuiUnit_NET_6.csproj
new file mode 100644
index 0000000..1243b1a
--- /dev/null
+++ b/src/framework/GuiUnit_NET_6.csproj
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>NUnitLite</RootNamespace>
+ <AssemblyName>GuiUnit</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
+ <IntermediateOutputPath>obj\$(Configuration)\net-6.0\</IntermediateOutputPath>
+ <SignAssembly>true</SignAssembly>
+ <TargetFramework>net6.0</TargetFramework>
+ <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin\net_6_0</OutputPath>
+ <DefineConstants>TRACE;DEBUG;NET_4_5; CLR_4_0,NUNITLITE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <DocumentationFile>..\..\bin\Debug\net-6.0\nunitlite.xml</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
+ <NoWarn>1574;1591</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\bin\net_6_0</OutputPath>
+ <DefineConstants>TRACE;NET_4_5, CLR_4_0,NUNITLITE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <DocumentationFile>..\..\bin\Release\net-6.0\nunitlite.xml</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
+ <NoWarn>1574;1591</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>guiunit.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Remove="Runner\Silverlight\**" />
+ </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+</Project>
diff --git a/src/framework/Internal/TestExecutionContext.cs b/src/framework/Internal/TestExecutionContext.cs
index d7e7bb6..cdaa43d 100755..100644
--- a/src/framework/Internal/TestExecutionContext.cs
+++ b/src/framework/Internal/TestExecutionContext.cs
@@ -34,7 +34,7 @@ using System.Security.Principal;
#endif
using NUnit.Framework.Api;
-#if !NETCF
+#if !NETCF && !NETCOREAPP
using System.Runtime.Remoting.Messaging;
#endif
@@ -52,11 +52,11 @@ namespace NUnit.Framework.Internal
/// Static methods for each setting forward to the internal
/// object on the top of the stack.
/// </summary>
- public class TestExecutionContext
-#if !SILVERLIGHT && !NETCF
+ public class TestExecutionContext
+#if !SILVERLIGHT && !NETCF && !NETCOREAPP
//: ILogicalThreadAffinative
#endif
- {
+ {
#region Instance Fields
/// <summary>