Permalink
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...
paulcbetts committed May 18, 2013
2 parents 5189285 + e4c8ea7 commit bf166a1405dbddba4f94048b5d0231f15506e9f7
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
@@ -24,3 +24,5 @@ version-bump.patch
ReactiveUI.Events/Events.cs
ReactiveUI.Events/Events_*.cs
+
+packages
@@ -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,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
###
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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)
@@ -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)
@@ -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>
Oops, something went wrong.

0 comments on commit bf166a1

Please sign in to comment.