Port ix nupsecs

Ix.NET/Source/NuSpecs/Ix-Async.1.2.5.nuspec

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>Ix-Async</id>
-        <version>1.2.5</version>
-        <authors>Microsoft</authors>
-        <owners>Microsoft</owners>
-        <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</licenseUrl>
-        <projectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</projectUrl>
-        <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.</description>
-        <copyright>Copyright (C) Microsoft Corporation</copyright>
-        <language>en-US</language>
-        <tags>Ix Interactive Extensions Enumerable Asynchronous</tags>
-        <frameworkAssemblies>
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.0" />
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.0" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
-        </frameworkAssemblies>
-    </metadata>
-    <files>
-        <file src="lib\net40\System.Interactive.Async.dll" target="lib\net40\System.Interactive.Async.dll" />
-        <file src="lib\net40\System.Interactive.Async.XML" target="lib\net40\System.Interactive.Async.XML" />
-        <file src="lib\net45\System.Interactive.Async.dll" target="lib\net45\System.Interactive.Async.dll" />
-        <file src="lib\net45\System.Interactive.Async.XML" target="lib\net45\System.Interactive.Async.XML" />
-        <file src="lib\portable-windows8+net45+wp8\System.Interactive.Async.dll" target="lib\portable-windows8+net45+wp8\System.Interactive.Async.dll" />
-        <file src="lib\portable-windows8+net45+wp8\System.Interactive.Async.XML" target="lib\portable-windows8+net45+wp8\System.Interactive.Async.XML" />
-    </files>
-</package>

Ix.NET/Source/NuSpecs/Ix-Main.1.2.5.nuspec

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>Ix-Main</id>
-        <version>1.2.5</version>
-        <authors>Microsoft</authors>
-        <owners>Microsoft</owners>
-        <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</licenseUrl>
-        <projectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</projectUrl>
-        <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>Interactive Extensions Main Library used to express queries over enumerable sequences.</description>
-        <copyright>Copyright (C) Microsoft Corporation</copyright>
-        <language>en-US</language>
-        <tags>Ix Interactive Extensions Enumerable</tags>
-        <frameworkAssemblies>
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.0" />
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
-            <frameworkAssembly assemblyName="System" targetFramework="Silverlight5.0" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.0" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework="Silverlight5.0" />
-        </frameworkAssemblies>
-    </metadata>
-    <files>
-        <file src="lib\net40\System.Interactive.dll" target="lib\net40\System.Interactive.dll" />
-        <file src="lib\net40\System.Interactive.XML" target="lib\net40\System.Interactive.XML" />
-        <file src="lib\net45\System.Interactive.dll" target="lib\net45\System.Interactive.dll" />
-        <file src="lib\net45\System.Interactive.XML" target="lib\net45\System.Interactive.XML" />
-        <file src="lib\portable-windows8+net45+wp8\System.Interactive.dll" target="lib\portable-windows8+net45+wp8\System.Interactive.dll" />
-        <file src="lib\portable-windows8+net45+wp8\System.Interactive.XML" target="lib\portable-windows8+net45+wp8\System.Interactive.XML" />
-        <file src="lib\sl5\System.Interactive.dll" target="lib\sl5\System.Interactive.dll" />
-        <file src="lib\sl5\System.Interactive.XML" target="lib\sl5\System.Interactive.XML" />
-    </files>
-</package>

Ix.NET/Source/NuSpecs/System.Interactive.Async.Providers.nuspec

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>System.Interactive.Async.Providers</id>
+        <version>$version$</version>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</licenseUrl>
+        <projectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</projectUrl>
+        <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>Interactive Extensions Providers Library used to build async query providers and express queries over enumerable sequences.</description>
+        <copyright>Copyright (C) Microsoft Corporation</copyright>
+        <language>en-US</language>
+        <tags>Ix Interactive Extensions Enumerable Async</tags>
+        <dependencies>
+            <dependency id="System.Interactive.Async" version="$version$" />
+        </dependencies>
+        <frameworkAssemblies>
+            <frameworkAssembly assemblyName="System" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System" targetFramework="sl5" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="sl5" />
+        </frameworkAssemblies>
+    </metadata>
+    <files>
+        <file src="..\System.Interactive.Async.Providers\bin\$configuration$\**\*.*" target="lib" />
+    </files>
+</package>

Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>System.Interactive.Async</id>
+        <version>$version$</version>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</licenseUrl>
+        <projectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</projectUrl>
+        <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.</description>
+        <copyright>Copyright (C) Microsoft Corporation</copyright>
+        <language>en-US</language>
+        <tags>Ix Interactive Extensions Enumerable Asynchronous</tags>
+        <frameworkAssemblies>
+            <frameworkAssembly assemblyName="System" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="net4" />
+        </frameworkAssemblies>
+    </metadata>
+    <files>
+        <file src="..\System.Interactive.Async\bin\$configuration$\**\*.*" target="lib" />        
+    </files>
+</package>

Ix.NET/Source/NuSpecs/Ix-Providers.1.2.5.nuspec → Ix.NET/Source/NuSpecs/System.Interactive.Providers.nuspec

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
-        <id>Ix-Providers</id>
-        <version>1.2.5</version>
+        <id>System.Interactive.Providers</id>
+        <version>$version$</version>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</licenseUrl>
@@ -14,23 +14,16 @@
         <language>en-US</language>
         <tags>Ix Interactive Extensions Enumerable</tags>
         <dependencies>
-            <dependency id="Ix-Main" version="1.2.0.0" />
+            <dependency id="System.Interactive" version="$version$" />
         </dependencies>
         <frameworkAssemblies>
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.0" />
-            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
-            <frameworkAssembly assemblyName="System" targetFramework="Silverlight5.0" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.0" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
-            <frameworkAssembly assemblyName="System.Core" targetFramework="Silverlight5.0" />
+            <frameworkAssembly assemblyName="System" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System" targetFramework="sl5" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="sl5" />
         </frameworkAssemblies>
     </metadata>
     <files>
-        <file src="lib\net40\System.Interactive.Providers.dll" target="lib\net40\System.Interactive.Providers.dll" />
-        <file src="lib\net40\System.Interactive.Providers.XML" target="lib\net40\System.Interactive.Providers.XML" />
-        <file src="lib\net45\System.Interactive.Providers.dll" target="lib\net45\System.Interactive.Providers.dll" />
-        <file src="lib\net45\System.Interactive.Providers.XML" target="lib\net45\System.Interactive.Providers.XML" />
-        <file src="lib\sl5\System.Interactive.Providers.dll" target="lib\sl5\System.Interactive.Providers.dll" />
-        <file src="lib\sl5\System.Interactive.Providers.XML" target="lib\sl5\System.Interactive.Providers.XML" />
+        <file src="..\System.Interactive.Providers\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

Ix.NET/Source/NuSpecs/System.Interactive.nuspec

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>System.Interactive</id>
+        <version>$version$</version>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</licenseUrl>
+        <projectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</projectUrl>
+        <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>Interactive Extensions Main Library used to express queries over enumerable sequences.</description>
+        <copyright>Copyright (C) Microsoft Corporation</copyright>
+        <language>en-US</language>
+        <tags>Ix Interactive Extensions Enumerable</tags>
+        <frameworkAssemblies>
+            <frameworkAssembly assemblyName="System" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System" targetFramework="sl5" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="net4" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework="sl5" />
+        </frameworkAssemblies>
+    </metadata>
+    <files>
+        <file src="..\System.Interactive\bin\$configuration$\**\*.*" target="lib" />
+    </files>
+</package>

Ix.NET/Source/build-new.ps1

@@ -1,10 +1,27 @@
 $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.exe install -excludeversion -pre gitversion.commandline -outputdirectory packages
+.\packages\gitversion.commandline\tools\gitversion.exe /l console /output buildserver
+
+$versionObj = .\packages\gitversion.commandline\tools\gitversion.exe | ConvertFrom-Json 
+
+$ver1 = $versionObj.NuGetVersionV2
+$ver2 = $versionObj.CommitsSinceVersionSourcePadded
+
+$version = "$ver1-$ver2"
+
+Write-Host "Version: $version"
+
 Write-Host "Restoring packages" -Foreground Green
 dotnet restore $scriptPath | out-null
 
@@ -14,11 +31,20 @@ $projects = gci $scriptPath -Directory `
   | Select -ExpandProperty FullName
 
 foreach ($project in $projects) {
+  dotnet build -c "$configuration" $project
   dotnet build $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"
+}
+
 Write-Host "Running tests" -Foreground Green
-$testDirectory = Join-Path $scriptPath "Tests"
-cd  $testDirectory 
-dotnet test
+$testDirectory = Join-Path $scriptPath "Tests"  
+dotnet test $testDirectory 
 

Rx.NET/Source/build-new.ps1

@@ -32,6 +32,7 @@ $projects = gci $scriptPath -Directory `
 
 foreach ($project in $projects) {
   dotnet build -c "$configuration" $project
+  dotnet build $project
 }
 
 $nuspecDir = Join-Path $scriptPath "NuSpecs"
@@ -43,12 +44,6 @@ 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"
 dotnet test $testDirectory