Update to 24027

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

@@ -106,7 +106,7 @@
       }
     },
     "netstandard1.3": {
-      "imports": [ "dotnet", "portable-net45+win8" ],
+      "imports": ["dotnet", "portable-net45+win8"],
       "buildOptions": {
         "define": [
           "NO_EVENTARGS_CONSTRAINT",
@@ -126,7 +126,7 @@
         ]
       },
       "dependencies": {
-
+      
       }
     },
     "wpa81": {
@@ -213,7 +213,7 @@
           "type": "build"
         },
         "Microsoft.NETCore.UniversalWindowsPlatform": {
-          "version": "5.2.0-rc2-23925",
+          "version": "5.2.0-rc2-24027",
           "type": "build"
         }
       }

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

@@ -102,9 +102,9 @@
         ]
       },
       "dependencies": {
-        "System.ComponentModel": "4.0.1-rc2-24103",
-        "System.Diagnostics.Contracts": "4.0.1-rc2-24103",
-        "System.Dynamic.Runtime": "4.0.11-rc2-24103"
+        "System.ComponentModel": "4.0.1-rc2-24027",
+        "System.Diagnostics.Contracts": "4.0.1-rc2-24027",
+        "System.Dynamic.Runtime": "4.0.11-rc2-24027"
       }
     },
     "netstandard1.3": {
@@ -127,9 +127,9 @@
         ]
       },
       "dependencies": {
-        "System.ComponentModel": "4.0.1-rc2-24103",
-        "System.Diagnostics.Contracts": "4.0.1-rc2-24103",
-        "System.Dynamic.Runtime": "4.0.11-rc2-24103"
+        "System.ComponentModel": "4.0.1-rc2-24027",
+        "System.Diagnostics.Contracts": "4.0.1-rc2-24027",
+        "System.Dynamic.Runtime": "4.0.11-rc2-24027"
       }
     },
     "sl5": {
@@ -150,7 +150,7 @@
         ]
       },
       "dependencies": {
-            
+      
       }
     }
   }

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

@@ -80,8 +80,8 @@
         ]
       },
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24103",
-        "System.Linq.Expressions": "4.0.11-rc2-24103"
+        "NETStandard.Library": "1.5.0-rc2-24027",
+        "System.Linq.Expressions": "4.0.11-rc2-24027"
       }
     },
     "sl5": {

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

@@ -112,7 +112,7 @@
         ]
       },
       "dependencies": {
-        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24103"
+        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24027"
       }
     },
     "netstandard1.3": {
@@ -135,7 +135,7 @@
         ]
       },
       "dependencies": {
-        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24103"
+        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24027"
       }
     },
     "sl5": {
@@ -156,7 +156,7 @@
         ]
       },
       "dependencies": {
-            
+      
       }
     }
   }

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

@@ -106,7 +106,7 @@
         ]
       },
       "dependencies": {
-            
+      
       }
     },
     "netstandard1.3": {
@@ -129,7 +129,7 @@
         ]
       },
       "dependencies": {
-            
+      
       }
     },
     "wpa81": {
@@ -216,7 +216,7 @@
           "type": "build"
         },
         "Microsoft.NETCore.UniversalWindowsPlatform": {
-          "version": "5.2.0-rc2-24103",
+          "version": "5.2.0-rc2-24027",
           "type": "build"
         }
       }
@@ -239,7 +239,7 @@
         ]
       },
       "dependencies": {
-            
+      
       }
     }
   }

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

@@ -105,8 +105,8 @@
         ]
       },
       "dependencies": {
-        "System.Linq.Queryable": "4.0.1-rc2-23925",
-        "System.Reflection.Extensions": "4.0.1-rc2-23925"
+        "System.Linq.Queryable": "4.0.1-rc2-24027",
+        "System.Reflection.Extensions": "4.0.1-rc2-24027"
       }
     },
     "netstandard1.3": {
@@ -129,8 +129,8 @@
         ]
       },
       "dependencies": {
-        "System.Linq.Queryable": "4.0.1-rc2-23925",
-        "System.Reflection.Extensions": "4.0.1-rc2-23925"
+        "System.Linq.Queryable": "4.0.1-rc2-24027",
+        "System.Reflection.Extensions": "4.0.1-rc2-24027"
       }
     },
     "sl5": {

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

@@ -47,8 +47,8 @@
         ]
       },
       "frameworkAssemblies": {
-        "System.Windows.Forms": "4.0.0.0",
-        "WindowsBase": "4.0.0.0"
+        "System.Windows.Forms": "",
+        "WindowsBase": ""
       }
     },
     "net45": {
@@ -69,9 +69,9 @@
         ]
       },
       "frameworkAssemblies": {
-        "System.Windows": "4.0.0.0",
-        "System.Windows.Forms": "4.0.0.0",
-        "WindowsBase": "4.0.0.0"
+        "System.Windows": "",
+        "System.Windows.Forms": "",
+        "WindowsBase": ""
       }
     },
     "net46": {
@@ -93,9 +93,9 @@
         ]
       },
       "frameworkAssemblies": {
-        "System.Windows": "4.0.0.0",
-        "System.Windows.Forms": "4.0.0.0",
-        "WindowsBase": "4.0.0.0"
+        "System.Windows": "",
+        "System.Windows.Forms": "",
+        "WindowsBase": ""
       }
     }
   }

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

@@ -1,185 +1,186 @@
 {
-    "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",
+  "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",
 
   "packOptions": {
-    "tags": [ "Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events" ],
+    "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
-  }, 
-    
-    "buildOptions": {
-        "keyFile": "../35MSSharedLib1024.snk",
-        "publicSign": true,
-        "define": [ "SIGNED" ]
-    },
-    "configurations": {
-        "ReleaseDelaySigned": {
-          "buildOptions": {
-            "publicSign": false,
-            "delaySign": true,
-            "define": [ "RELEASE", "TRACE" ],
-            "optimize": true
-          }
-        }
+  },
+
+  "buildOptions": {
+    "keyFile": "../35MSSharedLib1024.snk",
+    "publicSign": true,
+    "define": ["SIGNED"]
+  },
+  "configurations": {
+    "ReleaseDelaySigned": {
+      "buildOptions": {
+        "publicSign": false,
+        "delaySign": true,
+        "define": ["RELEASE", "TRACE"],
+        "optimize": true
+      }
+    }
+  },
+  "dependencies": {
+    "System.Reactive.Interfaces": { "target": "project" },
+    "System.Reactive.Core": { "target": "project" }
+  },
+  "frameworks": {
+    "net40": {
+      "buildOptions": {
+        "define": [
+          "NO_TASK_DELAY",
+          "HAS_APTCA",
+          "HAS_WINFORMS",
+          "USE_TIMER_SELF_ROOT",
+          "NO_WEAKREFOFT",
+          "DESKTOPCLR",
+          "DESKTOPCLR40"
+        ]
+      },
+      "frameworkAssemblies": {
+        "WindowsBase": ""
+      }
     },
-    "dependencies": {
-        "System.Reactive.Interfaces": { "target": "project" },
-        "System.Reactive.Core": { "target": "project" }
+    "net45": {
+      "buildOptions": {
+        "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": "",
+        "WindowsBase": ""
+      }
     },
-    "frameworks": {
-        "net40": {
-          "buildOptions": {
-            "define": [
-              "NO_TASK_DELAY",
-              "HAS_APTCA",
-              "HAS_WINFORMS",
-              "USE_TIMER_SELF_ROOT",
-              "NO_WEAKREFOFT",
-              "DESKTOPCLR",
-              "DESKTOPCLR40"
-            ]
-          },
-            "frameworkAssemblies": {
-                "WindowsBase": "4.0.0.0"
-            }
-        },
-        "net45": {
-          "buildOptions": {
-            "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"
-            }
-        },
-        "wpa81": {
-          "buildOptions": {
-            "define": [
-              "NO_EVENTARGS_CONSTRAINT",
-              "HAS_EDI",
-              "HAS_WINRT",
-              "HAS_PROGRESS",
-              "PREFER_ASYNC",
-              "HAS_AWAIT",
-              "NO_REMOTING",
-              "NO_SERIALIZABLE",
-              "NO_THREAD",
-              "CRIPPLED_REFLECTION",
-              "USE_TIMER_SELF_ROOT",
-              "WINDOWS",
-              "WINDOWS81"
-            ]
-          },
-            "dependencies": {
-                "Microsoft.TargetingPack.Private.WinRT": {
-                    "version": "1.0.1",
-                    "type": "build"
-                },
-                "Microsoft.TargetingPack.Private.WindowsPhone.v8.1": {
-                    "version": "1.0.1",
-                    "type": "build"
-                }
-            }
+    "wpa81": {
+      "buildOptions": {
+        "define": [
+          "NO_EVENTARGS_CONSTRAINT",
+          "HAS_EDI",
+          "HAS_WINRT",
+          "HAS_PROGRESS",
+          "PREFER_ASYNC",
+          "HAS_AWAIT",
+          "NO_REMOTING",
+          "NO_SERIALIZABLE",
+          "NO_THREAD",
+          "CRIPPLED_REFLECTION",
+          "USE_TIMER_SELF_ROOT",
+          "WINDOWS",
+          "WINDOWS81"
+        ]
+      },
+      "dependencies": {
+        "Microsoft.TargetingPack.Private.WinRT": {
+          "version": "1.0.1",
+          "type": "build"
         },
-        "netcore451": {
-            "imports": [ "dotnet5.2" ],
-          "buildOptions": {
-            "define": [
-              "NO_EVENTARGS_CONSTRAINT",
-              "HAS_EDI",
-              "HAS_WINRT",
-              "HAS_PROGRESS",
-              "PREFER_ASYNC",
-              "HAS_AWAIT",
-              "NO_REMOTING",
-              "NO_SERIALIZABLE",
-              "NO_THREAD",
-              "CRIPPLED_REFLECTION",
-              "USE_TIMER_SELF_ROOT",
-              "WINDOWS",
-              "WINDOWS81"
-            ]
-          },
-            "dependencies": {
-                "Microsoft.TargetingPack.Private.WinRT": {
-                    "version": "1.0.1",
-                    "type": "build"
-                },
-                "Microsoft.TargetingPack.Private.NETCore.v4.5.1": {
-                    "version": "1.0.0",
-                    "type": "build"
-                }
-            }
+        "Microsoft.TargetingPack.Private.WindowsPhone.v8.1": {
+          "version": "1.0.1",
+          "type": "build"
+        }
+      }
+    },
+    "netcore451": {
+      "buildOptions": {
+        "define": [
+          "NO_EVENTARGS_CONSTRAINT",
+          "HAS_EDI",
+          "HAS_WINRT",
+          "HAS_PROGRESS",
+          "PREFER_ASYNC",
+          "HAS_AWAIT",
+          "NO_REMOTING",
+          "NO_SERIALIZABLE",
+          "NO_THREAD",
+          "CRIPPLED_REFLECTION",
+          "USE_TIMER_SELF_ROOT",
+          "WINDOWS",
+          "WINDOWS81"
+        ]
+      },
+      "dependencies": {
+        "Microsoft.TargetingPack.Private.WinRT": {
+          "version": "1.0.1",
+          "type": "build"
         },
-        "uap10.0": {
-            "imports": [ "dotnet5.4" ],
-          "buildOptions": {
-            "define": [
-              "NO_EVENTARGS_CONSTRAINT",
-              "HAS_EDI",
-              "HAS_WINRT",
-              "HAS_PROGRESS",
-              "PREFER_ASYNC",
-              "HAS_AWAIT",
-              "HAS_APTCA",
-              "HAS_TPL46",
-              "NO_REMOTING",
-              "NO_SERIALIZABLE",
-              "NO_THREAD",
-              "CRIPPLED_REFLECTION",
-              "WINDOWS",
-              "USE_TIMER_SELF_ROOT"
-            ]
-          },
-            "dependencies": {
-                "Microsoft.TargetingPack.Private.WinRT": {
-                    "version": "1.0.1",
-                    "type": "build"
-                },
-                "Microsoft.NETCore.UniversalWindowsPlatform": {
-                    "version": "5.2.0-rc2-23925",
-                    "type": "build"
-                }
-            }
+        "Microsoft.TargetingPack.Private.NETCore.v4.5.1": {
+          "version": "1.0.0",
+          "type": "build"
+        }
+      }
+    },
+    "uap10.0": {
+      "imports": ["dotnet5.4"],
+      "buildOptions": {
+        "define": [
+          "NO_EVENTARGS_CONSTRAINT",
+          "HAS_EDI",
+          "HAS_WINRT",
+          "HAS_PROGRESS",
+          "PREFER_ASYNC",
+          "HAS_AWAIT",
+          "HAS_APTCA",
+          "HAS_TPL46",
+          "NO_REMOTING",
+          "NO_SERIALIZABLE",
+          "NO_THREAD",
+          "CRIPPLED_REFLECTION",
+          "WINDOWS",
+          "USE_TIMER_SELF_ROOT"
+        ]
+      },
+      "dependencies": {
+        "Microsoft.TargetingPack.Private.WinRT": {
+          "version": "1.0.1",
+          "type": "build"
         },
-        "sl5": {
-          "buildOptions": {
-            "define": [
-              "NO_RXINTERFACES",
-              "USE_SL_DISPATCHER",
-              "NO_SERIALIZABLE",
-              "NO_REMOTING",
-              "NO_SEMAPHORE",
-              "NO_STOPWATCH",
-              "NO_CDS",
-              "NO_TASK_DELAY",
-              "NO_WEAKREFOFT",
-              "NO_SORTEDDICTIONARY",
-              "SILVERLIGHT",
-              "SILVERLIGHT5"
-            ]
-          },
-            "dependencies": {
-            }
+        "Microsoft.NETCore.UniversalWindowsPlatform": {
+          "version": "5.2.0-rc2-24027",
+          "type": "build"
         }
+      }
+    },
+    "sl5": {
+      "buildOptions": {
+        "define": [
+          "NO_RXINTERFACES",
+          "USE_SL_DISPATCHER",
+          "NO_SERIALIZABLE",
+          "NO_REMOTING",
+          "NO_SEMAPHORE",
+          "NO_STOPWATCH",
+          "NO_CDS",
+          "NO_TASK_DELAY",
+          "NO_WEAKREFOFT",
+          "NO_SORTEDDICTIONARY",
+          "SILVERLIGHT",
+          "SILVERLIGHT5"
+        ]
+      },
+      "dependencies": {
+            
+      }
     }
+  }
 }

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

@@ -116,7 +116,7 @@
           "type": "build"
         },
         "Microsoft.NETCore.UniversalWindowsPlatform": {
-          "version": "5.2.0-rc2-23925",
+          "version": "5.2.0-rc2-24027",
           "type": "build"
         }
       }

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 NETSTANDARDAPP1_5
+#if NETCOREAPP1_0
 using System.Threading;
 #else
 using System.Windows.Threading;

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

@@ -42,7 +42,7 @@
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": ["dnxcore50", "portable-net45+win8"],
+      "imports": [ "dnxcore50", "portable-net45+win8" ],
       "buildOptions": {
         "define": [
           "NO_EVENTARGS_CONSTRAINT",
@@ -59,7 +59,12 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-
+      },
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-rc2-3002677",
+          "type": "platform"
+        }
       }
     },
     "net461": {
@@ -87,7 +92,7 @@
         "System.Reactive.Runtime.Remoting": { "target": "project" }
       },
       "frameworkAssemblies": {
-        "System.Threading.Tasks": "4.0.10.0"
+        "System.Threading.Tasks": ""
       }
     }
   }