Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@@ -52,7 +52,7 @@ namespace NUnit.Framework.Internal.Commands
}
catch (Exception ex)
{
#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH
#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH && !WASM
if (ex is ThreadAbortException)
Thread.ResetAbort();
#endif

View File

@@ -64,7 +64,7 @@ namespace NUnit.Framework.Internal.Commands
}
catch (Exception ex)
{
#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH
#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH && !WASM
if (ex is ThreadAbortException)
Thread.ResetAbort();
#endif

View File

@@ -85,7 +85,7 @@ namespace NUnit.Framework.Internal.Commands
}
catch (Exception ex)
{
#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH
#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH && !WASM
if (ex is ThreadAbortException)
Thread.ResetAbort();
#endif

View File

@@ -21,7 +21,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ***********************************************************************
#if (CLR_2_0 || CLR_4_0) && !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH
#if (CLR_2_0 || CLR_4_0) && !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH && !WASM
using System;
using System.Threading;

View File

@@ -122,7 +122,7 @@ namespace NUnit.Framework.Internal.WorkItems
{
_context = new TestExecutionContext(context);
#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH
#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH && !WASM
// Timeout set at a higher level
int timeout = _context.TestCaseTimeout;
@@ -139,7 +139,7 @@ namespace NUnit.Framework.Internal.WorkItems
#endif
}
#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH
#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ && !MONOTOUCH_TV && !MONOTOUCH_WATCH && !WASM
private void RunTestWithTimeout(int timeout)
{
Thread thread = new Thread(new ThreadStart(RunTest));

View File

@@ -115,11 +115,12 @@ namespace NUnitLite.Runner
{
#if MONO
return;
#endif
#else
reportCount = 0;
writer.WriteLine();
writer.WriteLine("Tests Not Run:");
PrintNotRunResults(this.result);
#endif
}
#if MONO