Merge pull request #298 from Reactive-Extensions/hotfix/3.1.1

Hotfix to reduce dependencies for net45

Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec

@@ -15,7 +15,10 @@
     <language>en-US</language>
     <tags>Ix Interactive Extensions Enumerable Asynchronous</tags>
     <dependencies>
-      <dependency id="NETStandard.Library" version="1.6.0" />
+     <group targetFramework="netstandard1.0">       
+        <dependency id="NETStandard.Library" version="1.6.0" />
+     </group>
+     <group targetFramework="net45" />
     </dependencies>
   </metadata>
   <files>

Ix.NET/Source/NuSpecs/System.Interactive.nuspec

@@ -15,7 +15,10 @@
     <language>en-US</language>
     <tags>Ix Interactive Extensions Enumerable</tags>
     <dependencies>
-      <dependency id="NETStandard.Library" version="1.6.0" />
+     <group targetFramework="netstandard1.0">       
+        <dependency id="NETStandard.Library" version="1.6.0" />
+     </group>
+     <group targetFramework="net45" />
     </dependencies>
   </metadata>
   <files>

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

@@ -26,10 +26,6 @@
     }
   },
 
-  "dependencies": {
-    "NETStandard.Library": "1.6.0"
-  },
-
   "frameworks": {
     "net45": {
       "buildOptions": {
@@ -58,6 +54,9 @@
           "CRIPPLED_REFLECTION",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "NETStandard.Library": "1.6.0"
       }
     },
     "netstandard1.3": {
@@ -67,6 +66,9 @@
           "NO_CODE_COVERAGE_ATTRIBUTE",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "NETStandard.Library": "1.6.0"
       }
     }
   }

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

@@ -26,10 +26,6 @@
     }
   },
 
-  "dependencies": {
-    "NETStandard.Library": "1.6.0"
-  },
-
   "frameworks": {
     "net45": {
       "buildOptions": {
@@ -46,6 +42,9 @@
           "CRIPPLED_REFLECTION",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "NETStandard.Library": "1.6.0"
       }
     }
   }

Ix.NET/Source/global.json

@@ -1,3 +1,6 @@
 {
-  "projects": [ ".", "tests" ]
+  "projects": [ ".", "tests" ],
+  "sdk": {
+      "version": "1.0.0-preview2-003131"
+  }
 }

Rx.NET/Source/NuSpecs/System.Reactive.Interfaces.nuspec

@@ -15,7 +15,10 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <dependency id="NETStandard.Library" version="1.6.0" />
+     <group targetFramework="netstandard1.0">       
+        <dependency id="NETStandard.Library" version="1.6.0" />
+     </group>
+     <group targetFramework="net45" />
     </dependencies>
   </metadata>
   <files>

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

@@ -22,11 +22,7 @@
       "includeFiles": [ "../GlobalAssemblyVersion.cs" ]
     }
   },
-
-  "dependencies": {
-    "NETStandard.Library": "1.6.0"
-  },
-
+  
   "frameworks": {
     "net45": {
       "buildOptions": {
@@ -64,6 +60,9 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "NETStandard.Library": "1.6.0"
       }
     }
   }

Rx.NET/Source/global.json

@@ -1,3 +1,6 @@
 {
-  "projects": [ ".", "Tests.System.Reactive" ]
+  "projects": [ ".", "Tests.System.Reactive" ],
+  "sdk": {
+      "version": "1.0.0-preview2-003131"
+  }
 }