瀏覽代碼

Remove granular dependencies in the NuSpecs to fix #217

Oren Novotny 9 年之前
父節點
當前提交
0b1e50068b

+ 1 - 21
Ix.NET/Source/NuSpecs/System.Interactive.Async.Providers.nuspec

@@ -14,28 +14,8 @@
     <language>en-US</language>
     <tags>Ix Interactive Extensions Enumerable Async</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Interactive.Async" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Interactive.Async" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Interactive.Async" version="$version$" />
-      </group>
+      <dependency id="System.Interactive.Async" version="$version$" />
     </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System" targetFramework="net45" />
-      <frameworkAssembly assemblyName="System.Core" targetFramework="net45" />
-    </frameworkAssemblies>
   </metadata>
   <files>
     <file src="..\System.Interactive.Async.Providers\bin\$configuration$\**\System.Interactive.Async.Providers.*" exclude="**\*.deps.json" target="lib" />

+ 1 - 27
Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec

@@ -13,34 +13,8 @@
     <copyright>Copyright (c) .NET Foundation and Contributors. All Rights Reserved</copyright>
     <language>en-US</language>
     <tags>Ix Interactive Extensions Enumerable Asynchronous</tags>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System" targetFramework="net45" />
-      <frameworkAssembly assemblyName="System.Core" targetFramework="net45" />
-    </frameworkAssemblies>
     <dependencies>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="net45" />
-      <group targetFramework="portable-net45+win8+wp8+wpa81" />
-      <group targetFramework="net46" />
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
+      <dependency id="NETStandard.Library" version="1.6.0" />
     </dependencies>
   </metadata>
   <files>

+ 1 - 21
Ix.NET/Source/NuSpecs/System.Interactive.Providers.nuspec

@@ -14,28 +14,8 @@
     <language>en-US</language>
     <tags>Ix Interactive Extensions Enumerable</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Interactive" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Interactive" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Linq.Queryable" version="4.0.1" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Interactive" version="$version$" />
-      </group>
+      <dependency id="System.Interactive" version="$version$" />
     </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System" targetFramework="net45" />
-      <frameworkAssembly assemblyName="System.Core" targetFramework="net45" />
-    </frameworkAssemblies>
   </metadata>
   <files>
     <file src="..\System.Interactive.Providers\bin\$configuration$\**\System.Interactive.Providers.*" exclude="**\*.deps.json" target="lib" />

+ 1 - 16
Ix.NET/Source/NuSpecs/System.Interactive.nuspec

@@ -13,23 +13,8 @@
     <copyright>Copyright (c) .NET Foundation and Contributors. All Rights Reserved</copyright>
     <language>en-US</language>
     <tags>Ix Interactive Extensions Enumerable</tags>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System" targetFramework="net45" />
-      <frameworkAssembly assemblyName="System.Core" targetFramework="net45" />
-    </frameworkAssemblies>
     <dependencies>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="net45" />
-      <group targetFramework="portable-net45+win8+wp8+wpa81" />
+      <dependency id="NETStandard.Library" version="1.6.0" />
     </dependencies>
   </metadata>
   <files>

+ 0 - 16
Ix.NET/Source/build-new.ps1

@@ -32,9 +32,6 @@ if($tag -ne ""){
 
 Write-Host "Version: $version"
 
-# Get Reference Generator
-.\nuget.exe install -excludeversion -pre NuSpec.ReferenceGenerator -outputdirectory packages
-
 Write-Host "Restoring packages" -Foreground Green
 dotnet restore $scriptPath | out-null
 
@@ -44,19 +41,6 @@ $projects = gci $scriptPath -Directory `
 
 foreach ($project in $projects) {
   dotnet build -c "$configuration" $project.FullName  
-  
-  $ns = Join-Path $nuSpecDir "$($project.Name).nuspec"  
-    
-  if(Test-Path $ns)
-  {
-    Write-Host "Invoking RefGen on $ns" 
-    
-    $baseDir = Join-Path $project.FullName "bin" | join-path -ChildPath "$configuration"
-    $projJson = Join-Path $project.FullName "project.json"    
-    
-    Write-Host RefGen.exe generate-cross "-p" `"$projJson`" "-d" `"$baseDir`" "-l" `"$($project.Name).dll`" "-n" `"$ns`"
-    .\packages\nuspec.referencegenerator\tools\RefGen.exe generate-cross -p "$projJson" -d "$baseDir" -l "$($project.Name).dll" -n "$ns"
-  }
 }
 
 Write-Host "Building Packages" -Foreground Green

+ 2 - 58
Rx.NET/Source/NuSpecs/Microsoft.Reactive.Testing.nuspec

@@ -15,64 +15,8 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
-      <group targetFramework="netcore451">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
-      <group targetFramework="uap10.0">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
-      <group targetFramework="wpa81">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.PlatformServices" version="$version$" />
-        <dependency id="xunit.assert" version="2.1.0" />
-      </group>
+      <dependency id="System.Reactive.PlatformServices" version="$version$" />
+      <dependency id="xunit.assert" version="2.1.0" />
     </dependencies>
   </metadata>
   <files>

+ 6 - 94
Rx.NET/Source/NuSpecs/System.Reactive.Core.nuspec

@@ -14,109 +14,21 @@
     <copyright>Copyright (c) .NET Foundation and Contributors.</copyright>
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
-    <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
+    <dependencies>   
+      <group>
         <dependency id="System.Reactive.Interfaces" version="$version$" />
-      </group>
-      <group targetFramework="portable-net45+win8+wpa81">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Dynamic.Runtime" version="4.0.11" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="netstandard1.1">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Collections.Concurrent" version="4.0.12" />
         <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
+        <dependency id="System.Diagnostics.Contracts" version="4.0.1" />
         <dependency id="System.Dynamic.Runtime" version="4.0.11" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
       </group>
       <group targetFramework="netcoreapp1.0">
         <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Collections.Concurrent" version="4.0.12" />
         <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
+        <dependency id="System.Diagnostics.Contracts" version="4.0.1" />
+        <dependency id="System.Dynamic.Runtime" version="4.0.11" />
         <dependency id="System.Threading.Thread" version="4.0.0" />
         <dependency id="System.Threading.ThreadPool" version="4.0.10" />
-        <dependency id="System.Threading.Timer" version="4.0.1" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Collections.Concurrent" version="4.0.12" />
-        <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="netcore451">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-      </group>
-      <group targetFramework="uap10.0">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Collections.Concurrent" version="4.0.12" />
-        <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="wpa81">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-      </group>
+      </group>      
     </dependencies>
   </metadata>
   <files>

+ 1 - 44
Rx.NET/Source/NuSpecs/System.Reactive.Experimental.nuspec

@@ -15,50 +15,7 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-      </group>
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-      </group>
+      <dependency id="System.Reactive.Providers" version="$version$" />
     </dependencies>
   </metadata>
   <files>

+ 1 - 7
Rx.NET/Source/NuSpecs/System.Reactive.Interfaces.nuspec

@@ -15,13 +15,7 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-      </group>
-      <group targetFramework="net45" />
-      <group targetFramework="portable-net45+win8+wp8+wpa81" />
+      <dependency id="NETStandard.Library" version="1.6.0" />
     </dependencies>
   </metadata>
   <files>

+ 2 - 68
Rx.NET/Source/NuSpecs/System.Reactive.Linq.nuspec

@@ -15,74 +15,8 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="portable-net45+win8+wpa81">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="netstandard1.1">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Collections.Concurrent" version="4.0.12" />
-        <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Collections.Concurrent" version="4.0.12" />
-        <dependency id="System.ComponentModel" version="4.0.1" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
+      <dependency id="System.Reactive.Core" version="$version$" />
+      <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
     </dependencies>
   </metadata>
   <files>

+ 1 - 26
Rx.NET/Source/NuSpecs/System.Reactive.Observable.Aliases.nuspec

@@ -15,32 +15,7 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Reactive" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Reactive" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reactive" version="$version$" />
-        <dependency id="System.Reactive.Providers" version="$version$" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
+      <dependency id="System.Reactive.Providers" version="$version$" />
     </dependencies>
   </metadata>
   <files>

+ 1 - 80
Rx.NET/Source/NuSpecs/System.Reactive.PlatformServices.nuspec

@@ -15,86 +15,7 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="netcore451">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="netcoreapp1.0">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-        <dependency id="System.Threading.Thread" version="4.0.0" />
-        <dependency id="System.Threading.ThreadPool" version="4.0.10" />
-        <dependency id="System.Threading.Timer" version="4.0.1" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="uap10.0">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0" />
-        <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="wpa81">
-        <dependency id="System.Reactive.Interfaces" version="$version$" />
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
+      <dependency id="System.Reactive.Linq" version="$version$" />
     </dependencies>
   </metadata>
   <files>

+ 2 - 45
Rx.NET/Source/NuSpecs/System.Reactive.Providers.nuspec

@@ -15,52 +15,9 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group targetFramework="portable-net45+win8+wp8+wpa81">
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.Reactive" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Linq.Queryable" version="4.0.1" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Reflection.Extensions" version="4.0.1" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reactive" version="$version$" />
-        <dependency id="System.Collections" version="4.0.11" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Linq" version="4.1.0" />
-        <dependency id="System.Linq.Expressions" version="4.1.0" />
-        <dependency id="System.Linq.Queryable" version="4.0.1" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Reflection.Extensions" version="4.0.1" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Threading" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
+      <dependency id="System.Reactive.Linq" version="$version$" />
+      <dependency id="System.Linq.Queryable" version="4.0.1" />      
     </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System" targetFramework="net45" />
-      <frameworkAssembly assemblyName="System.Core" targetFramework="net45" />
-    </frameworkAssemblies>
   </metadata>
   <files>
     <file src="..\System.Reactive.Providers\bin\$configuration$\**\System.Reactive.Providers.*" exclude="**\*.deps.json" target="lib" />

+ 1 - 6
Rx.NET/Source/NuSpecs/System.Reactive.Runtime.Remoting.nuspec

@@ -15,12 +15,7 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group>
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
+      <dependency id="System.Reactive.Core" version="$version$" />
     </dependencies>
   </metadata>
   <files>

+ 3 - 9
Rx.NET/Source/NuSpecs/System.Reactive.Windows.Forms.nuspec

@@ -15,18 +15,12 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group>
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
-      <group targetFramework="net46">
-        <dependency id="System.Reactive" version="$version$" />
-      </group>
+      <dependency id="System.Reactive.Core" version="$version$" />
     </dependencies>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Windows.Forms" targetFramework="net45" />
+      <frameworkAssembly assemblyName="System.Windows" targetFramework="net45" />
+      <frameworkAssembly assemblyName="WindowsBase" targetFramework="net45" />
     </frameworkAssemblies>
   </metadata>
   <files>

+ 2 - 23
Rx.NET/Source/NuSpecs/System.Reactive.Windows.Threading.nuspec

@@ -15,31 +15,10 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group>
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="uap10.0">
-        <dependency id="System.Reactive.Core" version="$version$" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11" />
-        <dependency id="System.Diagnostics.Tools" version="4.0.1" />
-        <dependency id="System.Globalization" version="4.0.11" />
-        <dependency id="System.Reflection" version="4.1.0" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" />
-        <dependency id="System.Threading" version="4.0.11" />
-      </group>
-      <group targetFramework="netcore451">
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="net45">
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
-      <group targetFramework="wpa81">
-        <dependency id="System.Reactive.Core" version="$version$" />
-      </group>
+      <dependency id="System.Reactive.Core" version="$version$" />
     </dependencies>
     <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Windows" targetFramework="net45" />
       <frameworkAssembly assemblyName="WindowsBase" targetFramework="net45" />
     </frameworkAssemblies>
   </metadata>

+ 1 - 16
Rx.NET/Source/NuSpecs/System.Reactive.WindowsRuntime.nuspec

@@ -15,22 +15,7 @@
     <language>en-US</language>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
-      <group>
-        <dependency id="System.Reactive.Linq" version="$version$" />
-      </group>
-      <group targetFramework="uap10.0">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1" />
-        <dependency id="System.Runtime" version="4.1.0" />
-        <dependency id="System.Runtime.WindowsRuntime" version="4.0.11" />
-        <dependency id="System.Threading.Tasks" version="4.0.11" />
-      </group>
-      <group targetFramework="netcore451">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-      </group>
-      <group targetFramework="wpa81">
-        <dependency id="System.Reactive.Linq" version="$version$" />
-      </group>
+      <dependency id="System.Reactive.Linq" version="$version$" />
     </dependencies>
   </metadata>
   <files>

+ 0 - 12
Rx.NET/Source/NuSpecs/System.Reactive.nuspec

@@ -16,31 +16,19 @@
         <tags>Rx Reactive Extensions Observable LINQ Events</tags>
         <dependencies>
           <group>
-            <dependency id="System.Reactive.Interfaces" version="$version$" />
-            <dependency id="System.Reactive.Core" version="$version$" />
-            <dependency id="System.Reactive.Linq" version="$version$" />
             <dependency id="System.Reactive.PlatformServices" version="$version$" />
           </group>
           <group targetFramework="netcore451">
-            <dependency id="System.Reactive.Interfaces" version="$version$" />
-            <dependency id="System.Reactive.Core" version="$version$" />
-            <dependency id="System.Reactive.Linq" version="$version$" />
             <dependency id="System.Reactive.PlatformServices" version="$version$" />
             <dependency id="System.Reactive.WindowsRuntime" version="$version$" />
             <dependency id="System.Reactive.Windows.Threading" version="$version$" />
           </group>
           <group targetFramework="wpa81">
-            <dependency id="System.Reactive.Interfaces" version="$version$" />
-            <dependency id="System.Reactive.Core" version="$version$" />
-            <dependency id="System.Reactive.Linq" version="$version$" />
             <dependency id="System.Reactive.PlatformServices" version="$version$" />
             <dependency id="System.Reactive.WindowsRuntime" version="$version$" />
             <dependency id="System.Reactive.Windows.Threading" version="$version$" />
           </group>
           <group targetFramework="net45">
-            <dependency id="System.Reactive.Interfaces" version="$version$" />
-            <dependency id="System.Reactive.Core" version="$version$" />
-            <dependency id="System.Reactive.Linq" version="$version$" />
             <dependency id="System.Reactive.PlatformServices" version="$version$" />
             <dependency id="System.Reactive.Windows.Threading" version="$version$" />
           </group>

+ 0 - 16
Rx.NET/Source/build-new.ps1

@@ -29,9 +29,6 @@ if($tag -ne ""){
 
 Write-Host "Version: $version"
 
-# Get Reference Generator
-.\nuget.exe install -excludeversion -pre NuSpec.ReferenceGenerator -outputdirectory packages
-
 Write-Host "Restoring packages" -Foreground Green
 dotnet restore $scriptPath | out-null
 
@@ -46,19 +43,6 @@ $projects = gci $scriptPath -Directory `
 
 foreach ($project in $projects) {
   dotnet build -c "$configuration" $project.FullName  
-  
-  $ns = Join-Path $nuSpecDir "$($project.Name).nuspec"  
-    
-  if(Test-Path $ns)
-  {
-    Write-Host "Invoking RefGen on $ns" 
-    
-    $baseDir = Join-Path $project.FullName "bin" | join-path -ChildPath "$configuration"
-    $projJson = Join-Path $project.FullName "project.json"    
-    
-    Write-Host RefGen.exe generate-cross "-p" `"$projJson`" "-d" `"$baseDir`" "-l" `"$($project.Name).dll`" "-n" `"$ns`"
-    .\packages\nuspec.referencegenerator\tools\RefGen.exe generate-cross -p "$projJson" -d "$baseDir" -l "$($project.Name).dll" -n "$ns"
-  }
 }
 
 Write-Host "Building Packages" -Foreground Green