From 08ee425981a1d1b3956fddac49dbead3c5d36f00 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Sun, 20 Nov 2016 12:02:40 -0500
Subject: [PATCH 1/3] Put SDK ver in global.json for vs 2015 support

---
 Ix.NET/Source/global.json | 5 ++++-
 Rx.NET/Source/global.json | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Ix.NET/Source/global.json b/Ix.NET/Source/global.json
index b4cf495095..8edbd0f6ba 100644
--- a/Ix.NET/Source/global.json
+++ b/Ix.NET/Source/global.json
@@ -1,3 +1,6 @@
 {
-  "projects": [ ".", "tests" ]
+  "projects": [ ".", "tests" ],
+  "sdk": {
+      "version": "1.0.0-preview2-003131"
+  }
 }
diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json
index 9dbeb16d55..db57af70f3 100644
--- a/Rx.NET/Source/global.json
+++ b/Rx.NET/Source/global.json
@@ -1,3 +1,6 @@
 {
-  "projects": [ ".", "Tests.System.Reactive" ]
+  "projects": [ ".", "Tests.System.Reactive" ],
+  "sdk": {
+      "version": "1.0.0-preview2-003131"
+  }
 }

From b4978c6c8b8ade6eab39f21089ae80c7678ee4ea Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Sun, 20 Nov 2016 12:14:52 -0500
Subject: [PATCH 2/3] Update Rx.NET to use NETStandard.Library only for
 netstandard1.x

---
 Rx.NET/Source/NuSpecs/System.Reactive.Interfaces.nuspec | 5 ++++-
 Rx.NET/Source/System.Reactive.Interfaces/project.json   | 9 ++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Rx.NET/Source/NuSpecs/System.Reactive.Interfaces.nuspec b/Rx.NET/Source/NuSpecs/System.Reactive.Interfaces.nuspec
index 70ec929d15..c6ad46c8f0 100644
--- a/Rx.NET/Source/NuSpecs/System.Reactive.Interfaces.nuspec
+++ b/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>
diff --git a/Rx.NET/Source/System.Reactive.Interfaces/project.json b/Rx.NET/Source/System.Reactive.Interfaces/project.json
index da6e7d334c..ea41bb6a5d 100644
--- a/Rx.NET/Source/System.Reactive.Interfaces/project.json
+++ b/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"
       }
     }
   }

From cb5686b25248e6be4976928214be7d09c0dc703f Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Sun, 20 Nov 2016 12:19:49 -0500
Subject: [PATCH 3/3] Update Ix to only use NETStandard.Library in
 netstandard1.x vers

---
 Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec |  5 ++++-
 Ix.NET/Source/NuSpecs/System.Interactive.nuspec       |  5 ++++-
 Ix.NET/Source/System.Interactive.Async/project.json   | 10 ++++++----
 Ix.NET/Source/System.Interactive/project.json         |  7 +++----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec b/Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec
index ed7e1fc1c3..5927f227dc 100644
--- a/Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec
+++ b/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>
diff --git a/Ix.NET/Source/NuSpecs/System.Interactive.nuspec b/Ix.NET/Source/NuSpecs/System.Interactive.nuspec
index 107d6112a4..f98fc83a3c 100644
--- a/Ix.NET/Source/NuSpecs/System.Interactive.nuspec
+++ b/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>
diff --git a/Ix.NET/Source/System.Interactive.Async/project.json b/Ix.NET/Source/System.Interactive.Async/project.json
index 560d4fa113..b2bc8cf892 100644
--- a/Ix.NET/Source/System.Interactive.Async/project.json
+++ b/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"
       }
     }
   }
diff --git a/Ix.NET/Source/System.Interactive/project.json b/Ix.NET/Source/System.Interactive/project.json
index 092049497b..64fa4667b1 100644
--- a/Ix.NET/Source/System.Interactive/project.json
+++ b/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"
       }
     }
   }