update defines

Rx.NET/Source/Directory.build.targets

@@ -9,10 +9,10 @@
     <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;DESKTOPCLR</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;DESKTOPCLR</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
     <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;WINDOWS</DefineConstants>

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs

@@ -124,7 +124,7 @@ namespace ReactiveTests.Tests
             var evt = new ManualResetEvent(false);
             disp.UnhandledException += (o, e) =>
             {
-#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46
+#if NET45 || NET46
                 Assert.Same(ex, e.Exception); // CHECK
 #else
                 Assert.Same(ex, e.Exception.InnerException); // CHECK

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs

@@ -380,7 +380,7 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => new CompositeDisposable().Remove(null));
         }
 
-#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46 
+#if NET45 || NET46 
         [Fact]
         public void CancellationDisposable_Ctor_Null()
         {

Rx.NET/Source/tests/Tests.System.Reactive/Tests/RegressionTest.cs

@@ -18,7 +18,7 @@ namespace ReactiveTests.Tests
     
     public class RegressionTest : ReactiveTest
     {
-#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46
+#if NET45 || NET46
         [Fact]
         public void Bug_ConcurrentMerge()
         {

Rx.NET/Source/tests/Tests.System.Reactive/Tests/SystemClockTest.cs

@@ -5,6 +5,7 @@
 #if !NO_REMOTING && !XUNIT
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;

Rx.NET/Source/tests/Tests.System.Reactive/xunit.runner.json

@@ -1,5 +1,5 @@
 {
   "diagnosticMessages": true,
   "methodDisplay": "classAndMethod",
-  "longRunningTestSeconds": 30 
+  "longRunningTestSeconds": 30
 }