Update Rx.NET to use NETStandard.Library only for netstandard1.x

Oren Novotny · Oren Novotny · commit b4978c6c8b8a · 2016-11-20T12:14:52.000-05:00
diff --git 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
@@ -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"
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,7 @@`
`22`	`22`	`"includeFiles": [ "../GlobalAssemblyVersion.cs" ]`
`23`	`23`	`}`
`24`	`24`	`},`
`25`		`-`
`26`		`- "dependencies": {`
`27`		`- "NETStandard.Library": "1.6.0"`
`28`		`- },`
`29`		`-`
	`25`	`+`
`30`	`26`	`"frameworks": {`
`31`	`27`	`"net45": {`
`32`	`28`	`"buildOptions": {`
`@@ -64,6 +60,9 @@`
`64`	`60`	`"USE_TIMER_SELF_ROOT",`
`65`	`61`	`"PLIB"`
`66`	`62`	`]`
	`63`	`+ },`
	`64`	`+ "dependencies": {`
	`65`	`+ "NETStandard.Library": "1.6.0"`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`	`}`