Update to latest 24027

Ix.NET/Source/System.Interactive.Async.Providers/project.json

@@ -1,52 +1,53 @@
 {
-    "version": "2.0.0-*",
-    "title": "Interactive Extensions - Async Providers Library",
-    "description": "Interactive Extensions Async Providers Library used to build query providers and express queries over async enumerable sequences.",
-    "authors": [ "Microsoft" ],
-    "copyright": "Copyright (C) Microsoft Corporation",
-    "tags": [ "Ix", "Interactive", "Extensions", "Enumerable", "Asynchronous" ],
+  "version": "2.0.0-*",
+  "title": "Interactive Extensions - Async Providers Library",
+  "description":
+    "Interactive Extensions Async Providers Library used to build query providers and express queries over async enumerable sequences.",
+  "authors": ["Microsoft"],
+  "copyright": "Copyright (C) Microsoft Corporation",
+  "packOptions": {
+    "tags": ["Ix", "Interactive", "Extensions", "Enumerable", "Asynchronous"],
     "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
     "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
     "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true,
-    "dependencies": {
-        "System.Interactive.Async": { "target": "project" }
-    },
-    "frameworks": {
-        "net40": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR40"
-                ]
-            }
-        },
-        "net45": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR45"
-                ]
-            }
-        },
-      "netstandard1.0": {
-        "compilationOptions": {
-          "define": [
-            "HAS_AWAIT",
-            "CRIPPLED_REFLECTION",
-            "PLIB"
-          ]
-        },
-        "imports": [ "dnxcore50", "portable-net45+win8" ],
-        "dependencies": {
-          "System.Linq.Expressions": "4.0.11-rc2-23811",
-          "System.Linq.Queryable": "4.0.1-rc2-23811",
-          "System.Reflection": "4.1.0-rc2-23811"
-        }
+    "requireLicenseAcceptance": true
+  },
 
+  "dependencies": {
+    "System.Interactive.Async": { "target": "project" }
+  },
+  "frameworks": {
+    "net40": {
+      "buildOptions": {
+        "define": [
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR40"
+        ]
+      }
+    },
+    "net45": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR45"
+        ]
+      }
+    },
+    "netstandard1.0": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "CRIPPLED_REFLECTION",
+          "PLIB"
+        ]
+      },
+      "dependencies": {
+        "System.Linq.Expressions": "4.0.11-rc2-24027",
+        "System.Linq.Queryable": "4.0.1-rc2-24027"
       }
     }
+  }
 }

Ix.NET/Source/System.Interactive.Async/project.json

@@ -1,63 +1,65 @@
 {
-    "version": "2.0.0-*",
-    "title": "Interactive Extensions - Async Library",
-    "description":
-        "Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.",
-    "authors": ["Microsoft"],
-    "copyright": "Copyright (C) Microsoft Corporation",
+  "version": "2.0.0-*",
+  "title": "Interactive Extensions - Async Library",
+  "description":
+    "Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.",
+  "authors": ["Microsoft"],
+  "copyright": "Copyright (C) Microsoft Corporation",
+  "packOptions": {
     "tags": ["Ix", "Interactive", "Extensions", "Enumerable", "Asynchronous"],
     "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
     "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
     "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true,
-    "frameworks": {
-        "net40": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR40"
-                ]
-            }
-        },
-        "net45": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR45"
-                ]
-            }
-        },
-        "netstandard1.0": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "CRIPPLED_REFLECTION",
-                    "PLIB"
-                ]
-            },
-            "imports": [ "dnxcore50", "portable-net45+win8" ],
-            "dependencies": {
-                "NETStandard.Library": "1.0.0-rc2-23811"
-            }
-        },
-        "sl5": {
-            "compilationOptions": {
-                "define": [
-                    "NO_SERIALIZABLE",
-                    "NO_TPL",
-                    "NO_REMOTING",
-                    "NO_SEMAPHORE",
-                    "NO_RXINTERFACES",
-                    "SILVERLIGHT",
-                    "SILVERLIGHT5"
-                ]
-            },
-            "dependencies": {
-                "Microsoft.TargetingPack.Private.Silverlight.v5": "1.0.2"
-            }
-        }
+    "requireLicenseAcceptance": true
+  },
+
+  "frameworks": {
+    "net40": {
+      "buildOptions": {
+        "define": [
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR40"
+        ]
+      }
+    },
+    "net45": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR45"
+        ]
+      }
+    },
+    "netstandard1.0": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "CRIPPLED_REFLECTION",
+          "PLIB"
+        ]
+      },
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-rc2-24027"
+      }
+    },
+    "sl5": {
+      "buildOptions": {
+        "define": [
+          "NO_SERIALIZABLE",
+          "NO_TPL",
+          "NO_REMOTING",
+          "NO_SEMAPHORE",
+          "NO_RXINTERFACES",
+          "SILVERLIGHT",
+          "SILVERLIGHT5"
+        ]
+      },
+      "dependencies": {
+        "Microsoft.TargetingPack.Private.Silverlight.v5": "1.0.2"
+      }
     }
+  }
 }

Ix.NET/Source/System.Interactive.Providers/Reflection.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if CRIPPLED_REFLECTION && !PLIB
+#if CRIPPLED_REFLECTION
 using System.Linq;
 using System.Reflection;
 

Ix.NET/Source/System.Interactive.Providers/project.json

@@ -1,66 +1,69 @@
 {
   "version": "2.0.0-*",
   "title": "Interactive Extensions - Providers Library",
-  "description": "Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.",
-  "authors": [ "Microsoft" ],
+  "description":
+    "Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.",
+  "authors": ["Microsoft"],
   "copyright": "Copyright (C) Microsoft Corporation",
-  "tags": [ "Ix", "Interactive", "Extensions", "Enumerable" ],
-  "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-  "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
-  "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-  "requireLicenseAcceptance": true,
+  "packOptions": {
+    "tags": ["Ix", "Interactive", "Extensions", "Enumerable"],
+    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
+    "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
+    "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
+    "requireLicenseAcceptance": true
+  },
+
   "dependencies": {
     "System.Interactive": { "target": "project" }
   },
-    "frameworks": {
-        "net40": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR40"
-                ]
-            }
-        },
-        "net45": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR45"
-                ]
-            }
-        },
-        "netstandard1.0": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "CRIPPLED_REFLECTION",
-                    "PLIB"
-                ]
-            },
-            "imports": [ "dnxcore50", "portable-net45+win8" ],
-            "dependencies": {
-                "System.Linq.Expressions": "4.0.11-rc2-23811",
-                "System.Linq.Queryable": "4.0.1-rc2-23811",
-                "System.Reflection": "4.1.0-rc2-23811"
-            }
-        },
-        "sl5": {
-            "compilationOptions": {
-                "define": [
-                    "NO_SERIALIZABLE",
-                    "NO_TPL",
-                    "NO_REMOTING",
-                    "NO_SEMAPHORE",
-                    "NO_RXINTERFACES",
-                    "SILVERLIGHT",
-                    "SILVERLIGHT5"
-                ]
-            },
-            "dependencies": {
-            }
-        }
+  "frameworks": {
+    "net40": {
+      "buildOptions": {
+        "define": [
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR40"
+        ]
+      }
+    },
+    "net45": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR45"
+        ]
+      }
+    },
+    "netstandard1.0": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "CRIPPLED_REFLECTION",
+          "PLIB"
+        ]
+      },
+      "dependencies": {
+        "System.Linq.Expressions": "4.0.11-rc2-24027",
+        "System.Linq.Queryable": "4.0.1-rc2-24027"
+      }
+    },
+    "sl5": {
+      "buildOptions": {
+        "define": [
+          "NO_SERIALIZABLE",
+          "NO_TPL",
+          "NO_REMOTING",
+          "NO_SEMAPHORE",
+          "NO_RXINTERFACES",
+          "SILVERLIGHT",
+          "SILVERLIGHT5"
+        ]
+      },
+      "dependencies": {
+      
+      }
     }
+  }
 }

Ix.NET/Source/System.Interactive/project.json

@@ -2,61 +2,63 @@
   "version": "2.0.0-*",
   "title": "Interactive Extensions - Main Library",
   "description": "Interactive Extensions Main Library used to express queries over enumerable sequences.",
-  "authors": [ "Microsoft" ],
+  "authors": ["Microsoft"],
   "copyright": "Copyright (C) Microsoft Corporation",
-  "tags": [ "Ix", "Interactive", "Extensions", "Enumerable" ],
-  "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-  "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
-  "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-  "requireLicenseAcceptance": true,
-    "frameworks": {
-        "net40": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR40"
-                ]
-            }
-        },
-        "net45": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "HAS_APTCA",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR45"
-                ]
-            }
-        },
-        "netstandard1.0": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "CRIPPLED_REFLECTION",
-                    "PLIB"
-                ]
-            },
-            "imports": [ "dnxcore50", "portable-net45+win8" ],
-            "dependencies": {
-                "NETStandard.Library": "1.0.0-rc2-23811"
-            }
-        },
-        "sl5": {
-            "compilationOptions": {
-                "define": [
-                    "NO_SERIALIZABLE",
-                    "NO_TPL",
-                    "NO_REMOTING",
-                    "NO_SEMAPHORE",
-                    "NO_RXINTERFACES",
-                    "SILVERLIGHT",
-                    "SILVERLIGHT5"
-                ]
-            },
-            "dependencies": {
-                "Microsoft.TargetingPack.Private.Silverlight.v5": "1.0.2"
-            }
-        }
+  "packOptions": {
+    "tags": ["Ix", "Interactive", "Extensions", "Enumerable"],
+    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
+    "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
+    "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
+    "requireLicenseAcceptance": true
+  },
+
+  "frameworks": {
+    "net40": {
+      "buildOptions": {
+        "define": [
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR40"
+        ]
+      }
+    },
+    "net45": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR45"
+        ]
+      }
+    },
+    "netstandard1.0": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT",
+          "CRIPPLED_REFLECTION",
+          "PLIB"
+        ]
+      },
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-rc2-24027"
+      }
+    },
+    "sl5": {
+      "buildOptions": {
+        "define": [
+          "NO_SERIALIZABLE",
+          "NO_TPL",
+          "NO_REMOTING",
+          "NO_SEMAPHORE",
+          "NO_RXINTERFACES",
+          "SILVERLIGHT",
+          "SILVERLIGHT5"
+        ]
+      },
+      "dependencies": {
+        "Microsoft.TargetingPack.Private.Silverlight.v5": "1.0.2"
+      }
     }
+  }
 }

Ix.NET/Source/Tests/project.json

@@ -1,36 +1,51 @@
 {
-    "version": "2.0.0-*",
-    "title": "Interactive Extensions - Tests",
-    "description": "Unit Tests",
-    "authors": [ "Microsoft" ],
-    "copyright": "Copyright (C) Microsoft Corporation",
-    "tags": [ ],
+  "version": "2.0.0-*",
+  "title": "Interactive Extensions - Tests",
+  "description": "Unit Tests",
+  "authors": ["Microsoft"],
+  "copyright": "Copyright (C) Microsoft Corporation",
+  "packOptions": {
+    "tags": [],
     "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
     "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
     "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true,
-    "compilationOptions": {
-        "emitEntryPoint": true        
-    },
-    "dependencies": {
-        "System.Interactive.Providers": { "target": "project" },
-        "System.Interactive.Async.Providers": { "target": "project" },
-        "xunit": "2.1.0",
-        "dotnet-test-xunit": "1.0.0-dev-79755-47"
-    },
+    "requireLicenseAcceptance": true
+  },
+
+  "buildOptions": {
     "exclude": [
-        "App.cs"
-    ],
-    "testRunner": "xunit",
-    "frameworks": {
-        "netstandardapp1.5": {
-            "imports": [ "dnxcore50", "portable-net45+win8" ],
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT"
-                ],
-                "debugType": "full"
-            }
+      "App.cs"
+    ]
+  },
+  "dependencies": {
+    "System.Interactive.Providers": { "target": "project" },
+    "System.Interactive.Async.Providers": { "target": "project" },
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-rc2-*"
+  },
+
+  "testRunner": "xunit",
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": [ "dotnet", "portable-net45+win8" ],
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT"
+        ]
+      },
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-rc2-3002677",
+          "type": "platform"
         }
+      }
+    },
+    "net461": {
+      "buildOptions": {
+        "define": [
+          "HAS_AWAIT"
+        ]
+      }
     }
+  }
 }