Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #217 from reactiveui/portable

Move to Portable Libraries
  • Loading branch information...
commit d07b3fc80bf49781867b0db4d6b2221f53ddeda0 2 parents 95257a2 + 032883f
Paul Betts authored
Showing with 14,837 additions and 3,906 deletions.
  1. +4 −4 MakeRelease.ps1
  2. +1 −1  MobileSample-WP8/MainPage.xaml
  3. +4 −7 MobileSample-WP8/MobileSample-WP8.csproj
  4. +2 −0  MobileSample-WP8/packages.config
  5. +8 −7 MobileSample-WinRT/MobileSample-WinRT.csproj
  6. +5 −0 MobileSample-WinRT/packages.config
  7. 0  NuGet/ReactiveUI-Core/lib/{Net40 → Portable-Net45+WinRT45+WP8}/ReactiveUI.dll
  8. 0  NuGet/ReactiveUI-Core/lib/{Net40 → Portable-Net45+WinRT45+WP8}/ReactiveUI.pdb
  9. 0  NuGet/ReactiveUI-Core/lib/{Net40 → Portable-Net45+WinRT45+WP8}/ReactiveUI.xml
  10. 0  NuGet/ReactiveUI-Core/lib/SL4-WindowsPhone71/ReactiveUI_WP7.dll
  11. 0  NuGet/ReactiveUI-Core/lib/SL4-WindowsPhone71/ReactiveUI_WP7.pdb
  12. 0  NuGet/ReactiveUI-Core/lib/SL4-WindowsPhone71/ReactiveUI_WP7.xml
  13. 0  NuGet/ReactiveUI-Core/lib/SL5/ReactiveUI_SL5.dll
  14. 0  NuGet/ReactiveUI-Core/lib/SL5/ReactiveUI_SL5.pdb
  15. 0  NuGet/ReactiveUI-Core/lib/SL5/ReactiveUI_SL5.xml
  16. 0  NuGet/ReactiveUI-Core/lib/WP8/ReactiveUI_WP8.dll
  17. 0  NuGet/ReactiveUI-Core/lib/WP8/ReactiveUI_WP8.pdb
  18. 0  NuGet/ReactiveUI-Core/lib/WP8/ReactiveUI_WP8.xml
  19. 0  NuGet/ReactiveUI-Core/lib/WinRT45/ReactiveUI_WinRT.dll
  20. 0  NuGet/ReactiveUI-Core/lib/WinRT45/ReactiveUI_WinRT.pdb
  21. 0  NuGet/ReactiveUI-Core/lib/WinRT45/ReactiveUI_WinRT.xml
  22. 0  NuGet/ReactiveUI-Core/lib/net45/ReactiveUI_Net45.dll
  23. 0  NuGet/ReactiveUI-Core/lib/net45/ReactiveUI_Net45.pdb
  24. 0  NuGet/ReactiveUI-Core/lib/net45/ReactiveUI_Net45.xml
  25. 0  NuGet/ReactiveUI-NLog/lib/net40/ReactiveUI.NLog.dll
  26. 0  NuGet/ReactiveUI-NLog/lib/net40/ReactiveUI.NLog.pdb
  27. 0  NuGet/ReactiveUI-NLog/lib/net40/ReactiveUI.NLog.xml
  28. 0  NuGet/ReactiveUI-NLog/lib/sl4-windowsphone71/ReactiveUI.NLog_WP7.dll
  29. 0  NuGet/ReactiveUI-NLog/lib/sl4-windowsphone71/ReactiveUI.NLog_WP7.pdb
  30. 0  NuGet/ReactiveUI-NLog/lib/sl4-windowsphone71/ReactiveUI.NLog_WP7.xml
  31. 0  NuGet/ReactiveUI-NLog/lib/sl5/ReactiveUI.NLog_SL5.dll
  32. 0  NuGet/ReactiveUI-NLog/lib/sl5/ReactiveUI.NLog_SL5.pdb
  33. 0  NuGet/ReactiveUI-NLog/lib/sl5/ReactiveUI.NLog_SL5.xml
  34. 0  NuGet/ReactiveUI-Testing/lib/Net40/ReactiveUI.Testing.dll
  35. 0  NuGet/ReactiveUI-Testing/lib/Net40/ReactiveUI.Testing.pdb
  36. 0  NuGet/ReactiveUI-Testing/lib/Net40/ReactiveUI.Testing.xml
  37. 0  NuGet/ReactiveUI-Testing/lib/SL4-WindowsPhone71/ReactiveUI.Testing_WP7.dll
  38. 0  NuGet/ReactiveUI-Testing/lib/SL4-WindowsPhone71/ReactiveUI.Testing_WP7.pdb
  39. 0  NuGet/ReactiveUI-Testing/lib/SL4-WindowsPhone71/ReactiveUI.Testing_WP7.xml
  40. 0  NuGet/ReactiveUI-Testing/lib/SL5/ReactiveUI.Testing_SL5.dll
  41. 0  NuGet/ReactiveUI-Testing/lib/SL5/ReactiveUI.Testing_SL5.pdb
  42. 0  NuGet/ReactiveUI-Testing/lib/SL5/ReactiveUI.Testing_SL5.xml
  43. +0 −19 NuGet/ReactiveUI-WinRT/ReactiveUI-WinRT.nuspec
  44. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Blend.dll
  45. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Blend.pdb
  46. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Blend.xml
  47. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Routing.XML
  48. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Routing.dll
  49. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Routing.pdb
  50. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Xaml.dll
  51. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Xaml.pdb
  52. 0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Xaml.xml
  53. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.dll
  54. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.dll.config
  55. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.pdb
  56. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.xml
  57. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Routing_WP7.dll
  58. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Routing_WP7.pdb
  59. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Routing_WP7.xml
  60. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Xaml_WP7.dll
  61. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Xaml_WP7.pdb
  62. 0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Xaml_WP7.xml
  63. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Blend_SL5.dll
  64. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Blend_SL5.pdb
  65. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Blend_SL5.xml
  66. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Routing_SL5.dll
  67. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Routing_SL5.pdb
  68. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Routing_SL5.xml
  69. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Xaml_SL5.dll
  70. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Xaml_SL5.pdb
  71. 0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Xaml_SL5.xml
  72. 0  NuGet/ReactiveUI-Xaml/lib/WP8/ReactiveUI.Routing_WP8.dll
  73. 0  NuGet/ReactiveUI-Xaml/lib/WP8/ReactiveUI.Routing_WP8.pdb
  74. 0  NuGet/ReactiveUI-Xaml/lib/WP8/ReactiveUI.Routing_WP8.xml
  75. 0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.dll
  76. 0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.pdb
  77. 0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.pri
  78. 0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.xml
  79. 0  NuGet/ReactiveUI-Xaml/lib/net45/ReactiveUI.Routing_Net45.XML
  80. 0  NuGet/ReactiveUI-Xaml/lib/net45/ReactiveUI.Routing_Net45.dll
  81. 0  NuGet/ReactiveUI-Xaml/lib/net45/ReactiveUI.Routing_Net45.pdb
  82. 0  NuGet/ReactiveUI-Xaml/src/ReactiveUI.Routing/.keepme
  83. +7 −7 ReactiveUI.Blend/{ReactiveUI.Blend.csproj → ReactiveUI.Blend_Net40.csproj}
  84. +7 −7 ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj
  85. +0 −123 ReactiveUI.Blend/ReactiveUI.Blend_SL5.csproj
  86. +0 −124 ReactiveUI.Blend/ReactiveUI.Blend_WP7.csproj
  87. +5 −11 ReactiveUI.Blend/ReactiveUI.Blend_WP8.csproj
  88. +6 −0 ReactiveUI.Blend/packages.config
  89. +4 −11 ReactiveUI.Mobile/ReactiveUI.Mobile_WP8.csproj
  90. +3 −7 ReactiveUI.Mobile/ReactiveUI.Mobile_WinRT.csproj
  91. +6 −0 ReactiveUI.Mobile/packages.config
  92. +4 −4 ReactiveUI.NLog/{ReactiveUI.NLog.csproj → ReactiveUI.NLog_Net40.csproj}
  93. +4 −3 ReactiveUI.NLog/ReactiveUI.NLog_Net45.csproj
  94. +0 −115 ReactiveUI.NLog/ReactiveUI.NLog_SL5.csproj
  95. +0 −138 ReactiveUI.NLog/ReactiveUI.NLog_WP7.csproj
  96. +6 −6 ReactiveUI.NLog/ReactiveUI.NLog_WP8.csproj
  97. +1 −1  ReactiveUI.NLog/packages.config
  98. +0 −90 ReactiveUI.Routing/Interfaces.cs
  99. +6 −6 ReactiveUI.Routing/{ReactiveUI.Routing.csproj → ReactiveUI.Routing_Net40.csproj}
  100. +4 −17 ReactiveUI.Routing/ReactiveUI.Routing_Net45.csproj
  101. +0 −126 ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj
  102. +0 −147 ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj
  103. +3 −10 ReactiveUI.Routing/ReactiveUI.Routing_WP8.csproj
  104. +3 −11 ReactiveUI.Routing/ReactiveUI.Routing_WinRT.csproj
  105. +0 −18 ReactiveUI.Routing/ServiceLocationRegistration.cs
  106. +6 −0 ReactiveUI.Routing/packages.config
  107. +5 −5 ReactiveUI.Testing/{ReactiveUI.Testing.csproj → ReactiveUI.Testing_Net40.csproj}
  108. +8 −4 ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj
  109. +0 −123 ReactiveUI.Testing/ReactiveUI.Testing_SL5.csproj
  110. +0 −127 ReactiveUI.Testing/ReactiveUI.Testing_WP7.csproj
  111. +3 −3 ReactiveUI.Testing/ReactiveUI.Testing_WP8.csproj
  112. +6 −0 ReactiveUI.Testing/packages.config
  113. +2 −2 ReactiveUI.Tests/CommandBindingTests.cs
  114. +7 −7 ReactiveUI.Tests/PropertyBindingTest.cs
  115. +14 −15 ReactiveUI.Tests/ReactiveCollectionTest.cs
  116. +6 −6 ReactiveUI.Tests/ReactiveNotifyPropertyChangedMixinTest.cs
  117. +4 −4 ReactiveUI.Tests/ReactiveObjectTest.cs
  118. +5 −11 ReactiveUI.Tests/{ReactiveUI.Tests.csproj → ReactiveUI.Tests_Net45.csproj}
  119. +0 −201 ReactiveUI.Tests/ReactiveUI.Tests_SL5.csproj
  120. +15 −9 ReactiveUI.Tests/ReactiveValidatedObjectTest.cs
  121. +1 −1  ReactiveUI.Tests/RoutingState.cs
  122. +3 −41 ReactiveUI.Tests/RxAppTest.cs
  123. 0  {ReactiveUI.Routing → ReactiveUI.Xaml}/AutoDataTemplateBindingHook.cs
  124. +0 −53 ReactiveUI.Xaml/CreatesCommandBinding.cs
  125. +1 −1  ReactiveUI.Xaml/Errors.cs
  126. +43 −0 ReactiveUI.Xaml/Extensions/ReactiveValidatedObjectExtensions.cs
  127. +0 −71 ReactiveUI.Xaml/Interfaces.cs
  128. +1 −2  ReactiveUI.Xaml/Properties/AssemblyInfo.cs
  129. +14 −7 ReactiveUI.Xaml/{ReactiveUI.Xaml.csproj → ReactiveUI.Xaml_Net40.csproj}
  130. +12 −8 ReactiveUI.Xaml/ReactiveUI.Xaml_Net45.csproj
  131. +0 −132 ReactiveUI.Xaml/ReactiveUI.Xaml_SL5.csproj
  132. +0 −153 ReactiveUI.Xaml/ReactiveUI.Xaml_WP7.csproj
  133. +9 −11 ReactiveUI.Xaml/ReactiveUI.Xaml_WP8.csproj
  134. +10 −11 ReactiveUI.Xaml/ReactiveUI.Xaml_WinRT.csproj
  135. 0  {ReactiveUI.Routing → ReactiveUI.Xaml}/RoutedViewHost.cs
  136. +3 −1 ReactiveUI.Xaml/ServiceLocationRegistration.cs
  137. 0  ReactiveUI.Routing/WinRTShims.cs → ReactiveUI.Xaml/TransitioningContentControl.WinRT.cs
  138. 0  {ReactiveUI.Routing → ReactiveUI.Xaml}/ViewModelViewHost.cs
  139. +6 −0 ReactiveUI.Xaml/packages.config
  140. +17 −409 ReactiveUI.sln
  141. +1 −1  ReactiveUI/BindingTypeConverters.cs
  142. 0  {ReactiveUI.Xaml → ReactiveUI}/CommandBinding.cs
  143. +121 −0 ReactiveUI/CommandInterfaces.cs
  144. +0 −13 ReactiveUI/CompatMixins.cs
  145. +4 −21 ReactiveUI/ContractStubs.cs
  146. +50 −0 ReactiveUI/DesignModeDetector.cs
  147. +74 −1 ReactiveUI/Interfaces.cs
  148. +41 −0 ReactiveUI/Lazy.cs
  149. +0 −8 ReactiveUI/MakeObjectReactiveHelper.cs
  150. +16 −0 ReactiveUI/NullDefaultPropertyBindingProvider.cs
  151. +2 −12 ReactiveUI/ObservableAsPropertyHelper.cs
  152. +0 −4 ReactiveUI/ObservableAsyncMRUCache.cs
  153. +4 −7 ReactiveUI/Properties/AssemblyInfo.cs
  154. 0  {ReactiveUI.Xaml → ReactiveUI}/ReactiveAsyncCommand.cs
  155. +0 −3  ReactiveUI/ReactiveCollection.cs
  156. +7 −7 ReactiveUI/ReactiveCollectionMixins.cs
  157. 0  {ReactiveUI.Xaml → ReactiveUI}/ReactiveCommand.cs
  158. +12 −165 ReactiveUI/ReactiveObject.cs
  159. +51 −121 ReactiveUI/ReactiveUI.csproj
  160. +84 −72 ReactiveUI/{ReactiveUI_WP7.csproj → ReactiveUI_Net40.csproj}
  161. +2 −4 ReactiveUI/ReactiveUI_Net45.csproj
  162. +0 −170 ReactiveUI/ReactiveUI_SL5.csproj
  163. +2 −0  ReactiveUI/ReactiveUI_WP8.csproj
  164. +2 −0  ReactiveUI/ReactiveUI_WinRT.csproj
  165. +245 −0 ReactiveUI/ReactiveValidatedObject.cs
  166. +2 −64 ReactiveUI/Reflection.cs
  167. +1 −3 {ReactiveUI.Routing → ReactiveUI}/RoutingState.cs
  168. +13 −161 ReactiveUI/RxApp.cs
  169. 0  {ReactiveUI.Routing → ReactiveUI}/RxRouting.cs
  170. +1 −28 ReactiveUI/ThreadLocal.cs
  171. +30 −0 ReactiveUI/UnitTestDetector.cs
  172. +0 −285 ReactiveUI/Validation.cs
  173. +0 −210 ReactiveUI/VariadicTemplates_WP7.cs
  174. +0 −107 ReactiveUI/VariadicTemplates_WP7.tt
  175. +1 −1  {ReactiveUI.Xaml → ReactiveUI}/WaitForDispatcherScheduler.cs
  176. +2 −0  ReactiveUI/packages.config
  177. +2,873 −0 ext/Portable-Net45+WinRT45+WP8/System.Reactive.Core.XML
  178. BIN  ext/Portable-Net45+WinRT45+WP8/System.Reactive.Core.dll
  179. +336 −0 ext/Portable-Net45+WinRT45+WP8/System.Reactive.Interfaces.XML
  180. BIN  ext/Portable-Net45+WinRT45+WP8/System.Reactive.Interfaces.dll
  181. +10,565 −0 ext/Portable-Net45+WinRT45+WP8/System.Reactive.Linq.XML
  182. BIN  ext/Portable-Net45+WinRT45+WP8/System.Reactive.Linq.dll
  183. +1 −0  packages/repositories.config
View
8 MakeRelease.ps1
@@ -1,5 +1,5 @@
-$Archs = {"Net40", "Net45", "SL5", "SL4-WindowsPhone71", "WP8", "WinRT45", "Mono", "Monodroid", "Monotouch"}
-$Projects = {"ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Xaml", "ReactiveUI.Routing", "ReactiveUI.Blend", "ReactiveUI.Cocoa", "ReactiveUI.Gtk", "ReactiveUI.Android", "ReactiveUI.NLog", "ReactiveUI.Mobile"}
+$Archs = {"Portable-Net45+WinRT45+WP8", "Net45", "WP8", "WinRT45", "Mono", "Monodroid", "Monotouch"}
+$Projects = {"ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Xaml", "ReactiveUI.Blend", "ReactiveUI.Cocoa", "ReactiveUI.Gtk", "ReactiveUI.Android", "ReactiveUI.NLog", "ReactiveUI.Mobile"}
$SlnFileExists = Test-Path ".\ReactiveUI.sln"
if ($SlnFileExists -eq $False) {
@@ -65,11 +65,11 @@ foreach ($dir in $srcDirs) {
robocopy ".\$projFolderName\" "$($dir.FullName)" *.cs /S
}
-$stubs = ls -r -file .\NuGet-Release | ?{$_.Length -eq 0}
+$stubs = ls -r -file .\NuGet-Release | ?{$_.Length -eq 0} | ?{!$_.FullName.Contains("src")}
if ($stubs.Length -gt 0) {
echo "*** BUILD FAILED ***"
echo ""
- echo "*** There are still stubs in the NuGet output, did you fully build? (Hint: Check Silverlight) ***"
+ echo "*** There are still stubs in the NuGet output, did you fully build? ***"
#exit 1
}
View
2  MobileSample-WP8/MainPage.xaml
@@ -6,7 +6,7 @@
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:routing="clr-namespace:ReactiveUI.Routing;assembly=ReactiveUI.Routing_WP8"
+ xmlns:routing="clr-namespace:ReactiveUI.Routing;assembly=ReactiveUI.Xaml_WP8"
mc:Ignorable="d"
FontFamily="{StaticResource PhoneFontFamilyNormal}"
FontSize="{StaticResource PhoneFontSizeNormal}"
View
11 MobileSample-WP8/MobileSample-WP8.csproj
@@ -169,17 +169,13 @@
<Project>{B90F3D02-1E3A-4DD7-8E00-30F28B6DCC1E}</Project>
<Name>ReactiveUI.Mobile_WP8</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WP8.csproj">
- <Project>{9F70B056-893E-487D-8DD1-C012C4440618}</Project>
- <Name>ReactiveUI.Routing_WP8</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
<Project>{F9459904-F785-4255-866A-A619787CB895}</Project>
<Name>ReactiveUI.Xaml_WP8</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
- <Project>{884D2D0B-65CE-40CB-AE45-B1F45C4ECE76}</Project>
- <Name>ReactiveUI_WP8</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -231,4 +227,5 @@
-->
<ProjectExtensions />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
</Project>
View
2  MobileSample-WP8/packages.config
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="wp80" />
<package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="wp80" />
+ <package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="wp80" />
</packages>
View
15 MobileSample-WinRT/MobileSample-WinRT.csproj
@@ -13,6 +13,8 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>MobileSample-WinRT_TemporaryKey.pfx</PackageCertificateKeyFile>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -136,6 +138,7 @@
</AppxManifest>
<None Include="Common\ReadMe.txt" />
<None Include="MobileSample-WinRT_TemporaryKey.pfx" />
+ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\Logo.png" />
@@ -177,17 +180,13 @@
<Project>{30540f2b-0f4c-40a0-b3b6-ffddfa09d8fd}</Project>
<Name>ReactiveUI.Mobile_WinRT</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WinRT.csproj">
- <Project>{b73da536-0ad8-40a1-a2a7-f8491ce584f6}</Project>
- <Name>ReactiveUI.Routing_WinRT</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WinRT.csproj">
<Project>{689ec7c5-2d81-4124-929e-397b330cc358}</Project>
<Name>ReactiveUI.Xaml_WinRT</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WinRT.csproj">
- <Project>{3db4ef6f-ccbc-4115-9c33-20e52a024534}</Project>
- <Name>ReactiveUI_WinRT</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -226,6 +225,8 @@
<VisualStudioVersion>11.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.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">
View
5 MobileSample-WinRT/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="win" />
+ <package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="win" />
+</packages>
View
0  NuGet/ReactiveUI-Core/lib/Net40/ReactiveUI.dll → ...ore/lib/Portable-Net45+WinRT45+WP8/ReactiveUI.dll
File renamed without changes
View
0  NuGet/ReactiveUI-Core/lib/Net40/ReactiveUI.pdb → ...ore/lib/Portable-Net45+WinRT45+WP8/ReactiveUI.pdb
File renamed without changes
View
0  NuGet/ReactiveUI-Core/lib/Net40/ReactiveUI.xml → ...ore/lib/Portable-Net45+WinRT45+WP8/ReactiveUI.xml
File renamed without changes
View
0  NuGet/ReactiveUI-Core/lib/SL4-WindowsPhone71/ReactiveUI_WP7.dll
No changes.
View
0  NuGet/ReactiveUI-Core/lib/SL4-WindowsPhone71/ReactiveUI_WP7.pdb
No changes.
View
0  NuGet/ReactiveUI-Core/lib/SL4-WindowsPhone71/ReactiveUI_WP7.xml
No changes.
View
0  NuGet/ReactiveUI-Core/lib/SL5/ReactiveUI_SL5.dll
No changes.
View
0  NuGet/ReactiveUI-Core/lib/SL5/ReactiveUI_SL5.pdb
No changes.
View
0  NuGet/ReactiveUI-Core/lib/SL5/ReactiveUI_SL5.xml
No changes.
View
0  NuGet/ReactiveUI-Core/lib/WP8/ReactiveUI_WP8.dll
No changes.
View
0  NuGet/ReactiveUI-Core/lib/WP8/ReactiveUI_WP8.pdb
No changes.
View
0  NuGet/ReactiveUI-Core/lib/WP8/ReactiveUI_WP8.xml
No changes.
View
0  NuGet/ReactiveUI-Core/lib/WinRT45/ReactiveUI_WinRT.dll
No changes.
View
0  NuGet/ReactiveUI-Core/lib/WinRT45/ReactiveUI_WinRT.pdb
No changes.
View
0  NuGet/ReactiveUI-Core/lib/WinRT45/ReactiveUI_WinRT.xml
No changes.
View
0  NuGet/ReactiveUI-Core/lib/net45/ReactiveUI_Net45.dll
No changes.
View
0  NuGet/ReactiveUI-Core/lib/net45/ReactiveUI_Net45.pdb
No changes.
View
0  NuGet/ReactiveUI-Core/lib/net45/ReactiveUI_Net45.xml
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/net40/ReactiveUI.NLog.dll
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/net40/ReactiveUI.NLog.pdb
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/net40/ReactiveUI.NLog.xml
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/sl4-windowsphone71/ReactiveUI.NLog_WP7.dll
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/sl4-windowsphone71/ReactiveUI.NLog_WP7.pdb
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/sl4-windowsphone71/ReactiveUI.NLog_WP7.xml
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/sl5/ReactiveUI.NLog_SL5.dll
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/sl5/ReactiveUI.NLog_SL5.pdb
No changes.
View
0  NuGet/ReactiveUI-NLog/lib/sl5/ReactiveUI.NLog_SL5.xml
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/Net40/ReactiveUI.Testing.dll
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/Net40/ReactiveUI.Testing.pdb
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/Net40/ReactiveUI.Testing.xml
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/SL4-WindowsPhone71/ReactiveUI.Testing_WP7.dll
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/SL4-WindowsPhone71/ReactiveUI.Testing_WP7.pdb
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/SL4-WindowsPhone71/ReactiveUI.Testing_WP7.xml
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/SL5/ReactiveUI.Testing_SL5.dll
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/SL5/ReactiveUI.Testing_SL5.pdb
No changes.
View
0  NuGet/ReactiveUI-Testing/lib/SL5/ReactiveUI.Testing_SL5.xml
No changes.
View
19 NuGet/ReactiveUI-WinRT/ReactiveUI-WinRT.nuspec
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
- <id>reactiveui-winrt</id>
- <version>4.5.0</version>
- <description>An MVVM library for WPF and Silverlight that is deeply integrated with the Reactive Extensions</description>
- <authors>Paul Betts</authors>
- <projectUrl>http://www.reactiveui.net</projectUrl>
- <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
- <language>en-us</language>
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
-
- <dependencies>
- <dependency id="reactiveui-core" version="[4.5.0]" />
- <dependency id="reactiveui-xaml" version="[4.5.0]" />
- <dependency id="Rx-WinRT" version="2.1.30214.0" />
- </dependencies>
- </metadata>
-</package>
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Blend.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Blend.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Blend.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Routing.XML
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Routing.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Routing.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Xaml.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Xaml.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/Net40/ReactiveUI.Xaml.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.dll.config
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Blend_WP7.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Routing_WP7.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Routing_WP7.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Routing_WP7.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Xaml_WP7.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Xaml_WP7.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL4-WindowsPhone71/ReactiveUI.Xaml_WP7.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Blend_SL5.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Blend_SL5.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Blend_SL5.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Routing_SL5.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Routing_SL5.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Routing_SL5.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Xaml_SL5.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Xaml_SL5.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/SL5/ReactiveUI.Xaml_SL5.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/WP8/ReactiveUI.Routing_WP8.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/WP8/ReactiveUI.Routing_WP8.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/WP8/ReactiveUI.Routing_WP8.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.pri
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/WinRT45/ReactiveUI.Routing_WinRT.xml
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/net45/ReactiveUI.Routing_Net45.XML
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/net45/ReactiveUI.Routing_Net45.dll
No changes.
View
0  NuGet/ReactiveUI-Xaml/lib/net45/ReactiveUI.Routing_Net45.pdb
No changes.
View
0  NuGet/ReactiveUI-Xaml/src/ReactiveUI.Routing/.keepme
No changes.
View
14 ReactiveUI.Blend/ReactiveUI.Blend.csproj → ReactiveUI.Blend/ReactiveUI.Blend_Net40.csproj
@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.Blend</RootNamespace>
- <AssemblyName>ReactiveUI.Blend</AssemblyName>
+ <AssemblyName>ReactiveUI.Blend_Net40</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
@@ -40,7 +40,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Release\Net40\ReactiveUI.Blend.xml</DocumentationFile>
+ <DocumentationFile>bin\Release\Net40\ReactiveUI.Blend_Net40.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -82,13 +82,13 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml.csproj">
+ <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Net40.csproj">
<Project>{761AC9BA-4A9C-440C-9B6C-2569978F0610}</Project>
- <Name>ReactiveUI.Xaml</Name>
+ <Name>ReactiveUI.Xaml_Net40</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net40.csproj">
<Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI</Name>
+ <Name>ReactiveUI_Net40</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -100,4 +100,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
14 ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj
@@ -83,17 +83,17 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Net45.csproj">
- <Project>{761ac9ba-4a9c-440c-9b6c-2569978f0610}</Project>
- <Name>ReactiveUI.Xaml_Net45</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
- <Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
- <Name>ReactiveUI_Net45</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.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">
View
123 ReactiveUI.Blend/ReactiveUI.Blend_SL5.csproj
@@ -1,123 +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.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{1E453720-AEE5-4B34-8660-7AD86E5E05AF}</ProjectGuid>
- <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.Blend</RootNamespace>
- <AssemblyName>ReactiveUI.Blend_SL5</AssemblyName>
- <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- <SilverlightApplication>false</SilverlightApplication>
- <ValidateXaml>true</ValidateXaml>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <!-- This property group is only here to support building this project using the
- MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
- to set the TargetFrameworkVersion to v3.5 -->
- <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
- <TargetFrameworkVersion>v3.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;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>Bin\Release\SL5\</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>Bin\Release\SL5\ReactiveUI.Blend_SL5.xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="mscorlib" />
- <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Windows.Threading.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity">
- <HintPath>C:\Program Files (x86)\Microsoft SDKs\Expression\Blend\Windows Phone\v7.1\Libraries\System.Windows.Interactivity.dll</HintPath>
- </Reference>
- <Reference Include="System.Xml" />
- <Reference Include="System.Net" />
- <Reference Include="System.Windows.Browser" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AsyncCommandVisualStateBehavior.cs" />
- <Compile Include="FollowObservableStateBehavior.cs" />
- <Compile Include="ObservableTrigger.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_SL5.csproj">
- <Project>{73804A79-A9FC-48FD-8F7C-E796415A8B3A}</Project>
- <Name>ReactiveUI.Xaml_SL5</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_SL5.csproj">
- <Project>{B3381C78-C099-4902-89D4-B879AA83BFC9}</Project>
- <Name>ReactiveUI_SL5</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
- <Import Project="$(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
124 ReactiveUI.Blend/ReactiveUI.Blend_WP7.csproj
@@ -1,124 +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.20506</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{BA2FAC3E-23EF-4067-8D73-4607E5CD169C}</ProjectGuid>
- <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.Blend</RootNamespace>
- <AssemblyName>ReactiveUI.Blend_WP7</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
- <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <SilverlightApplication>false</SilverlightApplication>
- <ValidateXaml>true</ValidateXaml>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>Bin\Debug\SL4-WindowsPhone71\</OutputPath>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WP7</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>Bin\Release\SL4-WindowsPhone71\</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT;WP7</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>Bin\Release\SL4-WindowsPhone71\ReactiveUI.Blend_WP7.xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Expression.Interactions, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="Microsoft.Threading.Tasks">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions.Phone">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.Phone.dll</HintPath>
- </Reference>
- <Reference Include="mscorlib.Extensions" />
- <Reference Include="System.Observable" />
- <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Windows.Threading.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\sl4-windowsphone71\System.Runtime.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\sl4-windowsphone71\System.Threading.Tasks.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Net" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AsyncCommandVisualStateBehavior.cs" />
- <Compile Include="FollowObservableStateBehavior.cs" />
- <Compile Include="ObservableTrigger.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP7.csproj">
- <Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
- <Name>ReactiveUI.Xaml_WP7</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP7.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP7</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="app.config" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions />
- <Import Project="$(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
16 ReactiveUI.Blend/ReactiveUI.Blend_WP8.csproj
@@ -92,17 +92,11 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
- <Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
- <Name>ReactiveUI.Xaml_WP8</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP8</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<None Include="app.config" />
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
+ </ProjectReference>
</ItemGroup>
<ProjectExtensions />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
@@ -115,4 +109,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
6 ReactiveUI.Blend/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="net45" />
+ <package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="net45" />
+ <package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net45" />
+</packages>
View
15 ReactiveUI.Mobile/ReactiveUI.Mobile_WP8.csproj
@@ -126,23 +126,16 @@
<Compile Include="WP8AutoSuspendApplication.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WP8.csproj">
- <Project>{9F70B056-893E-487D-8DD1-C012C4440618}</Project>
- <Name>ReactiveUI.Routing_WP8</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
- <Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
- <Name>ReactiveUI.Xaml_WP8</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP8</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
<ProjectExtensions />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.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">
View
10 ReactiveUI.Mobile/ReactiveUI.Mobile_WinRT.csproj
@@ -135,17 +135,13 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WinRT.csproj">
- <Project>{B73DA536-0AD8-40A1-A2A7-F8491CE584F6}</Project>
- <Name>ReactiveUI.Routing_WinRT</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WinRT.csproj">
<Project>{689ec7c5-2d81-4124-929e-397b330cc358}</Project>
<Name>ReactiveUI.Xaml_WinRT</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WinRT.csproj">
- <Project>{3db4ef6f-ccbc-4115-9c33-20e52a024534}</Project>
- <Name>ReactiveUI_WinRT</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
View
6 ReactiveUI.Mobile/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="wp80" />
+ <package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="wp80" />
+ <package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="wp80" />
+</packages>
View
8 ReactiveUI.NLog/ReactiveUI.NLog.csproj → ReactiveUI.NLog/ReactiveUI.NLog_Net40.csproj
@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.NLog</RootNamespace>
- <AssemblyName>ReactiveUI.NLog</AssemblyName>
+ <AssemblyName>ReactiveUI.NLog_Net40</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
@@ -92,7 +92,7 @@
<CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
<CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
<CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <DocumentationFile>bin\Release\Net40\ReactiveUI.NLog.xml</DocumentationFile>
+ <DocumentationFile>bin\Release\Net40\ReactiveUI.NLog_Net40.xml</DocumentationFile>
<NoWarn>1591, 1573, 1711, 1587, 1570, 1572</NoWarn>
</PropertyGroup>
<ItemGroup>
@@ -125,9 +125,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net40.csproj">
<Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI</Name>
+ <Name>ReactiveUI_Net40</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
View
7 ReactiveUI.NLog/ReactiveUI.NLog_Net45.csproj
@@ -132,13 +132,14 @@
<Compile Include="ServiceLocationRegistration.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
- <Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
- <Name>ReactiveUI_Net45</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.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">
View
115 ReactiveUI.NLog/ReactiveUI.NLog_SL5.csproj
@@ -1,115 +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.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{3A3429FB-14E1-4904-9FB1-E5AB81EB6D28}</ProjectGuid>
- <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.NLog</RootNamespace>
- <AssemblyName>ReactiveUI.NLog_SL5</AssemblyName>
- <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- <SilverlightApplication>false</SilverlightApplication>
- <ValidateXaml>true</ValidateXaml>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <!-- This property group is only here to support building this project using the
- MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
- to set the TargetFrameworkVersion to v3.5 -->
- <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
- <TargetFrameworkVersion>v3.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;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>Bin\Release\SL5\</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>Bin\Release\SL5\ReactiveUI.NLog_SL5.xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="mscorlib" />
- <Reference Include="NLog">
- <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4\NLog.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Windows" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Net" />
- <Reference Include="System.Windows.Browser" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_SL5.csproj">
- <Project>{B3381C78-C099-4902-89D4-B879AA83BFC9}</Project>
- <Name>ReactiveUI_SL5</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="NLogLogger.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
- <Import Project="$(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
138 ReactiveUI.NLog/ReactiveUI.NLog_WP7.csproj
@@ -1,138 +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.20506</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{9F347041-278A-4390-BF6C-3E12157DD084}</ProjectGuid>
- <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.NLog</RootNamespace>
- <AssemblyName>ReactiveUI.NLog_WP7</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
- <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <SilverlightApplication>false</SilverlightApplication>
- <ValidateXaml>true</ValidateXaml>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>Bin\Debug\SL4-WindowsPhone71\</OutputPath>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WP7</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeContractsEnableRuntimeChecking>True</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>False</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>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>Bin\Release\SL4-WindowsPhone71\</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT;WP7</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>Bin\Release\SL4-WindowsPhone71\ReactiveUI.NLog_WP7.xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Threading.Tasks">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions.Phone">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.Phone.dll</HintPath>
- </Reference>
- <Reference Include="mscorlib.Extensions" />
- <Reference Include="NLog">
- <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4-windowsphone71\NLog.dll</HintPath>
- </Reference>
- <Reference Include="System.Observable" />
- <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\sl4-windowsphone71\System.Runtime.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\sl4-windowsphone71\System.Threading.Tasks.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Net" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP7.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP7</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="NLogLogger.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions />
- <Import Project="$(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
12 ReactiveUI.NLog/ReactiveUI.NLog_WP8.csproj
@@ -106,16 +106,16 @@
<Reference Include="System.Net" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP8</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<Compile Include="NLogLogger.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceLocationRegistration.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
<ProjectExtensions />
View
2  ReactiveUI.NLog/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="2.0.0.2000" targetFramework="net40-Client" />
-</packages>
+</packages>
View
90 ReactiveUI.Routing/Interfaces.cs
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Subjects;
-using System.Text;
-using ReactiveUI.Xaml;
-
-namespace ReactiveUI.Routing
-{
- // NB: This is just a name we can bolt extension methods to
- public interface INavigateCommand : IReactiveCommand { }
-
- public interface IRoutingState : IReactiveNotifyPropertyChanged
- {
- /// <summary>
- /// Represents the current navigation stack, the last element in the
- /// collection being the currently visible ViewModel.
- /// </summary>
- ReactiveCollection<IRoutableViewModel> NavigationStack { get; }
-
- /// <summary>
- /// Navigates back to the previous element in the stack.
- /// </summary>
- IReactiveCommand NavigateBack { get; }
-
- /// <summary>
- /// Navigates to the a new element in the stack - the Execute parameter
- /// must be a ViewModel that implements IRoutableViewModel.
- /// </summary>
- INavigateCommand Navigate { get; }
-
- /// <summary>
- /// Navigates to a new element and resets the navigation stack (i.e. the
- /// new ViewModel will now be the only element in the stack) - the
- /// Execute parameter must be a ViewModel that implements
- /// IRoutableViewModel.
- /// </summary>
- INavigateCommand NavigateAndReset { get; }
- }
-
- /// <summary>
- /// Implement this interface for ViewModels that can be navigated to.
- /// </summary>
- public interface IRoutableViewModel : IReactiveNotifyPropertyChanged
- {
- /// <summary>
- /// A string token representing the current ViewModel, such as 'login' or 'user'
- /// </summary>
- string UrlPathSegment { get; }
-
- /// <summary>
- /// The IScreen that this ViewModel is currently being shown in. This
- /// is usually passed into the ViewModel in the Constructor and saved
- /// as a ReadOnly Property.
- /// </summary>
- IScreen HostScreen { get; }
- }
-
- /// <summary>
- /// IScreen represents any object that is hosting its own routing -
- /// usually this object is your AppViewModel or MainWindow object.
- /// </summary>
- public interface IScreen
- {
- /// <summary>
- /// The Router associated with this Screen.
- /// </summary>
- IRoutingState Router { get; }
- }
-
- /// <summary>
- /// Allows an additional string to make view resolution more specific than just a type.
- /// </summary>
- public class ViewContractAttribute : Attribute
- {
- /// <summary>
- /// A unique string that will be used along with the type to resolve a View
- /// </summary>
- public string Contract { get; set; }
- }
-
- public static class ObservableUtils
- {
- public static IConnectableObservable<T> PermaRef<T>(this IConnectableObservable<T> This)
- {
- This.Connect();
- return This;
- }
- }
-}
View
12 ReactiveUI.Routing/ReactiveUI.Routing.csproj → ReactiveUI.Routing/ReactiveUI.Routing_Net40.csproj
@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.Routing</RootNamespace>
- <AssemblyName>ReactiveUI.Routing</AssemblyName>
+ <AssemblyName>ReactiveUI.Routing_Net40</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -31,7 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Release\Net40\ReactiveUI.Routing.XML</DocumentationFile>
+ <DocumentationFile>bin\Release\Net40\ReactiveUI.Routing_Net40.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
@@ -81,13 +81,13 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml.csproj">
+ <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Net40.csproj">
<Project>{761AC9BA-4A9C-440C-9B6C-2569978F0610}</Project>
- <Name>ReactiveUI.Xaml</Name>
+ <Name>ReactiveUI.Xaml_Net40</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net40.csproj">
<Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI</Name>
+ <Name>ReactiveUI_Net40</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
View
21 ReactiveUI.Routing/ReactiveUI.Routing_Net45.csproj
@@ -68,30 +68,17 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
- <WCFMetadata Include="Service References\" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Net45.csproj">
- <Project>{761ac9ba-4a9c-440c-9b6c-2569978f0610}</Project>
- <Name>ReactiveUI.Xaml_Net45</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
- <Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
- <Name>ReactiveUI_Net45</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.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">
View
126 ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj
@@ -1,126 +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.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{2048F4B6-2063-4446-9605-A5B2BE4E9554}</ProjectGuid>
- <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.Routing</RootNamespace>
- <AssemblyName>ReactiveUI.Routing_SL5</AssemblyName>
- <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- <SilverlightApplication>false</SilverlightApplication>
- <ValidateXaml>true</ValidateXaml>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <!-- This property group is only here to support building this project using the
- MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
- to set the TargetFrameworkVersion to v3.5 -->
- <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>Bin\Debug\SL5\</OutputPath>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>Bin\Release\SL5\</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>Bin\Release\SL5\ReactiveUI.Routing_SL5.xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="mscorlib" />
- <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\SL5\System.Reactive.Windows.Threading.dll</HintPath>
- </Reference>
- <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Runtime.Serialization.Json, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Windows" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Windows.Browser" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_SL5.csproj">
- <Project>{73804a79-a9fc-48fd-8f7c-e796415a8b3a}</Project>
- <Name>ReactiveUI.Xaml_SL5</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_SL5.csproj">
- <Project>{b3381c78-c099-4902-89d4-b879aa83bfc9}</Project>
- <Name>ReactiveUI_SL5</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
- <Import Project="$(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
147 ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj
@@ -1,147 +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.20506</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{2B1F887C-E4B9-441A-8147-6A3A00C30BBA}</ProjectGuid>
- <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.Routing</RootNamespace>
- <AssemblyName>ReactiveUI.Routing_WP7</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
- <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <SilverlightApplication>false</SilverlightApplication>
- <ValidateXaml>true</ValidateXaml>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>Bin\Debug\SL4-WindowsPhone71\</OutputPath>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WP7</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeContractsEnableRuntimeChecking>True</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>False</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>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>Bin\Release\SL4-WindowsPhone71\</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT;WP7</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>Bin\Release\SL4-WindowsPhone71\ReactiveUI.Routing_WP7.xml</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Threading.Tasks">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions.Phone">
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.Phone.dll</HintPath>
- </Reference>
- <Reference Include="mscorlib.Extensions" />
- <Reference Include="System.Observable" />
- <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.PlatformServices.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP71\System.Reactive.Windows.Threading.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime">
- <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\sl4-windowsphone71\System.Runtime.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Threading.Tasks">
- <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\sl4-windowsphone71\System.Threading.Tasks.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Net" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP7.csproj">
- <Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
- <Name>ReactiveUI.Xaml_WP7</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP7.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP7</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions />
- <Import Project="$(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
13 ReactiveUI.Routing/ReactiveUI.Routing_WP8.csproj
@@ -111,23 +111,16 @@
<Reference Include="System.Net" />
</ItemGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
<Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
<Name>ReactiveUI.Xaml_WP8</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP8</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
View
14 ReactiveUI.Routing/ReactiveUI.Routing_WinRT.csproj
@@ -34,15 +34,7 @@
<DocumentationFile>bin\Release\WinRT45\ReactiveUI.Routing_WinRT.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
- <Compile Include="WinRTShims.cs" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
@@ -52,9 +44,9 @@
<Project>{689ec7c5-2d81-4124-929e-397b330cc358}</Project>
<Name>ReactiveUI.Xaml_WinRT</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WinRT.csproj">
- <Project>{3db4ef6f-ccbc-4115-9c33-20e52a024534}</Project>
- <Name>ReactiveUI_WinRT</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
View
18 ReactiveUI.Routing/ServiceLocationRegistration.cs
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ReactiveUI.Routing
-{
- public class ServiceLocationRegistration : IWantsToRegisterStuff
- {
- public void Register()
- {
-#if !MONO
- RxApp.Register(typeof(AutoDataTemplateBindingHook), typeof(IPropertyBindingHook));
-#endif
- }
- }
-}
View
6 ReactiveUI.Routing/packages.config