-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into issue-529
# Conflicts: # src/NUnitTestAdapter/NUnit3TestExecutor.cs # src/NUnitTestAdapter/NUnitTestAdapter.cs
- Loading branch information
Showing
81 changed files
with
3,481 additions
and
1,142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "Build", | ||
| "type": "shell", | ||
| "command": "./build.ps1 -t Build", | ||
| "windows": { | ||
| "command": ".\\build.cmd -t Build" | ||
| }, | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "Test", | ||
| "type": "shell", | ||
| "command": "./build.ps1 -t Test", | ||
| "windows": { | ||
| "command": ".\\build.cmd -t Test" | ||
| }, | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <RunSettings> | ||
| <TestRunParameters> | ||
| <Parameter name="KeepWorkspaces" value="true" /> | ||
| </TestRunParameters> | ||
| </RunSettings> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String> | ||
| <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></s:String> | ||
| <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String></wpf:ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <RunSettings> | ||
| <RunConfiguration> | ||
| <!-- 0 = As many processes as possible, limited by number of cores on machine, 1 = Sequential (1 process), 2-> Given number of processes up to limit by number of cores on machine--> | ||
| <MaxCpuCount>0</MaxCpuCount> | ||
| </RunConfiguration> | ||
|
|
||
| <!-- | ||
| <TestRunParameters> | ||
| <Parameter name="webAppUrl" value="http://localhost" /> | ||
| <Parameter name="webAppUserName" value="Admin" /> | ||
| </TestRunParameters> | ||
| --> | ||
|
|
||
| <!-- Adapter Specific sections --> | ||
|
|
||
| <!-- MSTest adapter --> | ||
| <MSTest> | ||
| <MapInconclusiveToFailed>True</MapInconclusiveToFailed> | ||
| <CaptureTraceOutput>false</CaptureTraceOutput> | ||
| <DeleteDeploymentDirectoryAfterTestRunIsComplete>False</DeleteDeploymentDirectoryAfterTestRunIsComplete> | ||
| <DeploymentEnabled>False</DeploymentEnabled> | ||
| <!-- Uncomment and update path for assembly resolution --> | ||
| <!-- <AssemblyResolution> | ||
| <Directory path="D:\myfolder\bin\" includeSubDirectories="false"/> | ||
| </AssemblyResolution> --> | ||
| </MSTest> | ||
|
|
||
| <!-- NUnit3 adapter, uncomment to set as appropriate, numeric, booleans, enums have their default values below, except RandomSeed --> | ||
| <!-- | ||
| <NUnit> | ||
| <BasePath>D:\Dev\NUnit\nunit3-vs-adapter\demo\NUnitTestDemo\bin\Release</BasePath> | ||
| <PrivateBinPath>extras;more.extras</PrivateBinPath> | ||
| <DefaultTimeout>0</DefaultTimeout> | ||
| <WorkDirectory>work</WorkDirectory> | ||
| <InternalTraceLevel>Off</InternalTraceLevel> | ||
| <RandomSeed>1234567</RandomSeed> | ||
| <NumberOfTestWorkers>-1</NumberOfTestWorkers> | ||
| <Verbosity>0</Verbosity> | ||
| <UseVsKeepEngineRunning>false</UseVsKeepEngineRunning> | ||
| <ShadowCopyFiles>false</ShadowCopyFiles> | ||
| <DefaultTestNamePattern>{m}{a}</DefaultTestNamePattern> | ||
| </NUnit> | ||
| --> | ||
|
|
||
| <NUnit> | ||
| <Verbosity>0</Verbosity> | ||
| </NUnit> | ||
|
|
||
|
|
||
| </RunSettings> | ||
|
|
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.