Merge pull request #23 from shiftbot/enable-platforms-and-flags

Enable platforms and flags

Rx.NET/Source/Microsoft.Reactive.Testing/project.json

@@ -1,97 +1,110 @@
 {
-  "version": "3.0.0-*",
-  "title": "Microsoft.Reactive.Testing - Testing Helper Library",
-  "description": "Reactive Extensions Testing Library containing interfaces and classes providing functionality to test applications and libraries built using Reactive Extensions.",
-  "authors": [ "Microsoft" ],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  "tags": [ "Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events" ],
-  "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-  "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
-  "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
-  "requireLicenseAcceptance": true,
+    "version": "3.0.0-*",
+    "title": "Microsoft.Reactive.Testing - Testing Helper Library",
+    "description":
+        "Reactive Extensions Testing Library containing interfaces and classes providing functionality to test applications and libraries built using Reactive Extensions.",
+    "authors": ["Microsoft"],
+    "copyright": "Copyright (C) Microsoft Corporation",
+    "tags": ["Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events"],
+    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
+    "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
+    "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
+    "requireLicenseAcceptance": true,
 
-  "dependencies": {
-    "System.Reactive.Linq": { "target": "project" },
-    "System.Reactive.PlatformServices": { "target": "project" },
-    "xunit": "2.1.0"
-  },
-
-  "frameworks": {
-    "net45": {
-      "compilationOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_DISPATCHER_PRIORITY",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      },
-      "frameworkAssemblies": {
-        "System.Runtime": "4.0.0.0"
-      }
+    "dependencies": {
+        "System.Reactive.Linq": { "target": "project" },
+        "System.Reactive.PlatformServices": { "target": "project" },
+        "xunit": "2.1.0"
     },
-    "dotnet5.1": {
-      "compilationOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "NO_WEAKTABLE",
-          "CRIPPLED_REFLECTION",
-          "PLIB",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      },
-      "dependencies": {
-        "System.Linq": "4.0.0",
-        "System.Collections.Concurrent": "4.0.0",
-        "System.ComponentModel": "4.0.0",
-        "System.Threading": "4.0.0",
-        "System.Threading.Timer": "4.0.0",
-        "System.Runtime": "4.0.0",
-        "System.Runtime.Extensions": "4.0.0"
-      }
 
-    },
-    "dotnet5.4": {
-      "compilationOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "PLIB",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      },
-      "dependencies": {
-        "System.Diagnostics.Tools": "4.0.1-beta-23516",
-        "System.Linq": "4.0.1-beta-23516",
-        "System.Linq.Expressions": "4.0.11-beta-23516",
-        "System.Resources.ResourceManager": "4.0.1-beta-23516",
-        "System.Threading": "4.0.11-beta-23516",
-        "System.Runtime": "4.0.21-beta-23516"
-      }
+    "frameworks": {
+        "net45": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            },
+            "frameworkAssemblies": {
+                "System.Runtime": "4.0.0.0"
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
+                ]
+            },
+            "dependencies": {
+                "System.Runtime": "4.1.0-rc3-23823"
+            }
+            
+        },
+        "dotnet5.1": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "NO_REMOTING",
+                    "NO_SERIALIZABLE",
+                    "NO_THREAD",
+                    "CRIPPLED_REFLECTION",
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
+                ]
+            },
+            "dependencies": {
+            }
+
+        },
+        "dotnet5.4": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "NO_REMOTING",
+                    "NO_SERIALIZABLE",
+                    "NO_THREAD",
+                    "CRIPPLED_REFLECTION",
+                    "PLIB",
+                    "USE_TIMER_SELF_ROOT"
+                ]
+            },
+            "dependencies": {
+            }
+        }
     }
-  }
 }

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

@@ -22,7 +22,9 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
@@ -38,7 +40,28 @@
                     "HAS_APTCA",
                     "HAS_DISPATCHER_PRIORITY",
                     "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
                 ]
             }
         },
@@ -55,22 +78,22 @@
                     "NO_REMOTING",
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
-                    "NO_WEAKTABLE",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Linq": "4.0.0",
-                "System.Collections.Concurrent": "4.0.0",
-                "System.ComponentModel": "4.0.0",
-                "System.Threading": "4.0.0",
-                "System.Threading.Timer": "4.0.0",
-                "System.Runtime": "4.0.0",
-                "System.Runtime.Extensions": "4.0.0"
+                "System.ComponentModel": "4.0.1-rc3-23823",
+                "System.Diagnostics.Contracts": "4.0.1-rc3-23823",
+                "System.Diagnostics.Debug": "4.0.11-rc3-23823",
+                "System.Dynamic.Runtime": "4.0.11-rc3-23823",
+                "System.Linq": "4.0.1-rc3-23823",
+                "System.Runtime": "4.1.0-rc3-23823",
+                "System.Runtime.Extensions": "4.1.0-rc3-23823",
+                "System.Threading": "4.0.11-rc3-23823"
             }
-            
         },
         "dotnet5.4": {
             "compilationOptions": {
@@ -91,13 +114,13 @@
                 ]
             },
             "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"
+                "System.Collections.Concurrent": "4.0.12-rc3-23823",
+                "System.ComponentModel": "4.0.1-rc3-23823",
+                "System.Linq": "4.0.1-rc3-23823",
+                "System.Threading": "4.0.11-rc3-23823",
+                "System.Threading.Thread": "4.0.0-rc3-23823",
+                "System.Threading.ThreadPool": "4.0.10-rc3-23823",
+                "System.Threading.Timer": "4.0.1-rc3-23823"
             }
         }
     }

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

@@ -24,7 +24,9 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
@@ -40,7 +42,28 @@
                     "HAS_APTCA",
                     "HAS_DISPATCHER_PRIORITY",
                     "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
                 ]
             }
         },
@@ -58,17 +81,12 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
                 ]
             },
             "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": {
@@ -90,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.Interfaces/project.json

@@ -9,7 +9,6 @@
     "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
     "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
     "requireLicenseAcceptance": true,
-
     "frameworks": {
         "net40": {
             "compilationOptions": {
@@ -18,7 +17,9 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
@@ -34,7 +35,9 @@
                     "HAS_APTCA",
                     "HAS_DISPATCHER_PRIORITY",
                     "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
                 ]
             }
         },
@@ -52,43 +55,18 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
-                ]
-            },
-            "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.2": {
-            "compilationOptions": {
-                "define": [
-                    "NO_EVENTARGS_CONSTRAINT",
-                    "HAS_EDI",
-                    "HAS_WINRT",
-                    "HAS_PROGRESS",
-                    "PREFER_ASYNC",
-                    "HAS_AWAIT",
-                    "HAS_APTCA",
-                    "NO_REMOTING",
-                    "NO_SERIALIZABLE",
-                    "NO_THREAD",
-                    "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.1-beta-23516",
-                "System.Linq": "4.0.1-beta-23516",
-                "System.Linq.Expressions": "4.0.11-beta-23516",
-                "System.Resources.ResourceManager": "4.0.1-beta-23516",
-                "System.Threading": "4.0.11-beta-23516"
+                "System.Diagnostics.Tools": "4.0.1-rc3-23823",
+                "System.Linq": "4.0.1-rc3-23823",
+                "System.Linq.Expressions": "4.0.11-rc3-23823",
+                "System.Resources.ResourceManager": "4.0.1-rc3-23823",
+                "System.Runtime": "4.1.0-rc3-23823",
+                "System.Threading": "4.0.11-rc3-23823"
             }
         }
     }

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

@@ -29,7 +29,9 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
@@ -45,7 +47,28 @@
                     "HAS_APTCA",
                     "HAS_DISPATCHER_PRIORITY",
                     "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
                 ]
             }
         },
@@ -63,16 +86,15 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.0",
-                "System.Reflection.TypeExtensions": "4.0.0",
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.0",
-                "System.Runtime": "4.0.0",
-                "System.Runtime.Extensions": "4.0.0"
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc3-23823",
+                "System.Runtime": "4.1.0-rc3-23823",
+                "System.Runtime.Extensions": "4.1.0-rc3-23823"
             }
         },
         "dotnet5.4": {
@@ -94,9 +116,9 @@
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.11-beta-23516",
-                "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-beta-23516"
+                "System.Collections.Concurrent": "4.0.12-rc3-23823",
+                "System.Reflection.TypeExtensions": "4.1.0-rc3-23823",
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc3-23823"
             }
         }
     }

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

@@ -22,7 +22,9 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
@@ -38,7 +40,28 @@
                     "HAS_APTCA",
                     "HAS_DISPATCHER_PRIORITY",
                     "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
                 ]
             }
         },
@@ -56,17 +79,12 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
                 ]
             },
             "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": {
@@ -88,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.PlatformServices/project.json

@@ -24,7 +24,9 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
@@ -40,7 +42,28 @@
                     "HAS_APTCA",
                     "HAS_DISPATCHER_PRIORITY",
                     "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
                 ]
             }
         },
@@ -58,13 +81,12 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.0",
-                "System.Diagnostics.Debug": "4.0.10"
             }
         },
         "dotnet5.4": {
@@ -86,8 +108,6 @@
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.1-beta-23516",
-                "System.Diagnostics.Debug": "4.0.11-beta-23516"
             }
         }
     }

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

@@ -22,7 +22,9 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
@@ -38,11 +40,32 @@
                     "HAS_APTCA",
                     "HAS_DISPATCHER_PRIORITY",
                     "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
                 ]
             },
             "dependencies": {
-                "System.Reflection": "4.1.0-beta-23516"
+               
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
+                ]
             }
         },
         "dotnet5.1": {
@@ -59,20 +82,14 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "NO_CDS_COLLECTIONS",
+                    "USE_TIMER_SELF_ROOT",
+                    "PLIB"
                 ]
             },
             "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": {
@@ -94,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/System.Reactive.Runtime.Remoting/project.json

@@ -22,23 +22,27 @@
                     "HAS_APTCA",
                     "HAS_WINFORMS",
                     "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
         "net45": {
           "compilationOptions": {
             "define": [
-              "NO_EVENTARGS_CONSTRAINT",
-              "HAS_EDI",
-              "HAS_WINRT",
-              "HAS_PROGRESS",
-              "PREFER_ASYNC",
-              "HAS_AWAIT",
-              "HAS_APTCA",
-              "HAS_DISPATCHER_PRIORITY",
-              "HAS_WINFORMS",
-              "USE_TIMER_SELF_ROOT"
+                "NO_EVENTARGS_CONSTRAINT",
+                "HAS_EDI",
+                "HAS_WINRT",
+                "HAS_PROGRESS",
+                "PREFER_ASYNC",
+                "HAS_AWAIT",
+                "HAS_APTCA",
+                "HAS_DISPATCHER_PRIORITY",
+                "HAS_WINFORMS",
+                "USE_TIMER_SELF_ROOT",
+                "DESKTOPCLR",
+                "DESKTOPCLR45"
             ]
           }    
         }

Rx.NET/Source/System.Reactive.Windows.Forms/project.json

@@ -1,56 +1,85 @@
 {
-  "version": "3.0.0-*",
-  "title": "Reactive Extensions - Windows Forms Helpers",
-  "description": "Windows Forms extensions library for Rx. Contains scheduler functionality for the Windows Forms UI loop.",
-  "authors": [ "Microsoft" ],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  "tags": [ "Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events" ],
-  "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-  "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
-  "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
-  "requireLicenseAcceptance": true,
+    "version": "3.0.0-*",
+    "title": "Reactive Extensions - Windows Forms Helpers",
+    "description":
+        "Windows Forms extensions library for Rx. Contains scheduler functionality for the Windows Forms UI loop.",
+    "authors": ["Microsoft"],
+    "copyright": "Copyright (C) Microsoft Corporation",
+    "tags": ["Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events"],
+    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
+    "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
+    "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
+    "requireLicenseAcceptance": true,
 
-  "dependencies": {
-    "System.Reactive.Interfaces": { "target": "project" },
-    "System.Reactive.Core": { "target": "project" }
-  },
-
-  "frameworks": {
-    "net40": {
-      "compilationOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT"
-        ]
-      },
-      "frameworkAssemblies": {
-        "System.Windows.Forms": "4.0.0.0",
-        "WindowsBase": "4.0.0.0"
-      }
+    "dependencies": {
+        "System.Reactive.Interfaces": { "target": "project" },
+        "System.Reactive.Core": { "target": "project" }
     },
-    "net45": {
-      "compilationOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_DISPATCHER_PRIORITY",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      },
-      "frameworkAssemblies": {
-        "System.Windows": "4.0.0.0",
-        "System.Windows.Forms": "4.0.0.0",
-        "WindowsBase": "4.0.0.0"
-      }
+
+    "frameworks": {
+        "net40": {
+            "compilationOptions": {
+                "define": [
+                    "NO_TASK_DELAY",
+                    "HAS_APTCA",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
+                ]
+            },
+            "frameworkAssemblies": {
+                "System.Windows.Forms": "4.0.0.0",
+                "WindowsBase": "4.0.0.0"
+            }
+        },
+        "net45": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            },
+            "frameworkAssemblies": {
+                "System.Windows": "4.0.0.0",
+                "System.Windows.Forms": "4.0.0.0",
+                "WindowsBase": "4.0.0.0"
+            }
+        },
+        "net46": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_TPL46",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
+                ]
+            },
+            "frameworkAssemblies": {
+                "System.Windows": "4.0.0.0",
+                "System.Windows.Forms": "4.0.0.0",
+                "WindowsBase": "4.0.0.0"
+            }
+        }
     }
-  }
 }

Rx.NET/Source/System.Reactive.Windows.Threading/project.json

@@ -1,54 +1,58 @@
 {
-  "version": "3.0.0-*",
-  "title": "Reactive Extensions - WPF Helpers",
-  "description": "Windows Presentation Foundation extensions library for Rx. Contains scheduler functionality for the WPF Dispatcher.",
-  "authors": [ "Microsoft" ],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  "tags": [ "Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events" ],
-  "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-  "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
-  "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
-  "requireLicenseAcceptance": true,
+    "version": "3.0.0-*",
+    "title": "Reactive Extensions - WPF Helpers",
+    "description":
+        "Windows Presentation Foundation extensions library for Rx. Contains scheduler functionality for the WPF Dispatcher.",
+    "authors": ["Microsoft"],
+    "copyright": "Copyright (C) Microsoft Corporation",
+    "tags": ["Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events"],
+    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
+    "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
+    "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
+    "requireLicenseAcceptance": true,
 
-  "dependencies": {
-    "System.Reactive.Interfaces": { "target": "project" },
-    "System.Reactive.Core": { "target": "project" }
-  },
-
-  "frameworks": {
-    "net40": {
-      "compilationOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT"
-        ]
-      },
-      "frameworkAssemblies": {
-        "WindowsBase": "4.0.0.0"
-      }
+    "dependencies": {
+        "System.Reactive.Interfaces": { "target": "project" },
+        "System.Reactive.Core": { "target": "project" }
     },
-    "net45": {
-      "compilationOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_DISPATCHER_PRIORITY",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      },
-      "frameworkAssemblies": {
-        "System.Windows": "4.0.0.0",
-        "WindowsBase": "4.0.0.0"
-      }
+    "frameworks": {
+        "net40": {
+            "compilationOptions": {
+                "define": [
+                    "NO_TASK_DELAY",
+                    "HAS_APTCA",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "NO_WEAKREFOFT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
+                ]
+            },
+            "frameworkAssemblies": {
+                "WindowsBase": "4.0.0.0"
+            }
+        },
+        "net45": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "HAS_DISPATCHER_PRIORITY",
+                    "HAS_WINFORMS",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
+                ]
+            },
+            "frameworkAssemblies": {
+                "System.Windows": "4.0.0.0",
+                "WindowsBase": "4.0.0.0"
+            }
+        }
     }
-  }
 }

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

@@ -40,9 +40,8 @@
                 "version": "1.0.1",
                 "type": "build"
             },
-            "System.Runtime": "4.0.0",
-            "System.Threading.Tasks": "4.0.0",
-            "System.Runtime.WindowsRuntime": "4.0.10"
+            "System.Threading.Tasks": "4.0.11-rc3-23823",
+            "System.Runtime.WindowsRuntime": "4.0.11-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

@@ -39,7 +39,9 @@
             "HAS_APTCA",
             "HAS_STACKTRACE",
             "HAS_WINFORMS",
-            "USE_TIMER_SELF_ROOT"
+            "USE_TIMER_SELF_ROOT",
+            "DESKTOPCLR",
+            "DESKTOPCLR45"
         ]
       },
       "dependencies": {
@@ -48,13 +50,9 @@
         "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"
       }
     },
-    "dnx51": {
+    "dnx461": {
       "compilationOptions": {
         "define": [
             "NO_EVENTARGS_CONSTRAINT",
@@ -69,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" }
+        }
     }
   }
 }