build packages

Rx.NET/Source/GitVersion.yml

@@ -0,0 +1,2 @@
+mode: ContinuousDeployment
+next-version: 3.0.0-bld-

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

@@ -20,7 +20,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="content\Observable.Aliases\Observable.Aliases.cs" target="content\Observable.Aliases\Observable.Aliases.cs" />
-        <file src="content\Observable.Aliases\Qbservable.Aliases.Generated.cs" target="content\Observable.Aliases\Qbservable.Aliases.Generated.cs" />
+        <file src="..\System.Reactive.Aliases\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

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

@@ -19,23 +19,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="lib\net40\System.Reactive.Core.dll" target="lib\net40\System.Reactive.Core.dll" />
-        <file src="lib\net40\System.Reactive.Core.XML" target="lib\net40\System.Reactive.Core.XML" />
-        <file src="lib\net45\System.Reactive.Core.dll" target="lib\net45\System.Reactive.Core.dll" />
-        <file src="lib\net45\System.Reactive.Core.XML" target="lib\net45\System.Reactive.Core.XML" />
-        <file src="lib\net46\System.Reactive.Core.dll" target="lib\net46\System.Reactive.Core.dll" />
-        <file src="lib\net46\System.Reactive.Core.XML" target="lib\net46\System.Reactive.Core.XML" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.dll" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.dll" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.XML" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.XML" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Core.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Core.dll" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Core.XML" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Core.XML" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Core.dll" target="lib\portable-win81+wpa81\System.Reactive.Core.dll" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Core.XML" target="lib\portable-win81+wpa81\System.Reactive.Core.XML" />
-        <file src="lib\sl5\System.Reactive.Core.dll" target="lib\sl5\System.Reactive.Core.dll" />
-        <file src="lib\sl5\System.Reactive.Core.XML" target="lib\sl5\System.Reactive.Core.XML" />
-        <file src="lib\windows8\System.Reactive.Core.dll" target="lib\windows8\System.Reactive.Core.dll" />
-        <file src="lib\windows8\System.Reactive.Core.XML" target="lib\windows8\System.Reactive.Core.XML" />
-        <file src="lib\windowsphone8\System.Reactive.Core.dll" target="lib\windowsphone8\System.Reactive.Core.dll" />
-        <file src="lib\windowsphone8\System.Reactive.Core.XML" target="lib\windowsphone8\System.Reactive.Core.XML" />
+        <file src="..\System.Reactive.Core\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

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

@@ -22,23 +22,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="lib\net40\System.Reactive.Experimental.dll" target="lib\net40\System.Reactive.Experimental.dll" />
-        <file src="lib\net40\System.Reactive.Experimental.XML" target="lib\net40\System.Reactive.Experimental.XML" />
-        <file src="lib\net45\System.Reactive.Experimental.dll" target="lib\net45\System.Reactive.Experimental.dll" />
-        <file src="lib\net45\System.Reactive.Experimental.XML" target="lib\net45\System.Reactive.Experimental.XML" />
-        <file src="lib\net46\System.Reactive.Experimental.dll" target="lib\net46\System.Reactive.Experimental.dll" />
-        <file src="lib\net46\System.Reactive.Experimental.XML" target="lib\net46\System.Reactive.Experimental.XML" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Experimental.dll" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Experimental.dll" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Experimental.XML" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Experimental.XML" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Experimental.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Experimental.dll" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Experimental.XML" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Experimental.XML" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Experimental.dll" target="lib\portable-win81+wpa81\System.Reactive.Experimental.dll" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Experimental.XML" target="lib\portable-win81+wpa81\System.Reactive.Experimental.XML" />
-        <file src="lib\sl5\System.Reactive.Experimental.dll" target="lib\sl5\System.Reactive.Experimental.dll" />
-        <file src="lib\sl5\System.Reactive.Experimental.XML" target="lib\sl5\System.Reactive.Experimental.XML" />
-        <file src="lib\windows8\System.Reactive.Experimental.dll" target="lib\windows8\System.Reactive.Experimental.dll" />
-        <file src="lib\windows8\System.Reactive.Experimental.XML" target="lib\windows8\System.Reactive.Experimental.XML" />
-        <file src="lib\windowsphone8\System.Reactive.Experimental.dll" target="lib\windowsphone8\System.Reactive.Experimental.dll" />
-        <file src="lib\windowsphone8\System.Reactive.Experimental.XML" target="lib\windowsphone8\System.Reactive.Experimental.XML" />
+        <file src="..\System.Reactive.Experimental\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

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

@@ -16,23 +16,6 @@
         <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     </metadata>
     <files>
-        <file src="lib\net40\System.Reactive.Interfaces.dll" target="lib\net40\System.Reactive.Interfaces.dll" />
-        <file src="lib\net40\System.Reactive.Interfaces.XML" target="lib\net40\System.Reactive.Interfaces.XML" />
-        <file src="lib\net45\System.Reactive.Interfaces.dll" target="lib\net45\System.Reactive.Interfaces.dll" />
-        <file src="lib\net45\System.Reactive.Interfaces.XML" target="lib\net45\System.Reactive.Interfaces.XML" />
-        <file src="lib\net46\System.Reactive.Interfaces.dll" target="lib\net46\System.Reactive.Interfaces.dll" />
-        <file src="lib\net46\System.Reactive.Interfaces.XML" target="lib\net46\System.Reactive.Interfaces.XML" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.dll" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.dll" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.XML" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.XML" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Interfaces.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Interfaces.dll" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Interfaces.XML" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Interfaces.XML" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Interfaces.dll" target="lib\portable-win81+wpa81\System.Reactive.Interfaces.dll" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Interfaces.XML" target="lib\portable-win81+wpa81\System.Reactive.Interfaces.XML" />
-        <file src="lib\sl5\System.Reactive.Interfaces.dll" target="lib\sl5\System.Reactive.Interfaces.dll" />
-        <file src="lib\sl5\System.Reactive.Interfaces.XML" target="lib\sl5\System.Reactive.Interfaces.XML" />
-        <file src="lib\windows8\System.Reactive.Interfaces.dll" target="lib\windows8\System.Reactive.Interfaces.dll" />
-        <file src="lib\windows8\System.Reactive.Interfaces.XML" target="lib\windows8\System.Reactive.Interfaces.XML" />
-        <file src="lib\windowsphone8\System.Reactive.Interfaces.dll" target="lib\windowsphone8\System.Reactive.Interfaces.dll" />
-        <file src="lib\windowsphone8\System.Reactive.Interfaces.XML" target="lib\windowsphone8\System.Reactive.Interfaces.XML" />
+        <file src="..\System.Reactive.Interfaces\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

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

@@ -20,23 +20,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="lib\net40\System.Reactive.Linq.dll" target="lib\net40\System.Reactive.Linq.dll" />
-        <file src="lib\net40\System.Reactive.Linq.XML" target="lib\net40\System.Reactive.Linq.XML" />
-        <file src="lib\net45\System.Reactive.Linq.dll" target="lib\net45\System.Reactive.Linq.dll" />
-        <file src="lib\net45\System.Reactive.Linq.XML" target="lib\net45\System.Reactive.Linq.XML" />
-        <file src="lib\net46\System.Reactive.Linq.dll" target="lib\net46\System.Reactive.Linq.dll" />
-        <file src="lib\net46\System.Reactive.Linq.XML" target="lib\net46\System.Reactive.Linq.XML" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.dll" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.dll" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.XML" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.XML" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Linq.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Linq.dll" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Linq.XML" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Linq.XML" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Linq.dll" target="lib\portable-win81+wpa81\System.Reactive.Linq.dll" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Linq.XML" target="lib\portable-win81+wpa81\System.Reactive.Linq.XML" />
-        <file src="lib\sl5\System.Reactive.Linq.dll" target="lib\sl5\System.Reactive.Linq.dll" />
-        <file src="lib\sl5\System.Reactive.Linq.XML" target="lib\sl5\System.Reactive.Linq.XML" />
-        <file src="lib\windows8\System.Reactive.Linq.dll" target="lib\windows8\System.Reactive.Linq.dll" />
-        <file src="lib\windows8\System.Reactive.Linq.XML" target="lib\windows8\System.Reactive.Linq.XML" />
-        <file src="lib\windowsphone8\System.Reactive.Linq.dll" target="lib\windowsphone8\System.Reactive.Linq.dll" />
-        <file src="lib\windowsphone8\System.Reactive.Linq.XML" target="lib\windowsphone8\System.Reactive.Linq.XML" />
+        <file src="..\System.Reactive.Linq\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

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

@@ -20,23 +20,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="lib\net40\System.Reactive.PlatformServices.dll" target="lib\net40\System.Reactive.PlatformServices.dll" />
-        <file src="lib\net40\System.Reactive.PlatformServices.XML" target="lib\net40\System.Reactive.PlatformServices.XML" />
-        <file src="lib\net45\System.Reactive.PlatformServices.dll" target="lib\net45\System.Reactive.PlatformServices.dll" />
-        <file src="lib\net45\System.Reactive.PlatformServices.XML" target="lib\net45\System.Reactive.PlatformServices.XML" />
-        <file src="lib\net46\System.Reactive.PlatformServices.dll" target="lib\net46\System.Reactive.PlatformServices.dll" />
-        <file src="lib\net46\System.Reactive.PlatformServices.XML" target="lib\net46\System.Reactive.PlatformServices.XML" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.dll" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.dll" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.XML" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.XML" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.PlatformServices.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.PlatformServices.dll" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.PlatformServices.XML" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.PlatformServices.XML" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.PlatformServices.dll" target="lib\portable-win81+wpa81\System.Reactive.PlatformServices.dll" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.PlatformServices.XML" target="lib\portable-win81+wpa81\System.Reactive.PlatformServices.XML" />
-        <file src="lib\sl5\System.Reactive.PlatformServices.dll" target="lib\sl5\System.Reactive.PlatformServices.dll" />
-        <file src="lib\sl5\System.Reactive.PlatformServices.XML" target="lib\sl5\System.Reactive.PlatformServices.XML" />
-        <file src="lib\windows8\System.Reactive.PlatformServices.dll" target="lib\windows8\System.Reactive.PlatformServices.dll" />
-        <file src="lib\windows8\System.Reactive.PlatformServices.XML" target="lib\windows8\System.Reactive.PlatformServices.XML" />
-        <file src="lib\windowsphone8\System.Reactive.PlatformServices.dll" target="lib\windowsphone8\System.Reactive.PlatformServices.dll" />
-        <file src="lib\windowsphone8\System.Reactive.PlatformServices.XML" target="lib\windowsphone8\System.Reactive.PlatformServices.XML" />
+        <file src="..\System.Reactive.PlatformServices\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

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

@@ -18,28 +18,10 @@
             <dependency id="System.Reactive" version="$version$" />
         </dependencies>
         <frameworkAssemblies>
-            <frameworkAssembly assemblyName="System" targetFramework="" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework="" />
+            <frameworkAssembly assemblyName="System" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="net4" />
         </frameworkAssemblies>
     </metadata>
     <files>
-        <file src="lib\net40\System.Reactive.Providers.dll" target="lib\net40\System.Reactive.Providers.dll" />
-        <file src="lib\net40\System.Reactive.Providers.XML" target="lib\net40\System.Reactive.Providers.XML" />
-        <file src="lib\net45\System.Reactive.Providers.dll" target="lib\net45\System.Reactive.Providers.dll" />
-        <file src="lib\net45\System.Reactive.Providers.XML" target="lib\net45\System.Reactive.Providers.XML" />
-        <file src="lib\net46\System.Reactive.Providers.dll" target="lib\net46\System.Reactive.Providers.dll" />
-        <file src="lib\net46\System.Reactive.Providers.XML" target="lib\net46\System.Reactive.Providers.XML" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.dll" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.dll" />
-        <file src="lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.XML" target="lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.XML" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Providers.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Providers.dll" />
-        <file src="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Providers.XML" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\System.Reactive.Providers.XML" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Providers.dll" target="lib\portable-win81+wpa81\System.Reactive.Providers.dll" />
-        <file src="lib\portable-win81+wpa81\System.Reactive.Providers.XML" target="lib\portable-win81+wpa81\System.Reactive.Providers.XML" />
-        <file src="lib\sl5\System.Reactive.Providers.dll" target="lib\sl5\System.Reactive.Providers.dll" />
-        <file src="lib\sl5\System.Reactive.Providers.XML" target="lib\sl5\System.Reactive.Providers.XML" />
-        <file src="lib\windows8\System.Reactive.Providers.dll" target="lib\windows8\System.Reactive.Providers.dll" />
-        <file src="lib\windows8\System.Reactive.Providers.XML" target="lib\windows8\System.Reactive.Providers.XML" />
-        <file src="lib\windowsphone8\System.Reactive.Providers.dll" target="lib\windowsphone8\System.Reactive.Providers.dll" />
-        <file src="lib\windowsphone8\System.Reactive.Providers.XML" target="lib\windowsphone8\System.Reactive.Providers.XML" />
-    </files>
+        <file src="..\System.Reactive.Providers\bin\$configuration$\**\*.*" target="lib" />
 </package>

Rx.NET/Source/build-new.ps1

@@ -1,10 +1,20 @@
 $scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
 
+$configuration = "Release"
+
+wget "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -outfile nuget.exe
+
 $msbuild = Get-ItemProperty "hklm:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0"
 
 # TODO: if not found, bail out
 $msbuildExe = Join-Path $msbuild.MSBuildToolsPath "msbuild.exe"
 
+# get version
+.\nuget install -excludeversion -pre gitversion.commandline -outputdirectory tools
+.\tools\gitversion.commandline\tools\gitversion.exe /l console /output buildserver
+
+$version = $env:NuGetVersionV2
+
 Write-Host "Restoring packages" -Foreground Green
 dotnet restore $scriptPath | out-null
 
@@ -14,10 +24,24 @@ $projects = gci $scriptPath -Directory `
   | Select -ExpandProperty FullName
 
 foreach ($project in $projects) {
-  dotnet build $project
+  dotnet build -c "$configuration" $project
 }
 
+$nuspecDir = Join-Path $scriptPath "NuSpecs"
+
+Write-Host "Building Packages" -Foreground Green
+$nuspecs = ls $nuspecDir\*.nuspec | Select -ExpandProperty FullName
+
+foreach ($nuspec in $nuspecs) {
+   nuget pack $nuspec -Version $version -Properties "Configuration=$configuration"
+}
+
+
+foreach ($project in $projects) {
+  dotnet build -c "$configuration" $project
+}
+
+
 Write-Host "Running tests" -Foreground Green
 $testDirectory = Join-Path $scriptPath "Tests.System.Reactive"
-cd $testDirectory 
-dotnet test
+dotnet test $testDirectory -c "$configuration"