Update remaining refs

Rx.NET/Source/System.Reactive.Experimental/project.json

@@ -87,12 +87,6 @@
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.0",
-                "System.Linq": "4.0.0",
-                "System.Linq.Expressions": "4.0.0",
-                "System.Resources.ResourceManager": "4.0.0",
-                "System.Threading": "4.0.0",
-                "System.Runtime": "4.0.0"
             }
         },
         "dotnet5.4": {
@@ -114,13 +108,6 @@
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.11-beta-23516",
-                "System.ComponentModel": "4.0.1-beta-23516",
-                "System.Linq": "4.0.1-beta-23516",
-                "System.Threading": "4.0.11-beta-23516",
-                "System.Threading.Thread": "4.0.0-beta-23516",
-                "System.Threading.ThreadPool": "4.0.10-beta-23516",
-                "System.Threading.Timer": "4.0.1-beta-23516"
             }
         }
     }

Rx.NET/Source/System.Reactive.Observable.Aliases/project.json

@@ -85,12 +85,6 @@
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.0",
-                "System.Linq": "4.0.0",
-                "System.Linq.Expressions": "4.0.0",
-                "System.Resources.ResourceManager": "4.0.0",
-                "System.Threading": "4.0.0",
-                "System.Runtime": "4.0.0"
             }
         },
         "dotnet5.4": {
@@ -112,13 +106,6 @@
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.11-beta-23516",
-                "System.ComponentModel": "4.0.1-beta-23516",
-                "System.Linq": "4.0.1-beta-23516",
-                "System.Threading": "4.0.11-beta-23516",
-                "System.Threading.Thread": "4.0.0-beta-23516",
-                "System.Threading.ThreadPool": "4.0.10-beta-23516",
-                "System.Threading.Timer": "4.0.1-beta-23516"
             }
         }
     }

Rx.NET/Source/System.Reactive.Providers/project.json

@@ -46,7 +46,7 @@
                 ]
             },
             "dependencies": {
-                "System.Reflection": "4.1.0-beta-23516"
+               
             }
         },
         "net46": {
@@ -88,15 +88,8 @@
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.0",
-                "System.Linq": "4.0.0",
-                "System.Linq.Queryable": "4.0.0",
-                "System.Linq.Expressions": "4.0.0",
-                "System.Resources.ResourceManager": "4.0.0",
-                "System.Reflection": "4.0.0",
-                "System.Threading": "4.0.0",
-                "System.Runtime": "4.0.0",
-                "System.Reflection.Extensions": "4.0.0"
+                "System.Linq.Queryable": "4.0.1-rc3-23823",
+                "System.Reflection.Extensions": "4.0.1-rc3-23823"
             }
         },
         "dotnet5.4": {
@@ -118,14 +111,7 @@
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.11-beta-23516",
-                "System.ComponentModel": "4.0.1-beta-23516",
-                "System.Linq": "4.0.1-beta-23516",
-                "System.Linq.Queryable": "4.0.1-beta-23516",
-                "System.Threading": "4.0.11-beta-23516",
-                "System.Threading.Thread": "4.0.0-beta-23516",
-                "System.Threading.ThreadPool": "4.0.10-beta-23516",
-                "System.Threading.Timer": "4.0.1-beta-23516"
+                "System.Linq.Queryable": "4.0.1-rc3-23823"
             }
         }
     }

Rx.NET/Source/Tests.System.Reactive/DispatcherHelpers.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-#if DOTNET5_1 || DNX51
+#if DOTNET5_1 || DNX451 || DNX461
 using System.Threading;
 #else
 using System.Windows.Threading;

Rx.NET/Source/Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs

@@ -153,7 +153,7 @@ namespace ReactiveTests.Tests
                 }
                 catch (Exception ex)
                 {
-                    Assert.Fail("Virtual time {0}, exception {1}", watch.Elapsed, ex);
+                    Assert.True(false, string.Format("Virtual time {0}, exception {1}", watch.Elapsed, ex));
                 }
             }
         }

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

@@ -378,11 +378,11 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => new CompositeDisposable().Remove(null));
         }
 
-#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46
-        [Fact, ExpectedException(typeof(ArgumentNullException))]
+#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46 
+        [Fact]
         public void CancellationDisposable_Ctor_Null()
         {
-            new CancellationDisposable(null);
+            Assert.Throws<ArgumentNullException>(() => new CancellationDisposable(null));
         }
 
         [Fact]

Rx.NET/Source/Tests.System.Reactive/project.json

@@ -50,10 +50,6 @@
         "System.Reactive.Runtime.Remoting": { "target": "project" }        
       },
       "frameworkAssemblies": {
-        "System.Windows": "4.0.0.0",
-        "WindowsBase": "4.0.0.0",
-        "System.Runtime": "4.0.0.0",
-        "System.Threading.Tasks": "4.0.0.0"
       }
     },
     "dnx461": {
@@ -71,20 +67,16 @@
             "NO_THREAD",
             "CRIPPLED_REFLECTION",
             "PLIB",
-            "USE_TIMER_SELF_ROOT"
+            "USE_TIMER_SELF_ROOT",
+            "DESKTOPCLR",
+            "DESKTOPCLR46"
         ]
       },
-      "dependencies": {
-        "System.Collections.Concurrent": "4.0.0",
-        "System.Linq": "4.0.0",
-        "System.Threading": "4.0.0",
-        "System.Threading.Tasks": "4.0.0",
-        "System.Threading.Timer": "4.0.0",
-        "System.Runtime": "4.0.0",
-        "System.Runtime.Extensions": "4.0.0",
-        "System.Reflection": "4.0.0",        
-        "System.Reflection.Extensions": "4.0.0"
-      }
+        "dependencies": {
+            "System.Reactive.Windows.Threading": { "target": "project" },
+            "System.Reactive.Windows.Forms": { "target": "project" },
+            "System.Reactive.Runtime.Remoting": { "target": "project" }
+        }
     }
   }
 }