update to latest fx

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

@@ -4,19 +4,23 @@
     "description": "Reactive Extensions Core Library containing base classes and scheduler infrastructure.",
     "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,
-    "compilationOptions": {
+
+    "packOptions": {
+        "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": {
-            "compilationOptions": {
+            "buildOptions": {
                 "publicSign": false,
                 "delaySign": true,
                 "define": [ "RELEASE", "TRACE" ],
@@ -29,7 +33,7 @@
     },
     "frameworks": {
         "net40": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_TASK_DELAY",
                     "HAS_APTCA",
@@ -42,7 +46,7 @@
             }
         },
         "net45": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -60,7 +64,7 @@
             }
         },
         "net46": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -79,7 +83,7 @@
             }
         },
         "netstandard1.0": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -97,20 +101,14 @@
                     "PLIB"
                 ]
             },
-            "imports": [ "dotnet5.1" ],
             "dependencies": {
-                "System.ComponentModel": "4.0.1-rc2-23925",
-                "System.Diagnostics.Contracts": "4.0.1-rc2-23925",
-                "System.Diagnostics.Debug": "4.0.11-rc2-23925",
-                "System.Dynamic.Runtime": "4.0.11-rc2-23925",
-                "System.Linq": "4.1.0-rc2-23925",
-                "System.Runtime": "4.1.0-rc2-23925",
-                "System.Runtime.Extensions": "4.1.0-rc2-23925",
-                "System.Threading": "4.0.11-rc2-23925"
+                "System.ComponentModel": "4.0.1-rc2-24103",
+                "System.Diagnostics.Contracts": "4.0.1-rc2-24103",
+                "System.Dynamic.Runtime": "4.0.11-rc2-24103"
             }
         },
         "netstandard1.3": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -128,20 +126,14 @@
                     "USE_TIMER_SELF_ROOT"
                 ]
             },
-            "imports": [ "dotnet5.4" ],
             "dependencies": {
-                "System.Diagnostics.Contracts": "4.0.1-rc2-23925",
-                "System.Diagnostics.Debug": "4.0.11-rc2-23925",
-                "System.Collections.Concurrent": "4.0.12-rc2-23925",
-                "System.ComponentModel": "4.0.1-rc2-23925",
-                "System.Linq": "4.1.0-rc2-23925",
-                "System.Runtime.Extensions": "4.1.0-rc2-23925",
-                "System.Threading": "4.0.11-rc2-23925",
-                "System.Threading.Timer": "4.0.1-rc2-23925"
+                "System.ComponentModel": "4.0.1-rc2-24103",
+                "System.Diagnostics.Contracts": "4.0.1-rc2-24103",
+                "System.Dynamic.Runtime": "4.0.11-rc2-24103"
             }
         },
         "sl5": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_RXINTERFACES",
                     "USE_SL_DISPATCHER",

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

@@ -4,19 +4,23 @@
     "description": "Reactive Extensions Interfaces Library containing essential interfaces.",
     "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,
-    "compilationOptions": {
+
+    "packOptions": {
+        "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": {
-            "compilationOptions": {
+            "buildOptions": {
                 "publicSign": false,
                 "delaySign": true,
                 "define": [ "RELEASE", "TRACE" ],
@@ -26,7 +30,7 @@
     },
     "frameworks": {
         "net40": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_TASK_DELAY",
                     "HAS_APTCA",
@@ -39,7 +43,7 @@
             }
         },
         "net45": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -57,8 +61,7 @@
             }
         },
         "netstandard1.0": {
-            "imports": [ "dotnet5.1" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -77,16 +80,12 @@
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.1-rc2-23925",
-                "System.Linq": "4.1.0-rc2-23925",
-                "System.Linq.Expressions": "4.0.11-rc2-23925",
-                "System.Resources.ResourceManager": "4.0.1-rc2-23925",
-                "System.Runtime": "4.1.0-rc2-23925",
-                "System.Threading": "4.0.11-rc2-23925"
+                "NETStandard.Library": "1.5.0-rc2-24103",
+                "System.Linq.Expressions": "4.0.11-rc2-24103" 
             }
         },
         "sl5": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_RXINTERFACES",
                     "USE_SL_DISPATCHER",

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

@@ -4,19 +4,31 @@
     "description": "Reactive Extensions Query Library used to express complex event processing queries over observable sequences.",
     "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,
-    "compilationOptions": {
+    
+    "packOptions": {
+      "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" ]
+        "define": [ "SIGNED" ],
+        "compile": {
+          "exclude": [
+            "*/**/ImmutableList.cs",
+            "Reactive/Observer.Extensions.cs",
+            "Reactive/Internal/Observers.cs",
+            "Reactive/Internal/Producer.cs"
+          ],
+        }
     },
     "configurations": {
         "ReleaseDelaySigned": {
-            "compilationOptions": {
+            "buildOptions": {
                 "publicSign": false,
                 "delaySign": true,
                 "define": [ "RELEASE", "TRACE" ],
@@ -24,18 +36,13 @@
             }
         }
     },
-    "exclude": [
-        "*/**/ImmutableList.cs",
-        "Reactive/Observer.Extensions.cs",
-        "Reactive/Internal/Observers.cs",
-        "Reactive/Internal/Producer.cs"
-    ],
+    
     "dependencies": {
         "System.Reactive.Core": { "target": "project" }
     },
     "frameworks": {
         "net40": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_TASK_DELAY",
                     "HAS_APTCA",
@@ -48,7 +55,7 @@
             }
         },
         "net45": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -66,7 +73,7 @@
             }
         },
         "net46": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -85,7 +92,7 @@
             }
         },
         "netstandard1.0": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -103,15 +110,12 @@
                     "PLIB"
                 ]
             },
-            "imports": [ "dotnet5.1" ],
             "dependencies": {
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23925",
-                "System.Runtime": "4.1.0-rc2-23925",
-                "System.Runtime.Extensions": "4.1.0-rc2-23925"
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24103",                
             }
         },
         "netstandard1.3": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -129,15 +133,12 @@
                     "USE_TIMER_SELF_ROOT"
                 ]
             },
-            "imports": [ "dotnet5.4" ],
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.12-rc2-23925",
-                "System.Reflection": "4.1.0-rc2-23925",
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23925"
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24103"
             }
         },
         "sl5": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_RXINTERFACES",
                     "USE_SL_DISPATCHER",

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

@@ -5,18 +5,24 @@
     "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,
-    "compilationOptions": {
+    "packOptions": {
+      "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" ]
+        "define": [ "SIGNED" ],
+        "compile": {
+          "exclude": [ "Strings_PlatformServices.Designer.cs" ]
+        }
     },
     "configurations": {
         "ReleaseDelaySigned": {
-            "compilationOptions": {
+            "buildOptions": {
                 "publicSign": false,
                 "delaySign": true,
                 "define": [ "RELEASE", "TRACE" ],
@@ -24,13 +30,12 @@
             }
         }
     },
-    "exclude": [ "Strings_PlatformServices.Designer.cs" ],
     "dependencies": {
         "System.Reactive.Linq": { "target": "project" }
     },
     "frameworks": {
         "net40": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_TASK_DELAY",
                     "HAS_APTCA",
@@ -43,7 +48,7 @@
             }
         },
         "net45": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -61,7 +66,7 @@
             }
         },
         "net46": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -80,8 +85,7 @@
             }
         },
         "netstandard1.0": {
-            "imports": [ "dotnet5.1" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -103,7 +107,6 @@
             }
         },
         "netstandard1.3": {
-            "imports": [ "dotnet5.4" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -123,12 +126,11 @@
                 ]
             },
             "dependencies": {
-                "NETStandard.Library": "1.5.0-rc2-23925"
             }
         },
         "wpa81": {
             "imports": [ "dotnet5.2" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -158,7 +160,7 @@
         },
         "win81": {
             "imports": [ "dotnet5.2" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -188,7 +190,7 @@
         },
         "uap10.0": {
             "imports": [ "dotnet5.4" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
                     "HAS_EDI",
@@ -212,13 +214,13 @@
                     "type": "build"
                 },
                 "Microsoft.NETCore.UniversalWindowsPlatform": {
-                    "version": "5.2.0-rc2-23925",
+                    "version": "5.2.0-rc2-24103",
                     "type": "build"
                 }
             }
         },
         "sl5": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [
                     "NO_RXINTERFACES",
                     "USE_SL_DISPATCHER",