Update versions

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

@@ -32,20 +32,21 @@
                 ]
             }
         },
-        "netstandard1.0": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "CRIPPLED_REFLECTION",
-                    "PLIB"
-                ]
-            },
-            "dependencies": {
-                "System.Linq.Expressions": "4.0.11-rc2-23904",
-                "System.Linq.Queryable": "4.0.1-rc2-23904",
-                "System.Reflection": "4.1.0-rc2-23904"
-            }
-
+      "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"
         }
+
+      }
     }
 }

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

@@ -30,22 +30,18 @@
                 ]
             }
         },
-        "netstandard1.0": {
-            "compilationOptions": {
-                "define": [
-                    "HAS_AWAIT",
-                    "CRIPPLED_REFLECTION",
-                    "PLIB"
-                ]
-            },
-            "dependencies": {
-                "System.Diagnostics.Debug": "4.0.11-rc2-23904",
-                "System.Linq": "4.0.1-rc2-23904",
-                "System.Runtime.Extensions": "4.1.0-rc2-23904",
-                "System.Resources.ResourceManager": "4.0.1-rc2-23904",
-                "System.Runtime": "4.1.0-rc2-23904",
-                "System.Threading": "4.0.11-rc2-23904"
-            }
+      "netstandard1.0": {
+        "compilationOptions": {
+          "define": [
+            "HAS_AWAIT",
+            "CRIPPLED_REFLECTION",
+            "PLIB"
+          ]
+        },
+        "imports": [ "dnxcore50", "portable-net45+win8" ],
+        "dependencies": {
+          "NETStandard.Library": "1.0.0-rc2-23811"
         }
+      }
     }
 }

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

@@ -1,52 +1,51 @@
 {
-    "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"],
-    "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,
-    "dependencies": {
-        "System.Interactive": { "target": "project" }
+  "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" ],
+  "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,
+  "dependencies": {
+    "System.Interactive": { "target": "project" }
+  },
+  "frameworks": {
+    "net40": {
+      "compilationOptions": {
+        "define": [
+          "HAS_APTCA",
+          "DESKTOPCLR",
+          "DESKTOPCLR40"
+        ]
+      }
     },
-    "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"
-                ]
-            },
-            "dependencies": {
-                "System.Linq.Expressions": "4.0.11-rc2-23904",
-                "System.Linq.Queryable": "4.0.1-rc2-23904",
-                "System.Reflection": "4.1.0-rc2-23904"
-            }
-
-        }
+    "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"
+      }
     }
+  }
 }

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

@@ -1,50 +1,46 @@
 {
-    "version": "2.0.0-*",
-    "title": "Interactive Extensions - Main Library",
-    "description": "Interactive Extensions Main Library used to 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,
-    "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"
-                ]
-            },
-            "dependencies": {
-                "System.Diagnostics.Debug": "4.0.11-rc2-23904",
-                "System.Linq": "4.0.1-rc2-23904",
-                "System.Resources.ResourceManager": "4.0.1-rc2-23904",
-                "System.Runtime": "4.1.0-rc2-23904",
-                "System.Threading": "4.0.11-rc2-23904"
-            }
-
-        }
+  "version": "2.0.0-*",
+  "title": "Interactive Extensions - Main Library",
+  "description": "Interactive Extensions Main Library used to 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,
+  "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"
+      }
     }
+  }
 }

Ix.NET/Source/build-new.ps1

@@ -6,7 +6,7 @@ $msbuild = Get-ItemProperty "hklm:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0
 $msbuildExe = Join-Path $msbuild.MSBuildToolsPath "msbuild.exe"
 
 Write-Host "Restoring packages" -Foreground Green
-dnu restore $scriptPath --quiet | out-null
+dotnet restore $scriptPath | out-null
 
 Write-Host "Building projects" -Foreground Green
 $projects = gci $scriptPath -Directory `
@@ -14,7 +14,7 @@ $projects = gci $scriptPath -Directory `
   | Select -ExpandProperty FullName
 
 foreach ($project in $projects) {
-  dnu build $project --quiet
+  dotnet build $project
 }
 
 Write-Host "Running tests" -Foreground Green

Ix.NET/Source/global.json

@@ -0,0 +1,3 @@
+{
+    "sources": [ ".", "tests" ]
+}