Skip to content
Browse files

Merge remote-tracking branch 'origin/rxui5-master' into rxui5-validation

Conflicts:
	ReactiveUI.Platforms/Registrations.cs
	ReactiveUI/ReactiveUI_Net40.csproj
	ReactiveUI/ReactiveUI_WinRT.csproj
  • Loading branch information...
2 parents 5189285 + e4c8ea7 commit bf166a1405dbddba4f94048b5d0231f15506e9f7 @paulcbetts paulcbetts committed May 17, 2013
Showing with 96,344 additions and 1,971 deletions.
  1. +2 −0 .gitignore
  2. +4 −12 AndroidPlayground/AndroidPlayground.csproj
  3. +3 −1 MakeRelease.ps1
  4. +1 −1 NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec
  5. +1 −1 NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec
  6. +2 −2 NuGet/ReactiveUI-Mobile/ReactiveUI-Mobile.nuspec
  7. +2 −2 NuGet/ReactiveUI-NLog/ReactiveUI-NLog.nuspec
  8. +2 −2 NuGet/ReactiveUI-Platforms/ReactiveUI-Platforms.nuspec
  9. +2 −2 NuGet/ReactiveUI-Testing/ReactiveUI-Testing.nuspec
  10. +2 −2 NuGet/ReactiveUI/ReactiveUI-Xaml.nuspec
  11. +4 −4 NuGet/ReactiveUI/ReactiveUI.nuspec
  12. +1 −1 ReactiveUI.Blend/FollowObservableStateBehavior.cs
  13. +1 −1 ReactiveUI.Blend/ObservableTrigger.cs
  14. +19 −5 ReactiveUI.Events/EventBuilder.cs
  15. +84 −0 ReactiveUI.Events/ReactiveUI.Events_Monodroid.csproj
  16. +113 −0 ReactiveUI.Events/ReactiveUI.Events_Monotouch.csproj
  17. +50 −0 ReactiveUI.Events/Resources/AboutResources.txt
  18. +60 −0 ReactiveUI.Events/Resources/Resource.Designer.cs
  19. +5 −0 ReactiveUI.Events/Resources/Values/Strings.xml
  20. +1 −1 ReactiveUI.Mobile/AutoSuspendActivityHelper.cs
  21. +1 −1 ReactiveUI.Mobile/AutoSuspendAppDelegate.cs
  22. +1 −1 ReactiveUI.Mobile/Geolocation.cs
  23. +4 −4 ReactiveUI.Mobile/ReactiveUI.Mobile_Monodroid.csproj
  24. +5 −5 ReactiveUI.Mobile/ReactiveUI.Mobile_Monotouch.csproj
  25. +1 −1 ReactiveUI.Mobile/WP8AutoSuspendApplication.cs
  26. +1 −1 ReactiveUI.Mobile/WinRTAutoSuspendApplication.cs
  27. +1 −1 ReactiveUI.NLog/ReactiveUI.NLog_Mono.csproj
  28. +1 −1 ReactiveUI.Platforms/Cocoa/RouterUINavigationController.cs
  29. +2 −2 ReactiveUI.Platforms/ReactiveUI.Android.csproj
  30. +16 −18 ReactiveUI.Platforms/ReactiveUI.Cocoa.csproj
  31. +1 −1 ReactiveUI.Platforms/ReactiveUI.Cocoa_Monotouch.csproj
  32. +0 −141 ReactiveUI.Platforms/ReactiveUI.Xaml_Mono.csproj
  33. +0 −146 ReactiveUI.Platforms/ReactiveUI.Xaml_Monodroid.csproj
  34. +0 −74 ReactiveUI.Platforms/ReactiveUI.Xaml_Monotouch.csproj
  35. +2 −2 ReactiveUI.Platforms/ReactiveUI.Xaml_Net45.csproj
  36. +1 −6 ReactiveUI.Platforms/RealUnitTestDetector.cs
  37. +13 −7 ReactiveUI.Platforms/Registrations.cs
  38. +1 −1 ReactiveUI.Testing/ReactiveUI.Testing_Mono.csproj
  39. +3 −3 ReactiveUI.Testing/TestUtils.cs
  40. +127 −9 ReactiveUI.Tests/ReactiveCollectionTest.cs
  41. +7 −7 ReactiveUI.Tests/ReactiveCommandTest.cs
  42. +2 −1 ReactiveUI.Tests/ReactiveUI.Tests_Net45.csproj
  43. +3 −3 ReactiveUI.Tests/RxAppTest.cs
  44. +40 −0 ReactiveUI.Tests/TestLogger.cs
  45. +546 −52 ReactiveUI.sln
  46. +1 −1 ReactiveUI/AutoPersistHelper.cs
  47. +1 −2 ReactiveUI/IDependencyResolver.cs
  48. +1 −1 ReactiveUI/Interfaces.cs
  49. +2 −2 ReactiveUI/MakeObjectReactiveHelper.cs
  50. +4 −5 ReactiveUI/MessageBus.cs
  51. +1 −1 ReactiveUI/ObservableAsPropertyHelper.cs
  52. +1 −1 ReactiveUI/POCOObservableForProperty.cs
  53. +0 −319 ReactiveUI/PropertyBinding.cs
  54. +5 −5 ReactiveUI/ReactiveAsyncCommand.cs
  55. +1 −1 ReactiveUI/ReactiveCollection.cs
  56. +33 −17 ReactiveUI/ReactiveCollectionMixins.cs
  57. +9 −9 ReactiveUI/ReactiveCommand.cs
  58. +29 −22 ReactiveUI/ReactiveUI_Mono.csproj
  59. +0 −193 ReactiveUI/ReactiveUI_Net40.csproj
  60. +0 −123 ReactiveUI/ReactiveUI_WinRT.csproj
  61. +35 −22 ReactiveUI/RxApp.cs
  62. +0 −44 ReactiveUI_Android.sln
  63. +0 −282 ReactiveUI_Monotouch.sln
  64. +0 −136 ReactiveUI_Net4Only.sln
  65. +0 −33 ReactiveUI_Net4Only.sln.DotSettings
  66. +80 −0 ReactiveUI_All.sln → ReactiveUI_VSAll.sln
  67. +10 −206 ReactiveUI_Mono.sln → ReactiveUI_XSAll.sln
  68. +304 −0 ReactiveUI_XSOnly.sln
  69. +1 −9 XamarinMacPlayground/XamarinMacPlayground.csproj
  70. BIN ext/mono/System.Reactive.Core.dll
  71. BIN ext/mono/System.Reactive.Debugger.dll
  72. BIN ext/mono/System.Reactive.Experimental.dll
  73. BIN ext/mono/System.Reactive.Interfaces.dll
  74. BIN ext/mono/System.Reactive.Linq.dll
  75. BIN ext/mono/System.Reactive.PlatformServices.dll
  76. BIN ext/mono/System.Reactive.Providers.dll
  77. BIN ext/mono/System.Reactive.Runtime.Remoting.dll
  78. BIN ext/mono/System.Reactive.Windows.Forms.dll
  79. BIN ext/mono/System.Reactive.Windows.Threading.dll
  80. +4 −12 iOSPlayground/iOSPlayground.csproj
  81. +2,617 −0 packages/Rx-Core.2.1.30214.0/lib/Net40/System.Reactive.Core.XML
  82. BIN packages/Rx-Core.2.1.30214.0/lib/Net40/System.Reactive.Core.dll
  83. +2,873 −0 packages/Rx-Core.2.1.30214.0/lib/Net45/System.Reactive.Core.XML
  84. BIN packages/Rx-Core.2.1.30214.0/lib/Net45/System.Reactive.Core.dll
  85. +2,873 −0 packages/Rx-Core.2.1.30214.0/lib/NetCore45/System.Reactive.Core.XML
  86. BIN packages/Rx-Core.2.1.30214.0/lib/NetCore45/System.Reactive.Core.dll
  87. +2,873 −0 packages/Rx-Core.2.1.30214.0/lib/Portable-Net45+WinRT45+WP8/System.Reactive.Core.XML
  88. BIN packages/Rx-Core.2.1.30214.0/lib/Portable-Net45+WinRT45+WP8/System.Reactive.Core.dll
  89. +2,516 −0 packages/Rx-Core.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.Core.XML
  90. BIN packages/Rx-Core.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.Core.dll
  91. 0 packages/Rx-Core.2.1.30214.0/lib/SL4/_._
  92. +2,617 −0 packages/Rx-Core.2.1.30214.0/lib/SL5/System.Reactive.Core.XML
  93. BIN packages/Rx-Core.2.1.30214.0/lib/SL5/System.Reactive.Core.dll
  94. +2,873 −0 packages/Rx-Core.2.1.30214.0/lib/WP8/System.Reactive.Core.XML
  95. BIN packages/Rx-Core.2.1.30214.0/lib/WP8/System.Reactive.Core.dll
  96. +336 −0 packages/Rx-Interfaces.2.1.30214.0/lib/Net40/System.Reactive.Interfaces.XML
  97. BIN packages/Rx-Interfaces.2.1.30214.0/lib/Net40/System.Reactive.Interfaces.dll
  98. +336 −0 packages/Rx-Interfaces.2.1.30214.0/lib/Net45/System.Reactive.Interfaces.XML
  99. BIN packages/Rx-Interfaces.2.1.30214.0/lib/Net45/System.Reactive.Interfaces.dll
  100. +336 −0 packages/Rx-Interfaces.2.1.30214.0/lib/NetCore45/System.Reactive.Interfaces.XML
  101. BIN packages/Rx-Interfaces.2.1.30214.0/lib/NetCore45/System.Reactive.Interfaces.dll
  102. +336 −0 packages/Rx-Interfaces.2.1.30214.0/lib/Portable-Net45+WinRT45+WP8/System.Reactive.Interfaces.XML
  103. BIN packages/Rx-Interfaces.2.1.30214.0/lib/Portable-Net45+WinRT45+WP8/System.Reactive.Interfaces.dll
  104. +336 −0 packages/Rx-Interfaces.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.Interfaces.XML
  105. BIN packages/Rx-Interfaces.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.Interfaces.dll
  106. 0 packages/Rx-Interfaces.2.1.30214.0/lib/SL4/_._
  107. +368 −0 packages/Rx-Interfaces.2.1.30214.0/lib/SL5/System.Reactive.Interfaces.XML
  108. BIN packages/Rx-Interfaces.2.1.30214.0/lib/SL5/System.Reactive.Interfaces.dll
  109. +336 −0 packages/Rx-Interfaces.2.1.30214.0/lib/WP8/System.Reactive.Interfaces.XML
  110. BIN packages/Rx-Interfaces.2.1.30214.0/lib/WP8/System.Reactive.Interfaces.dll
  111. +10,510 −0 packages/Rx-Linq.2.1.30214.0/lib/Net40/System.Reactive.Linq.XML
  112. BIN packages/Rx-Linq.2.1.30214.0/lib/Net40/System.Reactive.Linq.dll
  113. +10,565 −0 packages/Rx-Linq.2.1.30214.0/lib/Net45/System.Reactive.Linq.XML
  114. BIN packages/Rx-Linq.2.1.30214.0/lib/Net45/System.Reactive.Linq.dll
  115. +10,565 −0 packages/Rx-Linq.2.1.30214.0/lib/NetCore45/System.Reactive.Linq.XML
  116. BIN packages/Rx-Linq.2.1.30214.0/lib/NetCore45/System.Reactive.Linq.dll
  117. +10,565 −0 packages/Rx-Linq.2.1.30214.0/lib/Portable-Net45+WinRT45+WP8/System.Reactive.Linq.XML
  118. BIN packages/Rx-Linq.2.1.30214.0/lib/Portable-Net45+WinRT45+WP8/System.Reactive.Linq.dll
  119. +7,587 −0 packages/Rx-Linq.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.Linq.XML
  120. BIN packages/Rx-Linq.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.Linq.dll
  121. 0 packages/Rx-Linq.2.1.30214.0/lib/SL4/_._
  122. +10,510 −0 packages/Rx-Linq.2.1.30214.0/lib/SL5/System.Reactive.Linq.XML
  123. BIN packages/Rx-Linq.2.1.30214.0/lib/SL5/System.Reactive.Linq.dll
  124. +10,565 −0 packages/Rx-Linq.2.1.30214.0/lib/WP8/System.Reactive.Linq.XML
  125. BIN packages/Rx-Linq.2.1.30214.0/lib/WP8/System.Reactive.Linq.dll
  126. 0 packages/Rx-PlatformServices.2.1.30214.0/content/Net40/_._
  127. 0 packages/Rx-PlatformServices.2.1.30214.0/content/Net45/_._
  128. 0 packages/Rx-PlatformServices.2.1.30214.0/content/NetCore45/_._
  129. +16 −0 packages/Rx-PlatformServices.2.1.30214.0/content/Portable-Net45+WinRT45+WP8/Readme.txt
  130. 0 packages/Rx-PlatformServices.2.1.30214.0/content/SL4-WindowsPhone71/_._
  131. 0 packages/Rx-PlatformServices.2.1.30214.0/content/SL4/_._
  132. 0 packages/Rx-PlatformServices.2.1.30214.0/content/SL5/_._
  133. 0 packages/Rx-PlatformServices.2.1.30214.0/content/WP8/_._
  134. +378 −0 packages/Rx-PlatformServices.2.1.30214.0/lib/Net40/System.Reactive.PlatformServices.XML
  135. BIN packages/Rx-PlatformServices.2.1.30214.0/lib/Net40/System.Reactive.PlatformServices.dll
  136. +378 −0 packages/Rx-PlatformServices.2.1.30214.0/lib/Net45/System.Reactive.PlatformServices.XML
  137. BIN packages/Rx-PlatformServices.2.1.30214.0/lib/Net45/System.Reactive.PlatformServices.dll
  138. +376 −0 packages/Rx-PlatformServices.2.1.30214.0/lib/NetCore45/System.Reactive.PlatformServices.XML
  139. BIN packages/Rx-PlatformServices.2.1.30214.0/lib/NetCore45/System.Reactive.PlatformServices.dll
  140. 0 packages/Rx-PlatformServices.2.1.30214.0/lib/Portable-Net45+WinRT45+WP8/_._
  141. +311 −0 packages/Rx-PlatformServices.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.PlatformServices.XML
  142. BIN packages/Rx-PlatformServices.2.1.30214.0/lib/SL4-WindowsPhone71/System.Reactive.PlatformServices.dll
  143. 0 packages/Rx-PlatformServices.2.1.30214.0/lib/SL4/_._
  144. +354 −0 packages/Rx-PlatformServices.2.1.30214.0/lib/SL5/System.Reactive.PlatformServices.XML
  145. BIN packages/Rx-PlatformServices.2.1.30214.0/lib/SL5/System.Reactive.PlatformServices.dll
  146. +378 −0 packages/Rx-PlatformServices.2.1.30214.0/lib/WP8/System.Reactive.PlatformServices.XML
  147. BIN packages/Rx-PlatformServices.2.1.30214.0/lib/WP8/System.Reactive.PlatformServices.dll
View
2 .gitignore
@@ -24,3 +24,5 @@ version-bump.patch
ReactiveUI.Events/Events.cs
ReactiveUI.Events/Events_*.cs
+
+packages
View
16 AndroidPlayground/AndroidPlayground.csproj
@@ -88,18 +88,6 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Android\ReactiveUI.Android.csproj">
- <Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
- <Name>ReactiveUI.Android</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_Monodroid.csproj">
- <Project>{E92E477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI.Routing_Monodroid</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Monodroid.csproj">
- <Project>{E92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI.Xaml_Monodroid</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
<Name>ReactiveUI_Monodroid</Name>
@@ -108,5 +96,9 @@
<Project>{A92E477B-BB94-43C1-984E-E177EF9FEDB1}</Project>
<Name>ReactiveUI.Mobile_Monodroid</Name>
</ProjectReference>
+ <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
+ <Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
+ <Name>ReactiveUI.Android</Name>
+ </ProjectReference>
</ItemGroup>
</Project>
View
4 MakeRelease.ps1
@@ -4,12 +4,14 @@ $Projects = {
"ReactiveUI.NLog", "ReactiveUI.Mobile", "RxUIViewModelGenerator", "ReactiveUI.Events"
}
-$SlnFileExists = Test-Path ".\ReactiveUI.sln"
+$SlnFileExists = Test-Path ".\ReactiveUI_VSAll.sln"
if ($SlnFileExists -eq $False) {
echo "*** ERROR: Run this in the project root ***"
exit -1
}
+C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" /maxcpucount:1 .\ReactiveUI_VSAll.sln
+
###
### Build the Release directory
###
View
2 NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</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>
View
2 NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</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>
View
4 NuGet/ReactiveUI-Mobile/ReactiveUI-Mobile.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</version>
<description>ReactiveUI library for Xamarin.Mobile and other mobile-related helpers</description>
<authors>Paul Betts</authors>
<projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
- <dependency id="reactiveui-platforms" version="[5.0.0.20130502-alpha]" />
+ <dependency id="reactiveui-platforms" version="[5.0.0.20130512-alpha]" />
</dependencies>
</metadata>
</package>
View
4 NuGet/ReactiveUI-NLog/ReactiveUI-NLog.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</version>
<description>An adapter to initialize NLog as the logger for ReactiveUI.</description>
<authors>Paul Betts</authors>
<projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
- <dependency id="reactiveui-core" version="[5.0.0.20130502-alpha]" />
+ <dependency id="reactiveui-core" version="[5.0.0.20130512-alpha]" />
<dependency id="NLog" version="[2.0.1.2]" />
</dependencies>
</metadata>
View
4 NuGet/ReactiveUI-Platforms/ReactiveUI-Platforms.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</version>
<description>Platform specific extensions to ReactiveUI</description>
<authors>Paul Betts</authors>
<projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
- <dependency id="reactiveui-core" version="[5.0.0.20130502-alpha]" />
+ <dependency id="reactiveui-core" version="[5.0.0.20130512-alpha]" />
<dependency id="Rx-Xaml" version="2.1.30214.0" />
</dependencies>
</metadata>
View
4 NuGet/ReactiveUI-Testing/ReactiveUI-Testing.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</version>
<description>A library to aid in writing unit tests for ReactiveUI projects</description>
<authors>Paul Betts</authors>
<projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
- <dependency id="reactiveui-core" version="[5.0.0.20130502-alpha]" />
+ <dependency id="reactiveui-core" version="[5.0.0.20130512-alpha]" />
<dependency id="Rx-Testing" version="2.1.30214.0" />
</dependencies>
</metadata>
View
4 NuGet/ReactiveUI/ReactiveUI-Xaml.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</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>
@@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
- <dependency id="reactiveui-platforms" version="[5.0.0.20130502-alpha]" />
+ <dependency id="reactiveui-platforms" version="[5.0.0.20130512-alpha]" />
</dependencies>
</metadata>
</package>
View
8 NuGet/ReactiveUI/ReactiveUI.nuspec
@@ -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.0.20130502-alpha</version>
+ <version>5.0.0.20130512-alpha</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>
@@ -11,9 +11,9 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
- <dependency id="reactiveui-core" version="[5.0.0.20130502-alpha]" />
- <dependency id="reactiveui-nlog" version="[5.0.0.20130502-alpha]" />
- <dependency id="reactiveui-platforms" version="[5.0.0.20130502-alpha]" />
+ <dependency id="reactiveui-core" version="[5.0.0.20130512-alpha]" />
+ <dependency id="reactiveui-nlog" version="[5.0.0.20130512-alpha]" />
+ <dependency id="reactiveui-platforms" version="[5.0.0.20130512-alpha]" />
</dependencies>
</metadata>
</package>
View
2 ReactiveUI.Blend/FollowObservableStateBehavior.cs
@@ -66,7 +66,7 @@ protected static void onStateObservableChanged(DependencyObject sender, Dependen
This.watcher = null;
}
- This.watcher = ((IObservable<string>)e.NewValue).ObserveOn(RxApp.DeferredScheduler).Subscribe(
+ This.watcher = ((IObservable<string>)e.NewValue).ObserveOn(RxApp.MainThreadScheduler).Subscribe(
x => {
var target = This.TargetObject ?? This.AssociatedObject;
#if SILVERLIGHT
View
2 ReactiveUI.Blend/ObservableTrigger.cs
@@ -28,7 +28,7 @@ protected static void onObservableChanged(DependencyObject sender, DependencyPro
This.watcher = null;
}
- This.watcher = ((IObservable<object>)e.NewValue).ObserveOn(RxApp.DeferredScheduler).Subscribe(
+ This.watcher = ((IObservable<object>)e.NewValue).ObserveOn(RxApp.MainThreadScheduler).Subscribe(
x => This.InvokeActions(x),
ex => {
if (!This.AutoResubscribeOnError)
View
24 ReactiveUI.Events/EventBuilder.cs
@@ -14,9 +14,15 @@ class Program
static void Main(string[] args)
{
var targetAssemblyNames = args.TakeWhile(x => !x.EndsWith(".mustache"));
- var targetAssemblyDirs = targetAssemblyNames.Select(x => Path.GetDirectoryName(x)).Distinct().ToArray();
+ var targetAssemblyDirs = targetAssemblyNames.Select(x => Path.GetDirectoryName(x)).Distinct().ToList();
- var rp = new ReaderParameters() { AssemblyResolver = new PathSearchAssemblyResolver(targetAssemblyDirs) };
+ // NB: I'm too lazy to fix this properly
+ var monoDroidDir = targetAssemblyDirs.FirstOrDefault(x => x.ToLowerInvariant().Contains("monoandroid"));
+ if (monoDroidDir != null) {
+ targetAssemblyDirs.Add(monoDroidDir.Replace("v4.0", "v1.0"));
+ }
+
+ var rp = new ReaderParameters() { AssemblyResolver = new PathSearchAssemblyResolver(targetAssemblyDirs.ToArray()) };
var targetAssemblies = targetAssemblyNames
.Select(x => AssemblyDefinition.ReadAssembly(x, rp)).ToArray();
@@ -33,6 +39,8 @@ static void Main(string[] args)
"Windows.UI.Xaml.Data",
"Windows.UI.Xaml.Interop",
"Windows.UI.Xaml.Input",
+ "MonoTouch.AudioToolbox",
+ "ReactiveUI.Events",
};
var namespaceData = publicTypesWithEvents
@@ -84,9 +92,12 @@ public static string GetRealTypeName(TypeDefinition t)
{
if (t.GenericParameters.Count == 0) return RenameBogusWinRTTypes(t.FullName);
- return String.Format("{0}<{1}>",
+ var ret = String.Format("{0}<{1}>",
RenameBogusWinRTTypes(t.Namespace + "." + t.Name),
String.Join(",", t.GenericParameters.Select(x => GetRealTypeName(x.Resolve()))));
+
+ // NB: Inner types in Mono.Cecil get reported as 'Foo/Bar'
+ return ret.Replace('/', '.');
}
public static string GetRealTypeName(TypeReference t)
@@ -97,7 +108,9 @@ public static string GetRealTypeName(TypeReference t)
var ret = String.Format("{0}<{1}>",
RenameBogusWinRTTypes(generic.Namespace + "." + generic.Name),
String.Join(",", generic.GenericArguments.Select(x => GetRealTypeName(x))));
- return ret;
+
+ // NB: Inner types in Mono.Cecil get reported as 'Foo/Bar'
+ return ret.Replace('/', '.');
}
static Dictionary<string, string> substitutionList = new Dictionary<string, string> {
@@ -133,7 +146,8 @@ public static string GetEventArgsTypeForEvent(EventDefinition ei)
}
}
- return ret;
+ // NB: Inner types in Mono.Cecil get reported as 'Foo/Bar'
+ return ret.Replace('/', '.');
}
public static IEnumerable<TypeDefinition> GetParents(TypeDefinition type)
View
84 ReactiveUI.Events/ReactiveUI.Events_Monodroid.csproj
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{A120F2EC-F343-47BD-9BD3-7572C1E58433}</ProjectGuid>
+ <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ReactiveUI.Events</RootNamespace>
+ <AssemblyName>ReactiveUI.Events</AssemblyName>
+ <FileAlignment>512</FileAlignment>
+ <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
+ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\Monoandroid\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\Monoandroid\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Mono.Android" />
+ <Reference Include="Mono.Android.Support.v4" />
+ <Reference Include="mscorlib" />
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Reactive.Core">
+ <HintPath>..\ext\monodroid\System.Reactive.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Interfaces">
+ <HintPath>..\ext\monodroid\System.Reactive.Interfaces.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Linq">
+ <HintPath>..\ext\monodroid\System.Reactive.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.PlatformServices">
+ <HintPath>..\ext\monodroid\System.Reactive.PlatformServices.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Events.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Resources\Resource.Designer.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="Resources\AboutResources.txt" />
+ <AndroidResource Include="Resources\Values\Strings.xml" />
+ </ItemGroup>
+ <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>%25SystemRoot%25\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /p:Configuration=Release "$(ProjectDir)EventBuilder.csproj"
+"$(ProjectDir)EventBuilder.exe" "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v4.0\Mono.Android.dll" "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v4.0\Mono.Android.Support.v4.dll" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events.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>
+ </PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <!-- 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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
View
113 ReactiveUI.Events/ReactiveUI.Events_Monotouch.csproj
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{334E6DAC-0D70-4CE0-80CB-DFD3147DBE18}</ProjectGuid>
+ <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <OutputType>Library</OutputType>
+ <RootNamespace>ReactiveUI.Events</RootNamespace>
+ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
+ <AssemblyName>ReactiveUI.Events</AssemblyName>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <MtouchLink>None</MtouchLink>
+ <MtouchDebug>true</MtouchDebug>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
+ <DebugType>none</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <MtouchLink>None</MtouchLink>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\Monotouch\</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <MtouchDebug>true</MtouchDebug>
+ <CodesignKey>iPhone Developer</CodesignKey>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
+ <DebugType>none</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\Monotouch\</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodesignKey>iPhone Developer</CodesignKey>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
+ <DebugType>none</DebugType>
+ <Optimize>True</Optimize>
+ <OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>False</ConsolePause>
+ <CodesignKey>iPhone Distribution</CodesignKey>
+ <BuildIpa>True</BuildIpa>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
+ <DebugType>none</DebugType>
+ <Optimize>True</Optimize>
+ <OutputPath>bin\iPhone\AppStore</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>False</ConsolePause>
+ <CodesignKey>iPhone Distribution</CodesignKey>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Events.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Reactive.Core">
+ <HintPath>..\ext\ios\System.Reactive.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Interfaces">
+ <HintPath>..\ext\ios\System.Reactive.Interfaces.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Linq">
+ <HintPath>..\ext\ios\System.Reactive.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.PlatformServices">
+ <HintPath>..\ext\ios\System.Reactive.PlatformServices.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Core" />
+ <Reference Include="monotouch" />
+ </ItemGroup>
+ <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>%25SystemRoot%25\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /p:Configuration=Release "$(ProjectDir)EventBuilder.csproj"
+"$(ProjectDir)EventBuilder.exe" "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoTouch\v4.0\monotouch.dll" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events.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>
+ </PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+</Project>
View
50 ReactiveUI.Events/Resources/AboutResources.txt
@@ -0,0 +1,50 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included
+in your application as resource files. Various Android APIs are designed to
+operate on the resource IDs instead of dealing with images, strings or binary blobs
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.xml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png)
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+ drawable-hdpi/
+ icon.png
+
+ drawable-ldpi/
+ icon.png
+
+ drawable-mdpi/
+ icon.png
+
+ layout/
+ main.xml
+
+ values/
+ strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource". The native Android APIs do not operate directly with filenames, but
+instead operate on resource IDs. When you compile an Android application that uses resources,
+the build system will package the resources for distribution and generate a class called
+"Resource" that contains the tokens for each one of the resources included. For example,
+for the above Resources layout, this is what the Resource class would expose:
+
+public class Resource {
+ public class drawable {
+ public const int icon = 0x123;
+ }
+
+ public class layout {
+ public const int main = 0x456;
+ }
+
+ public class strings {
+ public const int first_string = 0xabc;
+ public const int second_string = 0xbcd;
+ }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main
+to reference the layout/main.xml file, or Resource.strings.first_string to reference the first
+string in the dictionary file values/strings.xml.
View
60 ReactiveUI.Events/Resources/Resource.Designer.cs
@@ -0,0 +1,60 @@
+#pragma warning disable 1591
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18033
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("ReactiveUI.Events.Resource", IsApplication=false)]
+
+namespace ReactiveUI.Events
+{
+
+
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ public partial class Resource
+ {
+
+ static Resource()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ public partial class Attribute
+ {
+
+ static Attribute()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private Attribute()
+ {
+ }
+ }
+
+ public partial class String
+ {
+
+ // aapt resource value: 0x7f020001
+ public static int ApplicationName = 2130837505;
+
+ // aapt resource value: 0x7f020000
+ public static int Hello = 2130837504;
+
+ static String()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private String()
+ {
+ }
+ }
+ }
+}
+#pragma warning restore 1591
View
5 ReactiveUI.Events/Resources/Values/Strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="Hello">Hello World, Click Me!</string>
+ <string name="ApplicationName">$projectname$</string>
+</resources>
View
2 ReactiveUI.Mobile/AutoSuspendActivityHelper.cs
@@ -105,7 +105,7 @@ public AutoSuspendActivityHelper(Activity hostActivity)
.LoggedCatch(this,
Observable.Defer(() => Observable.Return(RxApp.DependencyResolver.GetService<IApplicationRootState>())),
"Failed to restore app state from storage, creating from scratch")
- .ObserveOn(RxApp.DeferredScheduler)
+ .ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x => RootState.Current.ViewModel = x);
host.IsLaunchingNew.Subscribe(_ => {
View
2 ReactiveUI.Mobile/AutoSuspendAppDelegate.cs
@@ -138,7 +138,7 @@ internal void setupDefaultSuspendResume(ISuspensionDriver driver)
.LoggedCatch(this,
Observable.Defer(() => Observable.Return(RxApp.DependencyResolver.GetService<IApplicationRootState>())),
"Failed to restore app state from storage, creating from scratch")
- .ObserveOn(RxApp.DeferredScheduler)
+ .ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x => ViewModel = x);
SuspensionHost.IsLaunchingNew.Subscribe(_ => {
View
2 ReactiveUI.Mobile/Geolocation.cs
@@ -139,7 +139,7 @@ public class TestGeolocator : IReactiveGeolocator
public TestGeolocator(IObservable<Position> positionStream, IScheduler scheduler = null)
{
positionStream.Multicast(_latestPosition).Connect();
- _scheduler = scheduler ?? RxApp.DeferredScheduler;
+ _scheduler = scheduler ?? RxApp.MainThreadScheduler;
}
public IObservable<Position> Listen(int minUpdateTime, double minUpdateDist, bool includeHeading = false)
View
8 ReactiveUI.Mobile/ReactiveUI.Mobile_Monodroid.csproj
@@ -135,14 +135,14 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
- <Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
- <Name>ReactiveUI.Android</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
<Name>ReactiveUI_Monodroid</Name>
</ProjectReference>
+ <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
+ <Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
+ <Name>ReactiveUI.Android</Name>
+ </ProjectReference>
</ItemGroup>
<!-- 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.
View
10 ReactiveUI.Mobile/ReactiveUI.Mobile_Monotouch.csproj
@@ -71,13 +71,13 @@
<Compile Include="JsonSuspensionDriver.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Cocoa_Monotouch.csproj">
- <Project>{9091337a-9e94-4dbd-801e-15e1fda78ffc}</Project>
- <Name>ReactiveUI.Cocoa_Monotouch</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monotouch.csproj">
- <Project>{9091337a-9e94-4dbd-801e-05e1fda78ffc}</Project>
+ <Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
<Name>ReactiveUI_Monotouch</Name>
</ProjectReference>
+ <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Cocoa_Monotouch.csproj">
+ <Project>{9091337A-9E94-4DBD-801E-15E1FDA78FFC}</Project>
+ <Name>ReactiveUI.Cocoa_Monotouch</Name>
+ </ProjectReference>
</ItemGroup>
</Project>
View
2 ReactiveUI.Mobile/WP8AutoSuspendApplication.cs
@@ -162,7 +162,7 @@ internal void setupDefaultSuspendResume(ISuspensionDriver driver)
.LoggedCatch(this,
Observable.Defer(() => Observable.Return(RxApp.DependencyResolver.GetService<IApplicationRootState>())),
"Failed to restore app state from storage, creating from scratch")
- .ObserveOn(RxApp.DeferredScheduler)
+ .ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x => ViewModel = x);
SuspensionHost.IsLaunchingNew.Subscribe(_ => {
View
2 ReactiveUI.Mobile/WinRTAutoSuspendApplication.cs
@@ -114,7 +114,7 @@ internal void setupDefaultSuspendResume(ISuspensionDriver driver)
.LoggedCatch(this,
Observable.Defer(() => Observable.Return(RxApp.DependencyResolver.GetService<IApplicationRootState>())),
"Failed to restore app state from storage, creating from scratch")
- .ObserveOn(RxApp.DeferredScheduler)
+ .ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(x => ViewModel = x);
SuspensionHost.IsLaunchingNew.Subscribe(_ => {
View
2 ReactiveUI.NLog/ReactiveUI.NLog_Mono.csproj
@@ -72,6 +72,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="NLogLogger.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
+ <Compile Include="Registrations.cs" />
</ItemGroup>
</Project>
View
2 ReactiveUI.Platforms/Cocoa/RouterUINavigationController.cs
@@ -41,7 +41,7 @@ bool navigationBarShouldPopItem(UINavigationBar navigationBar, UINavigationItem
{
if (dontPopWhileYouPop) return true;
- RxApp.DeferredScheduler.Schedule (() => {
+ RxApp.MainThreadScheduler.Schedule (() => {
if (!router.NavigateBack.CanExecute(null) || dontPopWhileYouPop) return;
dontPopWhileYouPop = true;
router.NavigateBack.Execute(null);
View
4 ReactiveUI.Platforms/ReactiveUI.Android.csproj
@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\Monoandroid\</OutputPath>
- <DefineConstants>DEBUG;MONO</DefineConstants>
+ <DefineConstants>DEBUG;MONO; ANDROID</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
@@ -72,7 +72,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
- <Project>{f92a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
+ <Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
<Name>ReactiveUI_Monodroid</Name>
</ProjectReference>
</ItemGroup>
View
34 ReactiveUI.Platforms/ReactiveUI.Cocoa.csproj
@@ -9,7 +9,7 @@
<ProjectTypeGuids>{42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>ReactiveUI.Cocoa</RootNamespace>
- <AssemblyName>ReactiveUI.Cocoa_Mono</AssemblyName>
+ <AssemblyName>ReactiveUI.Cocoa</AssemblyName>
<LastXamMacNagTime>1/2/2013 10:55:11 PM</LastXamMacNagTime>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
@@ -18,7 +18,7 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\Mono</OutputPath>
- <DefineConstants>DEBUG;</DefineConstants>
+ <DefineConstants>DEBUG; MONO; COCOA</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<EnablePackageSigning>False</EnablePackageSigning>
@@ -43,6 +43,7 @@
<CreatePackage>False</CreatePackage>
<CodeSigningKey>Mac Developer</CodeSigningKey>
<UseSGen>False</UseSGen>
+ <DefineConstants>MONO; COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
<DebugType>none</DebugType>
@@ -86,27 +87,24 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
<ItemGroup>
- <Compile Include="NSRunloopScheduler.cs" />
- <Compile Include="KVOObservableForProperty.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="CocoaDefaultPropertyBinding.cs" />
- <Compile Include="TargetActionCommandBinder.cs" />
- <Compile Include="ViewModelViewHost.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Cocoa\CocoaDefaultPropertyBinding.cs" />
+ <Compile Include="Cocoa\KVOObservableForProperty.cs" />
+ <Compile Include="Cocoa\NSRunloopScheduler.cs" />
+ <Compile Include="Cocoa\RoutedViewHost.cs" />
+ <Compile Include="Cocoa\TargetActionCommandBinder.cs" />
+ <Compile Include="Cocoa\ViewModelViewHost.cs" />
+ <Compile Include="Cocoa\Properties\AssemblyInfo.cs" />
+ <Compile Include="ComponentModelTypeConverter.cs" />
+ <Compile Include="RealUnitTestDetector.cs" />
+ <Compile Include="Registrations.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Mono.csproj">
<Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
<Name>ReactiveUI_Mono</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Mono.csproj">
- <Project>{761AC9BA-4A9C-440C-9B6C-2569978F0610}</Project>
- <Name>ReactiveUI.Xaml_Mono</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_Mono.csproj">
- <Project>{67038157-092E-4D72-BAF4-049EB1532264}</Project>
- <Name>ReactiveUI.Routing_Mono</Name>
- </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Cocoa\" />
</ItemGroup>
</Project>
View
2 ReactiveUI.Platforms/ReactiveUI.Cocoa_Monotouch.csproj
@@ -71,7 +71,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monotouch.csproj">
- <Project>{9091337a-9e94-4dbd-801e-05e1fda78ffc}</Project>
+ <Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
<Name>ReactiveUI_Monotouch</Name>
</ProjectReference>
</ItemGroup>
View
141 ReactiveUI.Platforms/ReactiveUI.Xaml_Mono.csproj
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{761AC9BA-4A9C-440C-9B6C-2569978F0610}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.Xaml</RootNamespace>
- <AssemblyName>ReactiveUI.Xaml</AssemblyName>
- <FileAlignment>512</FileAlignment>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>True</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>False</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE; MONO</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>True</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>False</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
- <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
- <CodeContractsContainerAnalysis>False</CodeContractsContainerAnalysis>
- <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
- <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
- <CodeContractsShowSquigglies>False</CodeContractsShowSquigglies>
- <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
- <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
- <CodeContractsCustomRewriterAssembly />
- <CodeContractsCustomRewriterClass />
- <CodeContractsLibPaths />
- <CodeContractsExtraRewriteOptions />
- <CodeContractsExtraAnalysisOptions />
- <CodeContractsBaseLineFile />
- <CodeContractsCacheAnalysisResults>False</CodeContractsCacheAnalysisResults>
- <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
- <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <CodeAnalysisRuleSet>ExtendedCorrectnessRules.ruleset</CodeAnalysisRuleSet>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <CodeContractsPointerObligations>False</CodeContractsPointerObligations>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>True</Optimize>
- <OutputPath>bin\Release\Mono\</OutputPath>
- <DefineConstants>TRACE; MONO</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRunCodeAnalysis>True</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>False</CodeContractsBoundsObligations>
- <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
- <CodeContractsContainerAnalysis>False</CodeContractsContainerAnalysis>
- <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
- <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
- <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
- <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
- <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
- <CodeContractsCustomRewriterAssembly />
- <CodeContractsCustomRewriterClass />
- <CodeContractsLibPaths />
- <CodeContractsExtraRewriteOptions />
- <CodeContractsExtraAnalysisOptions />
- <CodeContractsBaseLineFile />
- <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
- <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
- <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <DocumentationFile>bin\Release\Mono\ReactiveUI.Xaml.xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xaml" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Xml" />
- <Reference Include="WindowsBase" />
- <Reference Include="System.Reactive.Core">
- <HintPath>..\ext\mono\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces">
- <HintPath>..\ext\mono\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq">
- <HintPath>..\ext\mono\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices">
- <HintPath>..\ext\mono\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Errors.cs" />
- <Compile Include="Interfaces.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ReactiveAsyncCommand.cs" />
- <Compile Include="ReactiveCommand.cs" />
- <Compile Include="CommandBinding.cs" />
- <Compile Include="CreatesCommandBinding.cs" />
- <Compile Include="SampleDataBinder.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="WaitForDispatcherScheduler.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- 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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Mono.csproj">
- <Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI_Mono</Name>
- </ProjectReference>
- </ItemGroup>
-</Project>
View
146 ReactiveUI.Platforms/ReactiveUI.Xaml_Monodroid.csproj
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>10.0.0</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{E92A477B-BB94-43C1-984E-E177EF9FEDB7}</ProjectGuid>
- <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.Xaml</RootNamespace>
- <AssemblyName>ReactiveUI.Xaml_Monodroid</AssemblyName>
- <FileAlignment>512</FileAlignment>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>True</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>False</Optimize>
- <OutputPath>bin\Debug\Monodroid</OutputPath>
- <DefineConstants>DEBUG;TRACE; MONO</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>True</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>False</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
- <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
- <CodeContractsContainerAnalysis>False</CodeContractsContainerAnalysis>
- <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
- <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
- <CodeContractsShowSquigglies>False</CodeContractsShowSquigglies>
- <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
- <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
- <CodeContractsCustomRewriterAssembly />
- <CodeContractsCustomRewriterClass />
- <CodeContractsLibPaths />
- <CodeContractsExtraRewriteOptions />
- <CodeContractsExtraAnalysisOptions />
- <CodeContractsBaseLineFile />
- <CodeContractsCacheAnalysisResults>False</CodeContractsCacheAnalysisResults>
- <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
- <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <CodeAnalysisRuleSet>ExtendedCorrectnessRules.ruleset</CodeAnalysisRuleSet>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <CodeContractsPointerObligations>False</CodeContractsPointerObligations>
- <AndroidLinkMode>None</AndroidLinkMode>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>True</Optimize>
- <OutputPath>bin\Release\Monodroid</OutputPath>
- <DefineConstants>TRACE; MONO</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRunCodeAnalysis>True</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>False</CodeContractsBoundsObligations>
- <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
- <CodeContractsContainerAnalysis>False</CodeContractsContainerAnalysis>
- <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
- <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
- <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
- <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
- <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
- <CodeContractsCustomRewriterAssembly />
- <CodeContractsCustomRewriterClass />
- <CodeContractsLibPaths />
- <CodeContractsExtraRewriteOptions />
- <CodeContractsExtraAnalysisOptions />
- <CodeContractsBaseLineFile />
- <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
- <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
- <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <AndroidLinkMode>SdkOnly</AndroidLinkMode>
- <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Reactive.Core">
- <HintPath>..\ext\monodroid\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces">
- <HintPath>..\ext\monodroid\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq">
- <HintPath>..\ext\monodroid\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices">
- <HintPath>..\ext\monodroid\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Providers">
- <HintPath>..\ext\monodroid\System.Reactive.Providers.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="CommandBinding.cs" />
- <Compile Include="CreatesCommandBinding.cs" />
- <Compile Include="Errors.cs" />
- <Compile Include="Interfaces.cs" />
- <Compile Include="ReactiveAsyncCommand.cs" />
- <Compile Include="ReactiveCommand.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="WaitForDispatcherScheduler.cs" />
- </ItemGroup>
- <ItemGroup>
- <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- 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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
- <Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI_Monodroid</Name>
- </ProjectReference>
- </ItemGroup>
-</Project>
View
74 ReactiveUI.Platforms/ReactiveUI.Xaml_Monotouch.csproj
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>10.0.0</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{9891337A-9E94-4DBD-801E-05E1FDA78FFC}</ProjectGuid>
- <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <RootNamespace>ReactiveUI.Xaml</RootNamespace>
- <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
- <AssemblyName>ReactiveUI.Xaml_Monotouch</AssemblyName>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>True</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>False</Optimize>
- <OutputPath>bin\Debug\Monotouch</OutputPath>
- <DefineConstants>DEBUG; MONO</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>False</ConsolePause>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>True</Optimize>
- <OutputPath>bin\Release\Monotouch</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>False</ConsolePause>
- <DefineConstants>MONO</DefineConstants>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="monotouch" />
- <Reference Include="System.Reactive.Core">
- <HintPath>..\ext\ios\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces">
- <HintPath>..\ext\ios\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq">
- <HintPath>..\ext\ios\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices">
- <HintPath>..\ext\ios\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.Serialization" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Resources\" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="CommandBinding.cs" />
- <Compile Include="CreatesCommandBinding.cs" />
- <Compile Include="Errors.cs" />
- <Compile Include="Interfaces.cs" />
- <Compile Include="ReactiveAsyncCommand.cs" />
- <Compile Include="ReactiveCommand.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="WaitForDispatcherScheduler.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Monotouch.csproj">
- <Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
- <Name>ReactiveUI_Monotouch</Name>
- </ProjectReference>
- </ItemGroup>
-</Project>
View
4 ReactiveUI.Platforms/ReactiveUI.Xaml_Net45.csproj
@@ -30,7 +30,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>bin\Debug\Net45\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET_45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -170,4 +170,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
7 ReactiveUI.Platforms/RealUnitTestDetector.cs
@@ -79,13 +79,8 @@ public static bool InUnitTestRunner()
"NUNIT",
"XUNIT",
"MBUNIT",
- "TESTDRIVEN",
- "QUALITYTOOLS.TIPS.UNITTEST.ADAPTER",
- "QUALITYTOOLS.UNITTESTING.SILVERLIGHT",
- "PEX",
- "MSBUILD",
+ "PEX.",
"NBEHAVE",
- "TESTPLATFORM",
};
string[] designEnvironments = new[] {
View
20 ReactiveUI.Platforms/Registrations.cs
@@ -9,12 +9,14 @@
using System.Reactive.Concurrency;
#if COCOA
-using MonoTouch.UIKit;
using ReactiveUI.Cocoa;
#endif
#if UIKIT
+using MonoTouch.UIKit;
using NSApplication = MonoTouch.UIKit.UIApplication;
+#elif COCOA && !UIKIT
+using MonoMac.AppKit;
#endif
#if ANDROID
@@ -56,20 +58,24 @@ public void Register(Action<Func<object>, Type> registerFunction)
registerFunction(() => new KVOObservableForProperty(), typeof(ICreatesObservableForProperty));
registerFunction(() => new CocoaDefaultPropertyBinding(), typeof(IDefaultPropertyBindingProvider));
registerFunction(() => new TargetActionCommandBinder(), typeof(ICreatesCommandBinding));
+#endif
+
+ RxApp.InUnitTestRunnerOverride = RealUnitTestDetector.InUnitTestRunner();
+ if (RxApp.InUnitTestRunner()) {
+ return;
+ }
- RxApp.DeferredScheduler = new WaitForDispatcherScheduler(() => new NSRunloopScheduler(NSApplication.SharedApplication));
+#if COCOA
+ RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(() => new NSRunloopScheduler(NSApplication.SharedApplication));
#endif
#if !MONO && !WINRT
- RxApp.DeferredScheduler = new WaitForDispatcherScheduler(() => DispatcherScheduler.Current);
-
+ RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(() => DispatcherScheduler.Current);
#endif
#if WINRT
- RxApp.DeferredScheduler = new WaitForDispatcherScheduler(() => CoreDispatcherScheduler.Current);
+ RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(() => CoreDispatcherScheduler.Current);
#endif
-
- RxApp.InUnitTestRunnerOverride = RealUnitTestDetector.InUnitTestRunner();
}
}
}
View
2 ReactiveUI.Testing/ReactiveUI.Testing_Mono.csproj
@@ -25,7 +25,7 @@
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>bin\Debug\Mono</OutputPath>
<DefineConstants>DEBUG;TRACE;MONO</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
View
6 ReactiveUI.Testing/TestUtils.cs
@@ -26,14 +26,14 @@ public static class TestUtils
public static IDisposable WithScheduler(IScheduler sched)
{
Monitor.Enter(schedGate);
- var prevDef = RxApp.DeferredScheduler;
+ var prevDef = RxApp.MainThreadScheduler;
var prevTask = RxApp.TaskpoolScheduler;
- RxApp.DeferredScheduler = sched;
+ RxApp.MainThreadScheduler = sched;
RxApp.TaskpoolScheduler = sched;
return Disposable.Create(() => {
- RxApp.DeferredScheduler = prevDef;
+ RxApp.MainThreadScheduler = prevDef;
RxApp.TaskpoolScheduler = prevTask;
Monitor.Exit(schedGate);
});
View
136 ReactiveUI.Tests/ReactiveCollectionTest.cs
@@ -187,6 +187,46 @@ public void ChangeTrackingShouldWorkWhenAddingTheSameThingMoreThanOnce()
}
[Fact]
+ public void ChangeTrackingItemsShouldBeTrackedEvenWhenSuppressed()
+ {
+ var input = new TestFixture();
+ var fixture = new ReactiveCollection<TestFixture>() { ChangeTrackingEnabled = true };
+
+ var changes = fixture.ItemChanged.CreateCollection();
+ Assert.Equal(0, changes.Count);
+
+ input.IsOnlyOneWord = "foo";
+ Assert.Equal(0, changes.Count);
+
+ using (fixture.SuppressChangeNotifications()) {
+ fixture.Add(input);
+
+ input.IsOnlyOneWord = "bar";
+ Assert.Equal(0, changes.Count);
+ }
+
+ // Even though we added it during a suppression, we should still
+ // get notifications now that the suppression is over
+ input.IsOnlyOneWord = "baz";
+ Assert.Equal(1, changes.Count);
+
+ fixture.RemoveAt(0);
+ input.IsOnlyOneWord = "bamf";
+ Assert.Equal(1, changes.Count);
+ }
+
+ [Fact]
+ public void GetAResetWhenWeAddALotOfItems()
+ {
+ var fixture = new ReactiveCollection<int> { 1, };
+ var reset = fixture.ShouldReset.CreateCollection();
+ Assert.Equal(0, reset.Count);
+
+ fixture.AddRange(new[] { 2,3,4,5,6,7,8,9,10,11,12,13, });
+ Assert.Equal(1, reset.Count);
+ }
+
+ [Fact]
public void CollectionsShouldntShareSubscriptions()
{
var fixture1 = new ReactiveCollection<TestFixture>() { ChangeTrackingEnabled = true };
@@ -371,6 +411,75 @@ public void DerivedCollectionSignalledToResetShouldFireExactlyOnce()
Assert.Equal(2, derived.Count);
}
+ /// <summary>
+ /// This test is a bit contrived and only exists to verify that a particularly gnarly bug doesn't get
+ /// reintroduced because it's hard to reason about the removal logic in derived collections and it might
+ /// be tempting to try and reorder the shiftIndices operation in there.
+ /// </summary>
+ [Fact]
+ public void DerivedCollectionRemovalRegressionTest()
+ {
+ var input = new[] { 'A', 'B', 'C', 'D' };
+ var source = new ReactiveCollection<char>(input);
+
+ // A derived collection that filters away 'A' and 'B'
+ var derived = source.CreateDerivedCollection(x => x, x=> x >= 'C');
+
+ var changeNotifications = new List<NotifyCollectionChangedEventArgs>();
+ derived.Changed.Subscribe(changeNotifications.Add);
+
+ Assert.Equal(0, changeNotifications.Count);
+ Assert.Equal(2, derived.Count);
+ Assert.True(derived.SequenceEqual(new [] { 'C', 'D' }));
+
+ // The tricky part here is that 'B' isn't in the derived collection, only 'C' is and this test
+ // will detect if the dervied collection gets tripped up and removes 'C' instead
+ source.RemoveAll(new[] { 'B', 'C' });
+
+ Assert.Equal(1, changeNotifications.Count);
+ Assert.Equal(1, derived.Count);
+ Assert.True(derived.SequenceEqual(new[] { 'D' }));
+ }
+
+ public class DerivedCollectionLogging
+ {
+ // We need a sentinel class to make sure no test has triggered the warnings before
+ private class NoOneHasEverSeenThisClassBefore
+ {
+ }
+
+ [Fact]
+ public void DerivedCollectionsShouldWarnWhenSourceIsNotINotifyCollectionChanged()
+ {
+ (new TestLogger()).With(l =>
+ {
+ var incc = new ReactiveCollection<NoOneHasEverSeenThisClassBefore>();
+
+ Assert.True(incc is INotifyCollectionChanged);
+ var inccDerived = incc.CreateDerivedCollection(x => x);
+
+ Assert.False(l.Messages.Any(x => x.Item1.Contains("INotifyCollectionChanged")));
+
+ // Reset
+ l.Messages.Clear();
+
+ var nonIncc = new List<NoOneHasEverSeenThisClassBefore>();
+
+ Assert.False(nonIncc is INotifyCollectionChanged);
+ var nonInccderived = nonIncc.CreateDerivedCollection(x => x);
+
+ Assert.Equal(1, l.Messages.Count);
+
+ var m = l.Messages.Last();
+ var message = m.Item1;
+ var level = m.Item2;
+
+ Assert.Contains("INotifyCollectionChanged", message);
+ Assert.Equal(LogLevel.Warn, level);
+ });
+ }
+ }
+
public class DerivedPropertyChanges
{
private class ReactiveVisibilityItem<T> : ReactiveObject
@@ -666,8 +775,10 @@ public void DerivedCollectionShouldHandleRemovesOfFilteredItems()
var a = new ReactiveVisibilityItem<string>("A", true);
var b = new ReactiveVisibilityItem<string>("B", true);
var c = new ReactiveVisibilityItem<string>("C", true);
+ var d = new ReactiveVisibilityItem<string>("D", false);
+ var e = new ReactiveVisibilityItem<string>("E", true);
- var items = new ReactiveCollection<ReactiveVisibilityItem<string>>(new[] { a, b, c }) {
+ var items = new ReactiveCollection<ReactiveVisibilityItem<string>>(new[] { a, b, c, d, e }) {
ChangeTrackingEnabled = true
};
@@ -677,20 +788,27 @@ public void DerivedCollectionShouldHandleRemovesOfFilteredItems()
OrderedComparer<string>.OrderByDescending(x => x).Compare
);
- Assert.True(onlyVisible.SequenceEqual(new[] { "C", "B", "A" }, StringComparer.Ordinal));
- Assert.Equal(3, onlyVisible.Count);
+ Assert.True(onlyVisible.SequenceEqual(new[] { "E", "C", "B", "A" }, StringComparer.Ordinal));
+ Assert.Equal(4, onlyVisible.Count);
+
+ // Removal of an item from the source collection that's filtered in the derived collection should
+ // have no effect on the derived.
+ items.Remove(d);
+
+ Assert.True(onlyVisible.SequenceEqual(new[] { "E", "C", "B", "A" }, StringComparer.Ordinal));
+ Assert.Equal(4, onlyVisible.Count);
c.IsVisible = false;
- Assert.Equal(2, onlyVisible.Count);
- Assert.True(onlyVisible.SequenceEqual(new[] { "B", "A" }, StringComparer.Ordinal));
+ Assert.Equal(3, onlyVisible.Count);
+ Assert.True(onlyVisible.SequenceEqual(new[] { "E", "B", "A" }, StringComparer.Ordinal));
items.Remove(c);
- Assert.Equal(2, onlyVisible.Count);
- Assert.True(onlyVisible.SequenceEqual(new[] { "B", "A" }, StringComparer.Ordinal));
+ Assert.Equal(3, onlyVisible.Count);
+ Assert.True(onlyVisible.SequenceEqual(new[] { "E", "B", "A" }, StringComparer.Ordinal));
items.Remove(b);
- Assert.Equal(1, onlyVisible.Count);
- Assert.True(onlyVisible.SequenceEqual(new[] { "A" }, StringComparer.Ordinal));
+ Assert.Equal(2, onlyVisible.Count);
+ Assert.True(onlyVisible.SequenceEqual(new[] { "E", "A" }, StringComparer.Ordinal));
}
}
View
14 ReactiveUI.Tests/ReactiveCommandTest.cs
@@ -344,13 +344,13 @@ public void MultipleResultsFromObservableShouldntDecrementRefcountBelowZero()
[Fact]
public void RAFShouldActuallyRunOnTheTaskpool()
{
- var deferred = RxApp.DeferredScheduler;
+ var deferred = RxApp.MainThreadScheduler;
var taskpool = RxApp.TaskpoolScheduler;
try {
var testDeferred = new CountingTestScheduler(Scheduler.Immediate);
var testTaskpool = new CountingTestScheduler(Scheduler.NewThread);
- RxApp.DeferredScheduler = testDeferred;
+ RxApp.MainThreadScheduler = testDeferred;
RxApp.TaskpoolScheduler = testTaskpool;
var fixture = new ReactiveAsyncCommand();
@@ -365,21 +365,21 @@ public void RAFShouldActuallyRunOnTheTaskpool()
Assert.True(testDeferred.ScheduledItems.Count >= 1);
Assert.True(testTaskpool.ScheduledItems.Count >= 1);
} finally {
- RxApp.DeferredScheduler = deferred;
+ RxApp.MainThreadScheduler = deferred;
RxApp.TaskpoolScheduler = taskpool;
}
}
[Fact]
public void RAOShouldActuallyRunOnTheTaskpool()
{
- var deferred = RxApp.DeferredScheduler;
+ var deferred = RxApp.MainThreadScheduler;
var taskpool = RxApp.TaskpoolScheduler;
try {
var testDeferred = new CountingTestScheduler(Scheduler.Immediate);
var testTaskpool = new CountingTestScheduler(Scheduler.NewThread);
- RxApp.DeferredScheduler = testDeferred;
+ RxApp.MainThreadScheduler = testDeferred;
RxApp.TaskpoolScheduler = testTaskpool;
var fixture = new ReactiveAsyncCommand();
@@ -392,7 +392,7 @@ public void RAOShouldActuallyRunOnTheTaskpool()
Assert.True(testDeferred.ScheduledItems.Count >= 1);
Assert.True(testTaskpool.ScheduledItems.Count >= 1);
} finally {
- RxApp.DeferredScheduler = deferred;
+ RxApp.MainThreadScheduler = deferred;
RxApp.TaskpoolScheduler = taskpool;
}
}
@@ -415,7 +415,7 @@ public void CanExecuteShouldChangeOnInflightOp()
bool latestCanExecute = false;
fixture.RegisterAsyncObservable(x =>
- Observable.Return((int)x*5).Delay(TimeSpan.FromMilliseconds(900), RxApp.DeferredScheduler))
+ Observable.Return((int)x*5).Delay(TimeSpan.FromMilliseconds(900), RxApp.MainThreadScheduler))
.Subscribe(x => calculatedResult = x);
fixture.CanExecuteObservable.Subscribe(x => latestCanExecute = x);
View
3 ReactiveUI.Tests/ReactiveUI.Tests_Net45.csproj
@@ -136,6 +136,7 @@
<Compile Include="RxAppTest.cs" />
<Compile Include="RxRouting.cs" />
<Compile Include="RxUIViewModelGeneratorTest.cs" />
+ <Compile Include="TestLogger.cs" />
<Compile Include="Utility.cs" />
</ItemGroup>
<ItemGroup>
@@ -183,4 +184,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
6 ReactiveUI.Tests/RxAppTest.cs
@@ -20,10 +20,10 @@ public void DepPropNotifierShouldBeFound()
#endif
[Fact]
- public void SchedulerShouldBeImmediateInTestRunner()
+ public void SchedulerShouldBeCurrentThreadInTestRunner()
{
- Console.WriteLine(RxApp.DeferredScheduler.GetType().FullName);
- Assert.Equal(Scheduler.Immediate, RxApp.DeferredScheduler);
+ Console.WriteLine(RxApp.MainThreadScheduler.GetType().FullName);
+ Assert.Equal(CurrentThreadScheduler.Instance, RxApp.MainThreadScheduler);
}
}
}
View
40 ReactiveUI.Tests/TestLogger.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ReactiveUI.Tests
+{
+ public class TestLogger: IRxUILogger
+ {
+ public List<Tuple<string, LogLevel>> Messages { get; private set; }
+ public LogLevel Level { get; set; }
+
+ public TestLogger()
+ {
+ Messages = new List<Tuple<string, LogLevel>>();
+ Level = LogLevel.Debug;
+ }
+
+ public void Write(string message, LogLevel logLevel)
+ {
+ this.Messages.Add(Tuple.Create(message, logLevel));
+ }
+
+ public void With(Action<TestLogger> action)
+ {
+ var originalFactory = RxApp.LoggerFactory;
+ RxApp.LoggerFactory = x => this;
+
+ try
+ {
+ action(this);
+ }
+ finally
+ {
+ RxApp.LoggerFactory = originalFactory;
+ }
+ }
+ }
+}
View
598 ReactiveUI.sln
@@ -9,6 +9,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Xaml_WP8", "ReactiveUI.Platforms\ReactiveUI.Xaml_WP8.csproj", "{F9459904-F785-4255-866A-A619787CB895}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Xaml_WinRT", "ReactiveUI.Platforms\ReactiveUI.Xaml_WinRT.csproj", "{689EC7C5-2D81-4124-929E-397B330CC358}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Xaml_Net45", "ReactiveUI.Platforms\ReactiveUI.Xaml_Net45.csproj", "{1CE2D235-8072-4649-BA5A-CFB1AF8776E0}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing_WP8", "ReactiveUI.Testing\ReactiveUI.Testing_WP8.csproj", "{987AD32C-C854-4350-B427-059924717484}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing_Net45", "ReactiveUI.Testing\ReactiveUI.Testing_Net45.csproj", "{DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}"
@@ -39,47 +45,221 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Events_WP8", "Re
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RxUIViewModelGenerator", "RxUIViewModelGenerator\RxUIViewModelGenerator.csproj", "{EE7D7FD6-4475-4D1F-A000-9D684F8EC3C7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Xaml_Net45", "ReactiveUI.Platforms\ReactiveUI.Xaml_Net45.csproj", "{1CE2D235-8072-4649-BA5A-CFB1AF8776E0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Xaml_WinRT", "ReactiveUI.Platforms\ReactiveUI.Xaml_WinRT.csproj", "{689EC7C5-2D81-4124-929E-397B330CC358}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Xaml_WP8", "ReactiveUI.Platforms\ReactiveUI.Xaml_WP8.csproj", "{F9459904-F785-4255-866A-A619787CB895}"
-EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = ReactiveUI.vsmdi
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
+ Ad-Hoc|ARM = Ad-Hoc|ARM
+ Ad-Hoc|iPhone = Ad-Hoc|iPhone
+ Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+ Ad-Hoc|Mixed Platforms = Ad-Hoc|Mixed Platforms
+ Ad-Hoc|x64 = Ad-Hoc|x64
+ Ad-Hoc|x86 = Ad-Hoc|x86
+ AppStore|Any CPU = AppStore|Any CPU
+ AppStore|ARM = AppStore|ARM
+ AppStore|iPhone = AppStore|iPhone
+ AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+ AppStore|Mixed Platforms = AppStore|Mixed Platforms
+ AppStore|x64 = AppStore|x64
+ AppStore|x86 = AppStore|x86
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
+ Debug|iPhone = Debug|iPhone
+ Debug|iPhoneSimulator = Debug|iPhoneSimulator
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
+ Release|iPhone = Release|iPhone
+ Release|iPhoneSimulator = Release|iPhoneSimulator
Release|Mixed Platforms = Release|Mixed Platforms
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.AppStore|Any CPU.Build.0 = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.AppStore|ARM.ActiveCfg = Release|Any CPU
+ {6FBDE6EA-2202-4A70-8EE4-7BA6D515952E}.AppStore|iPhone.ActiveCfg = Release|Any CPU