Skip to content

Commit

Permalink
Merge pull request #362 from reactiveui/ship-5-point-1
Browse files Browse the repository at this point in the history
Fixes to ship ReactiveUI 5.1
  • Loading branch information
Paul Betts committed Aug 9, 2013
2 parents 675a9f5 + 73a904f commit 2248d79
Show file tree
Hide file tree
Showing 40 changed files with 47 additions and 29 deletions.
2 changes: 1 addition & 1 deletion NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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.0.1</version>
<version>5.1.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>
Expand Down
2 changes: 1 addition & 1 deletion NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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.0.1</version>
<version>5.1.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>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/ReactiveUI-Mobile/ReactiveUI-Mobile.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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.0.1</version>
<version>5.1.0</version>
<description>ReactiveUI library for Xamarin.Mobile and other mobile-related helpers</description>
<authors>Paul Betts</authors>
<projectUrl>http://www.reactiveui.net</projectUrl>
Expand All @@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>

<dependencies>
<dependency id="reactiveui-platforms" version="[5.0.1]" />
<dependency id="reactiveui-platforms" version="[5.1.0]" />
</dependencies>
</metadata>
</package>
4 changes: 2 additions & 2 deletions NuGet/ReactiveUI-NLog/ReactiveUI-NLog.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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-nlog</id>
<version>5.0.1</version>
<version>5.1.0</version>
<description>An adapter to initialize NLog as the logger for ReactiveUI.</description>
<authors>Paul Betts</authors>
<projectUrl>http://www.reactiveui.net</projectUrl>
Expand All @@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>

<dependencies>
<dependency id="reactiveui-core" version="[5.0.1]" />
<dependency id="reactiveui-core" version="[5.1.0]" />
<dependency id="NLog" version="[2.0.1.2]" />
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/ReactiveUI-Platforms/ReactiveUI-Platforms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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.0.1</version>
<version>5.1.0</version>
<description>Platform specific extensions to ReactiveUI</description>
<authors>Paul Betts</authors>
<projectUrl>http://www.reactiveui.net</projectUrl>
Expand All @@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>

<dependencies>
<dependency id="reactiveui-core" version="[5.0.1]" />
<dependency id="reactiveui-core" version="[5.1.0]" />
<dependency id="Rx-Xaml" version="2.1.30214.0" />
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/ReactiveUI-Testing/ReactiveUI-Testing.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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.0.1</version>
<version>5.1.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>
Expand All @@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>

<dependencies>
<dependency id="reactiveui-core" version="[5.0.1]" />
<dependency id="reactiveui-core" version="[5.1.0]" />
<dependency id="Rx-Testing" version="2.1.30214.0" />
</dependencies>
</metadata>
Expand Down
17 changes: 17 additions & 0 deletions NuGet/ReactiveUI-Winforms/ReactiveUI-Winforms.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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.1.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.1.0]" />
</dependencies>
</metadata>
</package>
Empty file.
Empty file.
Empty file.
Empty file.
4 changes: 2 additions & 2 deletions NuGet/ReactiveUI/ReactiveUI-Xaml.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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.0.1</version>
<version>5.1.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>
Expand All @@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>

<dependencies>
<dependency id="reactiveui-platforms" version="[5.0.1]" />
<dependency id="reactiveui-platforms" version="[5.1.0]" />
</dependencies>
</metadata>
</package>
6 changes: 3 additions & 3 deletions NuGet/ReactiveUI/ReactiveUI.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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</id>
<version>5.0.1</version>
<version>5.1.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>
Expand All @@ -11,8 +11,8 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>

<dependencies>
<dependency id="reactiveui-core" version="[5.0.1]" />
<dependency id="reactiveui-platforms" version="[5.0.1]" />
<dependency id="reactiveui-core" version="[5.1.0]" />
<dependency id="reactiveui-platforms" version="[5.1.0]" />
</dependencies>
</metadata>
</package>
2 changes: 1 addition & 1 deletion ReactiveUI.Blend/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

[assembly: AssemblyDescription("An MVVM framework that integrates the Reactive Extensions")]
[assembly: AssemblyProduct("ReactiveUI for Expression Blend")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]
2 changes: 1 addition & 1 deletion ReactiveUI.Events/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

[assembly: AssemblyDescription("Adds an easy way to get IObservables from events in the framework")]
[assembly: AssemblyProduct("ReactiveUI")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]
5 changes: 3 additions & 2 deletions ReactiveUI.Events/ReactiveUI.Events_WinRT.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,13 @@
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<PropertyGroup>
<PreBuildEvent>%25SystemRoot%25\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /p:Configuration=Release "$(ProjectDir)EventBuilder.csproj"
"$(ProjectDir)EventBuilder.exe" "C:\Windows\System32\WinMetadata\Windows.Foundation.winmd" "C:\Windows\System32\WinMetadata\Windows.Globalization.winmd" "C:\Windows\System32\WinMetadata\Windows.Graphics.winmd" "C:\Windows\System32\WinMetadata\Windows.Management.winmd" "C:\Windows\System32\WinMetadata\Windows.Media.winmd" "C:\Windows\System32\WinMetadata\Windows.Networking.winmd" "C:\Windows\System32\WinMetadata\Windows.Security.winmd" "C:\Windows\System32\WinMetadata\Windows.Storage.winmd" "C:\Windows\System32\WinMetadata\Windows.System.winmd" "C:\Windows\System32\WinMetadata\Windows.UI.winmd" "C:\Windows\System32\WinMetadata\Windows.UI.Xaml.winmd" "C:\Windows\System32\WinMetadata\Windows.Web.winmd" "C:\Windows\System32\WinMetadata\Windows.ApplicationModel.winmd" "C:\Windows\System32\WinMetadata\Windows.Data.winmd" "C:\Windows\System32\WinMetadata\Windows.Devices.winmd" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events_WinRT.cs"
"$(ProjectDir)EventBuilder.exe" "$(ProjectDir)\WinMetadata.Win80\Windows.Foundation.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Globalization.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Graphics.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Management.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Media.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Networking.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Security.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Storage.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.System.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.Xaml.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Web.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.ApplicationModel.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Data.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Devices.winmd" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events_WinRT.cs"
del "$(ProjectDir)EventBuilder.exe"
del "$(ProjectDir)EventBuilder.pdb"
del "$(ProjectDir)Nustache.Core.dll"
del "$(ProjectDir)Mono.Cecil.dll"
del "$(ProjectDir)Mono.Cecil.pdb"</PreBuildEvent>
del "$(ProjectDir)Mono.Cecil.pdb"
</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions ReactiveUI.Mobile/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyFileVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.1.0")]
[assembly: ComVisible(false)]
2 changes: 1 addition & 1 deletion ReactiveUI.NLog/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

[assembly: AssemblyDescription("NLog Adapter for ReactiveUI Logging")]
[assembly: AssemblyProduct("ReactiveUI")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]
2 changes: 1 addition & 1 deletion ReactiveUI.Platforms/Android/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

[assembly: AssemblyDescription("An MVVM framework that integrates the Reactive Extensions")]
[assembly: AssemblyProduct("ReactiveUI.Android")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]

[assembly: InternalsVisibleTo("ReactiveUI.Tests_Monodroid")]
2 changes: 1 addition & 1 deletion ReactiveUI.Platforms/Cocoa/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

[assembly: AssemblyDescription("An MVVM framework that integrates the Reactive Extensions")]
[assembly: AssemblyProduct("ReactiveUI.Cocoa")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]

[assembly: InternalsVisibleTo("ReactiveUI_Tests_Monotouch")]
2 changes: 1 addition & 1 deletion ReactiveUI.Platforms/Gtk/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[assembly: AssemblyDescription("Gtk# support for ReactiveUI")]
[assembly: AssemblyProduct("ReactiveUI.Gtk")]

[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]
2 changes: 1 addition & 1 deletion ReactiveUI.Platforms/Winforms/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

[assembly: AssemblyDescription("An MVVM framework that integrates the Reactive Extensions")]
[assembly: AssemblyProduct("ReactiveUI.Winforms")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_Net45")]
2 changes: 1 addition & 1 deletion ReactiveUI.Platforms/Xaml/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[assembly: AssemblyDescription("An MVVM framework that integrates the Reactive Extensions")]
[assembly: AssemblyProduct("ReactiveUI.Xaml")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]

#if !(WINRT || SILVERLIGHT || MONO)
[assembly: ThemeInfo(
Expand Down
2 changes: 1 addition & 1 deletion ReactiveUI.Testing/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

[assembly: AssemblyDescription("Classes that aid in testing ReactiveUI projects")]
[assembly: AssemblyProduct("ReactiveUI.Testing")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]
2 changes: 1 addition & 1 deletion ReactiveUI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[assembly: AssemblyDescription("An MVVM framework that integrates the Reactive Extensions")]
[assembly: AssemblyProduct("ReactiveUI")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyVersion("5.1.0")]

[assembly: InternalsVisibleTo("ReactiveUI.Xaml")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_Net45")]
Expand Down

0 comments on commit 2248d79

Please sign in to comment.