diff options
| author | Sebastien Pouliot <sebastien.pouliot@gmail.com> | 2015-11-18 22:56:47 +0300 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien.pouliot@gmail.com> | 2015-11-18 22:56:47 +0300 |
| commit | 394870fec8b20317334aff73c7d6d07590b06560 (patch) | |
| tree | 1d32205d63f523562545c96e025624a37cefdce9 | |
| parent | c6f1cb01efe5d687875fcc6243abc6910a064410 (diff) | |
| parent | 0970864f494ee4b56220a3a8bb79b5c4dc2978ab (diff) | |
Merge pull request #5 from rolfbjarne/thread-abort-removal
Thread.[Reset]Abort is not available for tvOS/watchOS.
5 files changed, 6 insertions, 6 deletions
diff --git a/NUnitLite-1.0.0/src/framework/Internal/Commands/ApplyChangesToContextCommand.cs b/NUnitLite-1.0.0/src/framework/Internal/Commands/ApplyChangesToContextCommand.cs index 14c09cc..c7ee4ca 100644 --- a/NUnitLite-1.0.0/src/framework/Internal/Commands/ApplyChangesToContextCommand.cs +++ b/NUnitLite-1.0.0/src/framework/Internal/Commands/ApplyChangesToContextCommand.cs @@ -52,7 +52,7 @@ namespace NUnit.Framework.Internal.Commands } catch (Exception ex) { -#if !NETCF && !SILVERLIGHT +#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ if (ex is ThreadAbortException) Thread.ResetAbort(); #endif diff --git a/NUnitLite-1.0.0/src/framework/Internal/Commands/ExpectedExceptionCommand.cs b/NUnitLite-1.0.0/src/framework/Internal/Commands/ExpectedExceptionCommand.cs index e2d06fa..566540e 100644 --- a/NUnitLite-1.0.0/src/framework/Internal/Commands/ExpectedExceptionCommand.cs +++ b/NUnitLite-1.0.0/src/framework/Internal/Commands/ExpectedExceptionCommand.cs @@ -64,7 +64,7 @@ namespace NUnit.Framework.Internal.Commands } catch (Exception ex) { -#if !NETCF && !SILVERLIGHT +#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ if (ex is ThreadAbortException) Thread.ResetAbort(); #endif diff --git a/NUnitLite-1.0.0/src/framework/Internal/Commands/SetUpTearDownCommand.cs b/NUnitLite-1.0.0/src/framework/Internal/Commands/SetUpTearDownCommand.cs index 4cae066..069e83b 100644 --- a/NUnitLite-1.0.0/src/framework/Internal/Commands/SetUpTearDownCommand.cs +++ b/NUnitLite-1.0.0/src/framework/Internal/Commands/SetUpTearDownCommand.cs @@ -85,7 +85,7 @@ namespace NUnit.Framework.Internal.Commands } catch (Exception ex) { -#if !NETCF && !SILVERLIGHT +#if !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ if (ex is ThreadAbortException) Thread.ResetAbort(); #endif diff --git a/NUnitLite-1.0.0/src/framework/Internal/ThreadUtility.cs b/NUnitLite-1.0.0/src/framework/Internal/ThreadUtility.cs index ae38644..1ce37f8 100644 --- a/NUnitLite-1.0.0/src/framework/Internal/ThreadUtility.cs +++ b/NUnitLite-1.0.0/src/framework/Internal/ThreadUtility.cs @@ -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 +#if (CLR_2_0 || CLR_4_0) && !NETCF && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ using System; using System.Threading; diff --git a/NUnitLite-1.0.0/src/framework/Internal/WorkItems/WorkItem.cs b/NUnitLite-1.0.0/src/framework/Internal/WorkItems/WorkItem.cs index c467ccb..cda0b58 100644 --- a/NUnitLite-1.0.0/src/framework/Internal/WorkItems/WorkItem.cs +++ b/NUnitLite-1.0.0/src/framework/Internal/WorkItems/WorkItem.cs @@ -117,7 +117,7 @@ namespace NUnit.Framework.Internal.WorkItems { _context = new TestExecutionContext(context); -#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT +#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ // Timeout set at a higher level int timeout = _context.TestCaseTimeout; @@ -134,7 +134,7 @@ namespace NUnit.Framework.Internal.WorkItems #endif } -#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT +#if (CLR_2_0 || CLR_4_0) && !SILVERLIGHT && !__TVOS__ && !__WATCHOS__ private void RunTestWithTimeout(int timeout) { Thread thread = new Thread(new ThreadStart(RunTest)); |