Move additional dependencies to be for netstandard only

Oren Novotny · Oren Novotny · commit e0b6af3e204f · 2016-11-20T15:49:08.000-05:00
diff --git a/Rx.NET/Source/NuSpecs/System.Reactive.Core.nuspec b/Rx.NET/Source/NuSpecs/System.Reactive.Core.nuspec
@@ -14,8 +14,11 @@
     <copyright>Copyright (c) .NET Foundation and Contributors.</copyright>
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
-    <dependencies>   
-      <group>
+    <dependencies>
+      <group targetFramework="net45">
+        <dependency id="System.Reactive.Interfaces" version="$version$" />
+      </group>   
+      <group targetFramework="netstandard1.0">
         <dependency id="System.Reactive.Interfaces" version="$version$" />
         <dependency id="System.ComponentModel" version="4.0.1" />
         <dependency id="System.Diagnostics.Contracts" version="4.0.1" />
diff --git a/Rx.NET/Source/NuSpecs/System.Reactive.Linq.nuspec b/Rx.NET/Source/NuSpecs/System.Reactive.Linq.nuspec
@@ -15,8 +15,13 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <dependency id="System.Reactive.Core" version="$version$" />
-      <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
+      <group targetFramework="net45">
+        <dependency id="System.Reactive.Core" version="$version$" />
+      </group>  
+      <group targetFramework="netstandard1.0">
+        <dependency id="System.Reactive.Core" version="$version$" />
+        <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
+      </group>      
     </dependencies>
   </metadata>
   <files>
diff --git a/Rx.NET/Source/NuSpecs/System.Reactive.Providers.nuspec b/Rx.NET/Source/NuSpecs/System.Reactive.Providers.nuspec
@@ -15,8 +15,13 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <dependency id="System.Reactive.Linq" version="$version$" />
-      <dependency id="System.Linq.Queryable" version="4.0.1" />      
+      <group targetFramework="net45">
+        <dependency id="System.Reactive.Linq" version="$version$" />
+      </group>
+      <group targetFramework="netstandard1.0">
+        <dependency id="System.Reactive.Linq" version="$version$" />
+        <dependency id="System.Linq.Queryable" version="4.0.1" />      
+      </group>  
     </dependencies>
   </metadata>
   <files>
diff --git a/Rx.NET/Source/System.Reactive.Core/project.json b/Rx.NET/Source/System.Reactive.Core/project.json
@@ -27,10 +27,7 @@
   },
 
   "dependencies": {
-    "System.Reactive.Interfaces": { "target": "project" },
-    "System.ComponentModel": "4.0.1",
-    "System.Diagnostics.Contracts": "4.0.1",
-    "System.Dynamic.Runtime": "4.0.11"
+    "System.Reactive.Interfaces": { "target": "project" }
   },
 
   "frameworks": {
@@ -89,6 +86,11 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "System.ComponentModel": "4.0.1",
+        "System.Diagnostics.Contracts": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11"
       }
     },
     "netstandard1.1": {
@@ -108,6 +110,11 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "System.ComponentModel": "4.0.1",
+        "System.Diagnostics.Contracts": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11"
       }
     },
     "netstandard1.3": {
@@ -128,6 +135,11 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
+      },
+      "dependencies": {
+        "System.ComponentModel": "4.0.1",
+        "System.Diagnostics.Contracts": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11"
       }
     },
     "netcoreapp1.0": {
@@ -149,6 +161,9 @@
         ]
       },
       "dependencies": {
+        "System.ComponentModel": "4.0.1",
+        "System.Diagnostics.Contracts": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11",
         "System.Threading.Thread": "4.0.0",
         "System.Threading.ThreadPool": "4.0.10"
       }
@@ -179,7 +194,10 @@
         "Microsoft.TargetingPack.Private.WindowsPhone.v8.1": {
           "version": "1.0.1",
           "type": "build"
-        }
+        },
+        "System.ComponentModel": "4.0.1",
+        "System.Diagnostics.Contracts": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11"
       }
     },
     "netcore451": {
@@ -208,7 +226,10 @@
         "Microsoft.TargetingPack.Private.NETCore.v4.5.1": {
           "version": "1.0.0",
           "type": "build"
-        }
+        },
+        "System.ComponentModel": "4.0.1",
+        "System.Diagnostics.Contracts": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11"
       }
     },
     "uap10.0": {
@@ -240,7 +261,10 @@
           "version": "5.2.0",
           "type": "build"
         }
-      }
+      },
+      "System.ComponentModel": "4.0.1",
+      "System.Diagnostics.Contracts": "4.0.1",
+      "System.Dynamic.Runtime": "4.0.11"
     }
   }
 }
diff --git a/Rx.NET/Source/System.Reactive.Linq/project.json b/Rx.NET/Source/System.Reactive.Linq/project.json
@@ -33,8 +33,7 @@
   },
 
   "dependencies": {
-    "System.Reactive.Core": { "target": "project" },
-    "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"
+    "System.Reactive.Core": { "target": "project" }
   },
 
   "frameworks": {
@@ -93,6 +92,9 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"
       }
     },
     "netstandard1.1": {
@@ -112,6 +114,9 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"
       }
     },
     "netstandard1.3": {
@@ -132,6 +137,9 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
+      },
+      "dependencies": {
+        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"
       }
     }
   }
diff --git a/Rx.NET/Source/System.Reactive.Providers/project.json b/Rx.NET/Source/System.Reactive.Providers/project.json
@@ -27,8 +27,7 @@
   },
 
   "dependencies": {
-    "System.Reactive.Linq": { "target": "project" },
-    "System.Linq.Queryable": "4.0.1"
+    "System.Reactive.Linq": { "target": "project" }
   },
   
   "frameworks": {
@@ -87,6 +86,9 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
+      },
+      "dependencies": {
+        "System.Linq.Queryable": "4.0.1"
       }
     },
     "netstandard1.3": {
@@ -107,6 +109,9 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
+      },
+      "dependencies": {
+        "System.Linq.Queryable": "4.0.1"
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@`
`33`	`33`	`},`
`34`	`34`
`35`	`35`	`"dependencies": {`
`36`		`- "System.Reactive.Core": { "target": "project" },`
`37`		`- "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"`
	`36`	`+ "System.Reactive.Core": { "target": "project" }`
`38`	`37`	`},`
`39`	`38`
`40`	`39`	`"frameworks": {`
`@@ -93,6 +92,9 @@`
`93`	`92`	`"USE_TIMER_SELF_ROOT",`
`94`	`93`	`"PLIB"`
`95`	`94`	`]`
	`95`	`+ },`
	`96`	`+ "dependencies": {`
	`97`	`+ "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"`
`96`	`98`	`}`
`97`	`99`	`},`
`98`	`100`	`"netstandard1.1": {`
`@@ -112,6 +114,9 @@`
`112`	`114`	`"USE_TIMER_SELF_ROOT",`
`113`	`115`	`"PLIB"`
`114`	`116`	`]`
	`117`	`+ },`
	`118`	`+ "dependencies": {`
	`119`	`+ "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"`
`115`	`120`	`}`
`116`	`121`	`},`
`117`	`122`	`"netstandard1.3": {`
`@@ -132,6 +137,9 @@`
`132`	`137`	`"PLIB",`
`133`	`138`	`"USE_TIMER_SELF_ROOT"`
`134`	`139`	`]`
	`140`	`+ },`
	`141`	`+ "dependencies": {`
	`142`	`+ "System.Runtime.InteropServices.WindowsRuntime": "4.0.1"`
`135`	`143`	`}`
`136`	`144`	`}`
`137`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@`
`27`	`27`	`},`
`28`	`28`
`29`	`29`	`"dependencies": {`
`30`		`- "System.Reactive.Linq": { "target": "project" },`
`31`		`- "System.Linq.Queryable": "4.0.1"`
	`30`	`+ "System.Reactive.Linq": { "target": "project" }`
`32`	`31`	`},`
`33`	`32`
`34`	`33`	`"frameworks": {`
`@@ -87,6 +86,9 @@`
`87`	`86`	`"USE_TIMER_SELF_ROOT",`
`88`	`87`	`"PLIB"`
`89`	`88`	`]`
	`89`	`+ },`
	`90`	`+ "dependencies": {`
	`91`	`+ "System.Linq.Queryable": "4.0.1"`
`90`	`92`	`}`
`91`	`93`	`},`
`92`	`94`	`"netstandard1.3": {`
`@@ -107,6 +109,9 @@`
`107`	`109`	`"PLIB",`
`108`	`110`	`"USE_TIMER_SELF_ROOT"`
`109`	`111`	`]`
	`112`	`+ },`
	`113`	`+ "dependencies": {`
	`114`	`+ "System.Linq.Queryable": "4.0.1"`
`110`	`115`	`}`
`111`	`116`	`}`
`112`	`117`	`}`