Merge pull request #460 from reactiveui/prep-6.0-alpha

Prepare 6.0 Alpha
reactiveui · Dec 24, 2013 · 752c04e · 752c04e
2 parents 2cc1c40 + b297dd3
commit 752c04e
Show file tree

Hide file tree

Showing 61 changed files with 978 additions and 210 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,11 +23,10 @@
 *This looks hard, but once you get your environment set up, it's really only 'Build in VS, build in Mono, run script'*
 
 1. Put the source into DropBox or another way you can share the same folder between a Mac and a PC (Parallels Shared Folders works too)
-1. Edit `**/AssemblyInfo.cs` (i.e. every file named AssemblyInfo.cs) and bump the versions
-1. Edit `NuGet/**/*.nuspec` (every nuspec file under the root NuGet folder) and do the same. Make sure to bump the dependent versions too!
+1. Edit `/CommonAssemblyInfo.cs` and bump the version
 1. Open ReactiveUI.sln and build it in Release mode under VS2012 on Windows 8 / Win8.1 with the WP8 SDK installed (nothing earlier is supported)
 1. Open MonoDevelop, and build ReactiveUI_XSAll.sln in Release mode
-1. Back on the PC, run `MakeRelease.ps1`
+1. Back on the PC, run `MakeRelease.ps1` and specify a NuGet SemVer, like `MakeRelease.ps1 -version "5.5.0-beta1"` 
 1. You'll end up with two new folders, `Release` and `Nuget-Release`, as well as the `.nupkg` files in the root directory.
 
 ## Some quirks

diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Reflection;
+
+[assembly: AssemblyVersion("5.99.0")]
+[assembly: AssemblyFileVersion("5.99.0")]
diff --git a/MakeRelease.ps1 b/MakeRelease.ps1
@@ -1,7 +1,9 @@
-$Archs = {"Portable-Net45+WinRT45+WP8", "Net45", "WP8", "WinRT45", "Mono", "Monoandroid", "Monotouch", "Monomac"}
+Param([string]$version = $null)
+
+$Archs = {"Portable-Net45+WinRT45+WP8", "Net45", "WP8", "WinRT45", "Mono", "Monoandroid", "Monotouch", "Monomac"}
 $Projects = {
     "ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Platforms", "ReactiveUI.Blend", 
-    "ReactiveUI.NLog", "ReactiveUI.Mobile", "RxUIViewModelGenerator", "ReactiveUI.Events"
+    "ReactiveUI.Mobile", "RxUIViewModelGenerator", "ReactiveUI.Events"
 }
 
 $MSBuildLocation = "C:\Program Files (x86)\MSBuild\12.0\bin"
@@ -43,6 +45,31 @@ if (Test-Path .\NuGet-Release) {
     rm -r -fo .\NuGet-Release
 }
 
+# Update Nuspecs if we have a version
+if($version) {
+    $nuspecs = ls -r .\NuGet\*.nuspec
+
+    foreach($nuspec in $nuspecs) {
+        $xml = New-Object XML
+        $xml.Load($nuspec)
+
+        # specify NS
+        $nsMgr = New-Object System.Xml.XmlNamespaceManager($xml.NameTable)
+        $nsMgr.AddNamespace("ns", "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd")
+
+        # PowerShell makes editing XML docs so easy!
+        $xml.package.metadata.version = "$version-beta"
+
+        # get the rxui dependencies and update them
+        $deps = $xml.SelectNodes("//ns:dependency[contains(@id, 'reactiveui')]", $nsMgr) 
+        foreach($dep in $deps) {
+            $dep.version = "[" + $version + "-beta]"
+        }
+
+        $xml.Save($nuspec)
+    }
+}
+
 cp -r .\NuGet .\NuGet-Release
 
 $libDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "lib"}

diff --git a/NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec b/NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-		<id>reactiveui-core</id>
-		<version>5.4.0</version>
-		<description>An MVVM library for .NET that is deeply integrated with the Reactive Extensions</description>
-		<authors>Paul Betts</authors>
-		<projectUrl>http://www.reactiveui.net</projectUrl>
-		<licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
-		<language>en-us</language>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-
-		<dependencies>
-			<group>
-				<dependency id="Rx-Main" version="2.2.2" />
-			</group>
-			<group targetFramework="winrt45">
-				<dependency id="Rx-WindowStoreApps" version="2.2.2" />				
-			</group>
-		</dependencies>
-	</metadata>
-</package>
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>reactiveui-core</id>
+    <version>5.99.0-beta</version>
+    <description>An MVVM library for .NET that is deeply integrated with the Reactive Extensions</description>
+    <authors>Paul Betts</authors>
+    <projectUrl>http://www.reactiveui.net</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <group>
+        <dependency id="Rx-Main" version="2.2.2" />
+        <dependency id="Splat" version="1.1.1" />
+      </group>
+      <group targetFramework="winrt45">
+        <dependency id="Rx-WindowStoreApps" version="2.2.2" />
+      </group>
+    </dependencies>
+  </metadata>
+</package>
diff --git a/NuGet/ReactiveUI-Core/lib/Monoandroid/ReactiveUI.dll b/NuGet/ReactiveUI-Core/lib/Monoandroid/ReactiveUI.dll
diff --git a/NuGet/ReactiveUI-Core/lib/Monoandroid/ReactiveUI.pdb b/NuGet/ReactiveUI-Core/lib/Monoandroid/ReactiveUI.pdb
diff --git a/NuGet/ReactiveUI-Core/lib/Monoandroid/ReactiveUI.xml b/NuGet/ReactiveUI-Core/lib/Monoandroid/ReactiveUI.xml
diff --git a/NuGet/ReactiveUI-Core/lib/Monomac/ReactiveUI.dll b/NuGet/ReactiveUI-Core/lib/Monomac/ReactiveUI.dll
diff --git a/NuGet/ReactiveUI-Core/lib/Monomac/ReactiveUI.mdb b/NuGet/ReactiveUI-Core/lib/Monomac/ReactiveUI.mdb
diff --git a/NuGet/ReactiveUI-Core/lib/Monomac/ReactiveUI.xml b/NuGet/ReactiveUI-Core/lib/Monomac/ReactiveUI.xml
diff --git a/NuGet/ReactiveUI-Core/lib/Monotouch/ReactiveUI.dll b/NuGet/ReactiveUI-Core/lib/Monotouch/ReactiveUI.dll
diff --git a/NuGet/ReactiveUI-Core/lib/Monotouch/ReactiveUI.pdb b/NuGet/ReactiveUI-Core/lib/Monotouch/ReactiveUI.pdb
diff --git a/NuGet/ReactiveUI-Core/lib/Monotouch/ReactiveUI.xml b/NuGet/ReactiveUI-Core/lib/Monotouch/ReactiveUI.xml
diff --git a/NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec b/NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec
@@ -1,22 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-        <id>reactiveui-events</id>
-        <version>5.4.0</version>
-        <description>ReactiveUI.Events adds Observable-based events to UI controls and other appropriate places.</description>
-        <authors>Paul Betts</authors>
-        <projectUrl>http://www.reactiveui.net</projectUrl>
-        <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
-        <language>en-us</language>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-
-        <dependencies>
-          <group>
-            <dependency id="Rx-Main" version="2.2.2" />
-          </group>
-          <group targetFramework="winrt45">
-            <dependency id="Rx-WindowStoreApps" version="2.2.2" />				
-          </group>
-        </dependencies>
-    </metadata>
-</package>
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>reactiveui-events</id>
+    <version>5.99.0-beta</version>
+    <description>ReactiveUI.Events adds Observable-based events to UI controls and other appropriate places.</description>
+    <authors>Paul Betts</authors>
+    <projectUrl>http://www.reactiveui.net</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <group>
+        <dependency id="Rx-Main" version="2.2.2" />
+      </group>
+      <group targetFramework="winrt45">
+        <dependency id="Rx-WindowStoreApps" version="2.2.2" />
+      </group>
+    </dependencies>
+  </metadata>
+</package>
diff --git a/NuGet/ReactiveUI-Mobile/ReactiveUI-Mobile.nuspec b/NuGet/ReactiveUI-Mobile/ReactiveUI-Mobile.nuspec
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-		<id>reactiveui-mobile</id>
-		<version>5.4.0</version>
-		<description>ReactiveUI library for Xamarin.Mobile and other mobile-related helpers</description>
-		<authors>Paul Betts</authors>
-		<projectUrl>http://www.reactiveui.net</projectUrl>
-		<licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
-		<language>en-us</language>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-
-		<dependencies>
-			<dependency id="reactiveui-platforms" version="[5.4.0]" />
-		</dependencies>
-	</metadata>
-</package>
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>reactiveui-mobile</id>
+    <version>5.99.0-beta</version>
+    <description>ReactiveUI library for Xamarin.Mobile and other mobile-related helpers</description>
+    <authors>Paul Betts</authors>
+    <projectUrl>http://www.reactiveui.net</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="reactiveui-platforms" version="[5.99.0-beta]" />
+    </dependencies>
+  </metadata>
+</package>
diff --git a/NuGet/ReactiveUI-NLog/ReactiveUI-NLog.nuspec b/NuGet/ReactiveUI-NLog/ReactiveUI-NLog.nuspec
diff --git a/NuGet/ReactiveUI-Platforms/ReactiveUI-Platforms.nuspec b/NuGet/ReactiveUI-Platforms/ReactiveUI-Platforms.nuspec
@@ -1,31 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-		<id>reactiveui-platforms</id>
-		<version>5.3.0</version>
-		<description>Platform specific extensions to ReactiveUI</description>
-		<authors>Paul Betts</authors>
-		<projectUrl>http://www.reactiveui.net</projectUrl>
-		<licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
-		<language>en-us</language>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-
-		<dependencies>		    
-		    <group>
-				    <dependency id="reactiveui-core" version="[5.3.0]" />
-	  		</group>
-        <group targetFramework="net45">
-            <dependency id="reactiveui-core" version="[5.3.0]" />
-            <dependency id="Rx-Xaml" version="2.1.30214.0" />
-          </group>
-          <group targetFramework="wp8">
-            <dependency id="reactiveui-core" version="[5.3.0]" />
-            <dependency id="Rx-Xaml" version="2.1.30214.0" />
-          </group>
-          <group targetFramework="winrt45">
-            <dependency id="reactiveui-core" version="[5.3.0]" />            
-            <dependency id="Rx-Xaml" version="2.1.30214.0" />
-          </group>
-		</dependencies>
-	</metadata>
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>reactiveui-platforms</id>
+    <version>5.99.0-beta</version>
+    <description>Platform specific extensions to ReactiveUI</description>
+    <authors>Paul Betts</authors>
+    <projectUrl>http://www.reactiveui.net</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <group>
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+      </group>
+      <group targetFramework="net45">
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+        <dependency id="Rx-Xaml" version="2.2.2" />
+      </group>
+      <group targetFramework="wp8">
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+        <dependency id="Rx-Xaml" version="2.2.2" />
+      </group>
+      <group targetFramework="winrt45">
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+        <dependency id="Rx-Xaml" version="2.2.2" />
+      </group>
+    </dependencies>
+  </metadata>
 </package>
diff --git a/NuGet/ReactiveUI-Testing/ReactiveUI-Testing.nuspec b/NuGet/ReactiveUI-Testing/ReactiveUI-Testing.nuspec
@@ -1,30 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-		<id>reactiveui-testing</id>
-		<version>5.4.0</version>
-		<description>A library to aid in writing unit tests for ReactiveUI projects</description>
-		<authors>Paul Betts</authors>
-		<projectUrl>http://www.reactiveui.net</projectUrl>
-		<licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
-		<language>en-us</language>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-
-		<dependencies>			
-			<group targetFramework="net45">
-				<dependency id="reactiveui-core" version="[5.4.0]" />
-        <dependency id="Rx-Testing" version="2.1.30214.0" />
-			</group>
-			<group targetFramework="WP8">
-				<dependency id="reactiveui-core" version="[5.4.0]" />
-        <dependency id="Rx-Testing" version="2.1.30214.0" />
-			</group>
-			<group targetFramework="monoandroid">
-				<dependency id="reactiveui-core" version="[5.4.0]" />
-			</group>
-			<group targetFramework="monotouch">
-				<dependency id="reactiveui-core" version="[5.4.0]" />
-			</group>
-		</dependencies>
-	</metadata>
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>reactiveui-testing</id>
+    <version>5.99.0-beta</version>
+    <description>A library to aid in writing unit tests for ReactiveUI projects</description>
+    <authors>Paul Betts</authors>
+    <projectUrl>http://www.reactiveui.net</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <group targetFramework="net45">
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+        <dependency id="Rx-Testing" version="2.2.2" />
+      </group>
+      <group targetFramework="WP8">
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+        <dependency id="Rx-Testing" version="2.2.2" />
+      </group>
+      <group targetFramework="monoandroid">
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+      </group>
+      <group targetFramework="monotouch">
+        <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+      </group>
+    </dependencies>
+  </metadata>
 </package>
diff --git a/NuGet/ReactiveUI-Winforms/ReactiveUI-Winforms.nuspec b/NuGet/ReactiveUI-Winforms/ReactiveUI-Winforms.nuspec
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-		<id>reactiveui-winforms</id>
-		<version>5.4.0</version>
-		<description>Windows Forms specific extensions to ReactiveUI</description>
-		<authors>Paul Betts</authors>
-		<projectUrl>http://www.reactiveui.net</projectUrl>
-		<licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
-		<language>en-us</language>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-
-		<dependencies>
-			<dependency id="reactiveui-core" version="[5.4.0]" />
-		</dependencies>
-	</metadata>
-</package>
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>reactiveui-winforms</id>
+    <version>5.99.0-beta</version>
+    <description>Windows Forms specific extensions to ReactiveUI</description>
+    <authors>Paul Betts</authors>
+    <projectUrl>http://www.reactiveui.net</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="reactiveui-core" version="[5.99.0-beta]" />
+    </dependencies>
+  </metadata>
+</package>
diff --git a/NuGet/ReactiveUI/ReactiveUI-Xaml.nuspec b/NuGet/ReactiveUI/ReactiveUI-Xaml.nuspec
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-		<id>reactiveui-xaml</id>
-		<version>5.4.0</version>
-		<description>An MVVM library for WPF and Silverlight that is deeply integrated with the Reactive Extensions</description>
-		<authors>Paul Betts</authors>
-		<projectUrl>http://www.reactiveui.net</projectUrl>
-		<licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
-		<language>en-us</language>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-
-		<dependencies>
-			<dependency id="reactiveui-platforms" version="[5.4.0]" />
-		</dependencies>
-	</metadata>
-</package>
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>reactiveui-xaml</id>
+    <version>5.99.0-beta</version>
+    <description>An MVVM library for WPF and Silverlight that is deeply integrated with the Reactive Extensions</description>
+    <authors>Paul Betts</authors>
+    <projectUrl>http://www.reactiveui.net</projectUrl>
+    <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
+    <language>en-us</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="reactiveui-platforms" version="[5.99.0-beta]" />
+    </dependencies>
+  </metadata>
+</package>