Work in progress portable library.

ReactiveCommand and ReactiveAsyncCommand moved to RxUI-Core
reactiveui · Mar 21, 2013 · 5399c97 · 5399c97
1 parent 2e9205d
commit 5399c97
Show file tree

Hide file tree

Showing 48 changed files with 14,051 additions and 108 deletions.
diff --git a/MobileSample-WP8/MobileSample-WP8.csproj b/MobileSample-WP8/MobileSample-WP8.csproj
@@ -231,4 +231,5 @@
   -->
   <ProjectExtensions />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
 </Project>
diff --git a/MobileSample-WP8/packages.config b/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>
diff --git a/MobileSample-WinRT/MobileSample-WinRT.csproj b/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" />
@@ -226,6 +229,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">

diff --git a/MobileSample-WinRT/packages.config b/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>
diff --git a/ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj b/ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj
@@ -94,6 +94,7 @@
   </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">

diff --git a/ReactiveUI.Blend/packages.config b/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>
diff --git a/ReactiveUI.Mobile/ReactiveUI.Mobile_WP8.csproj b/ReactiveUI.Mobile/ReactiveUI.Mobile_WP8.csproj
@@ -143,6 +143,7 @@
   <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">

diff --git a/ReactiveUI.Mobile/packages.config b/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>
diff --git a/ReactiveUI.NLog/ReactiveUI.NLog_Net45.csproj b/ReactiveUI.NLog/ReactiveUI.NLog_Net45.csproj
@@ -139,6 +139,7 @@
   </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">

diff --git a/ReactiveUI.NLog/packages.config b/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>
diff --git a/ReactiveUI.Routing/ReactiveUI.Routing_Net45.csproj b/ReactiveUI.Routing/ReactiveUI.Routing_Net45.csproj
@@ -92,6 +92,7 @@
   </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">

diff --git a/ReactiveUI.Routing/packages.config b/ReactiveUI.Routing/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>
diff --git a/ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj b/ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj
@@ -141,6 +141,7 @@
   </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">

diff --git a/ReactiveUI.Testing/packages.config b/ReactiveUI.Testing/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>
diff --git a/ReactiveUI.Tests/ReactiveUI.Tests.csproj b/ReactiveUI.Tests/ReactiveUI.Tests.csproj
@@ -156,6 +156,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.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">

diff --git a/ReactiveUI.Tests/ReactiveUI.Tests_SL5.csproj b/ReactiveUI.Tests/ReactiveUI.Tests_SL5.csproj
@@ -117,6 +117,10 @@
     <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.ServiceModel.Web" />
+    <Reference Include="System.Threading.Tasks, Version=2.5.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\sl5\System.Threading.Tasks.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="mscorlib" />
     <Reference Include="system" />
@@ -197,4 +201,6 @@
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+</Project>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
 </Project>
diff --git a/ReactiveUI.Xaml/Interfaces.cs b/ReactiveUI.Xaml/Interfaces.cs
diff --git a/ReactiveUI.Xaml/ReactiveUI.Xaml.csproj b/ReactiveUI.Xaml/ReactiveUI.Xaml.csproj
@@ -133,10 +133,7 @@
     <Compile Include="CreatesCommandBinding.cs" />
     <Compile Include="DependencyObjectObservableForProperty.cs" />
     <Compile Include="Errors.cs" />
-    <Compile Include="Interfaces.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReactiveAsyncCommand.cs" />
-    <Compile Include="ReactiveCommand.cs" />
     <Compile Include="SampleDataBinder.cs" />
     <Compile Include="ServiceLocationRegistration.cs" />
     <Compile Include="TransitioningContentControl.cs" />

diff --git a/ReactiveUI.Xaml/ReactiveUI.Xaml_Net45.csproj b/ReactiveUI.Xaml/ReactiveUI.Xaml_Net45.csproj
@@ -135,10 +135,7 @@
     <Compile Include="CreatesCommandBinding.cs" />
     <Compile Include="DependencyObjectObservableForProperty.cs" />
     <Compile Include="Errors.cs" />
-    <Compile Include="Interfaces.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReactiveAsyncCommand.cs" />
-    <Compile Include="ReactiveCommand.cs" />
     <Compile Include="SampleDataBinder.cs" />
     <Compile Include="ServiceLocationRegistration.cs" />
     <Compile Include="TransitioningContentControl.cs" />
@@ -158,6 +155,8 @@
     </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">

diff --git a/ReactiveUI.Xaml/ReactiveUI.Xaml_SL5.csproj b/ReactiveUI.Xaml/ReactiveUI.Xaml_SL5.csproj
@@ -92,10 +92,7 @@
     <Compile Include="CreatesCommandBinding.cs" />
     <Compile Include="DependencyObjectObservableForProperty.cs" />
     <Compile Include="Errors.cs" />
-    <Compile Include="Interfaces.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReactiveAsyncCommand.cs" />
-    <Compile Include="ReactiveCommand.cs" />
     <Compile Include="SampleDataBinder.cs" />
     <Compile Include="ServiceLocationRegistration.cs" />
     <Compile Include="TransitioningContentControl.cs" />

diff --git a/ReactiveUI.Xaml/ReactiveUI.Xaml_WP7.csproj b/ReactiveUI.Xaml/ReactiveUI.Xaml_WP7.csproj
@@ -116,10 +116,7 @@
     <Compile Include="CreatesCommandBinding.cs" />
     <Compile Include="DependencyObjectObservableForProperty.cs" />
     <Compile Include="Errors.cs" />
-    <Compile Include="Interfaces.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReactiveAsyncCommand.cs" />
-    <Compile Include="ReactiveCommand.cs" />
     <Compile Include="SampleDataBinder.cs" />
     <Compile Include="ServiceLocationRegistration.cs" />
     <Compile Include="TransitioningContentControl.cs">

diff --git a/ReactiveUI.Xaml/ReactiveUI.Xaml_WP8.csproj b/ReactiveUI.Xaml/ReactiveUI.Xaml_WP8.csproj
@@ -113,10 +113,7 @@
     <Compile Include="CreatesCommandBinding.cs" />
     <Compile Include="DependencyObjectObservableForProperty.cs" />
     <Compile Include="Errors.cs" />
-    <Compile Include="Interfaces.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReactiveAsyncCommand.cs" />
-    <Compile Include="ReactiveCommand.cs" />
     <Compile Include="SampleDataBinder.cs" />
     <Compile Include="ServiceLocationRegistration.cs" />
     <Compile Include="TransitioningContentControl.cs">

diff --git a/ReactiveUI.Xaml/ReactiveUI.Xaml_WinRT.csproj b/ReactiveUI.Xaml/ReactiveUI.Xaml_WinRT.csproj
@@ -39,10 +39,7 @@
     <Compile Include="CreatesCommandBinding.cs" />
     <Compile Include="DependencyObjectObservableForProperty.cs" />
     <Compile Include="Errors.cs" />
-    <Compile Include="Interfaces.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReactiveAsyncCommand.cs" />
-    <Compile Include="ReactiveCommand.cs" />
     <Compile Include="SampleDataBinder.cs" />
     <Compile Include="ServiceLocationRegistration.cs" />
     <Compile Include="WaitForDispatcherScheduler.cs" />

diff --git a/ReactiveUI.Xaml/packages.config b/ReactiveUI.Xaml/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>
diff --git a/ReactiveUI.sln b/ReactiveUI.sln
@@ -85,6 +85,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobileSample-WP8", "MobileS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobileSample-WinRT", "MobileSample-WinRT\MobileSample-WinRT.csproj", "{E8C81219-761C-4749-B997-23E171B58D14}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_Portable", "ReactiveUI\ReactiveUI_Portable.csproj", "{464CB812-F99F-401B-BE4C-E8F0515CD19D}"
+EndProject
 Global
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = ReactiveUI.vsmdi
@@ -708,6 +710,20 @@ Global
 		{E8C81219-761C-4749-B997-23E171B58D14}.Release|x86.ActiveCfg = Release|x86
 		{E8C81219-761C-4749-B997-23E171B58D14}.Release|x86.Build.0 = Release|x86
 		{E8C81219-761C-4749-B997-23E171B58D14}.Release|x86.Deploy.0 = Release|x86
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|x64.ActiveCfg = Release|Any CPU
+		{464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ReactiveUI/BindingTypeConverters.cs b/ReactiveUI/BindingTypeConverters.cs
@@ -96,7 +96,7 @@ public bool TryConvert(object from, Type toType, object conversionHint, out obje
         }
     }
 
-#if !SILVERLIGHT && !WINRT
+#if !SILVERLIGHT && !WINRT && !PORTABLE
     public class ComponentModelTypeConverter : IBindingTypeConverter
     {
         readonly MemoizingMRUCache<Tuple<Type, Type>, TypeConverter> typeConverterCache = new MemoizingMRUCache<Tuple<Type, Type>, TypeConverter>((types, _) => {

diff --git a/ReactiveUI/ContractStubs.cs b/ReactiveUI/ContractStubs.cs
@@ -17,7 +17,7 @@ internal class Contract
 
 #endif
 
-#if IOS || WINRT
+#if IOS || WINRT || PORTABLE
 
 namespace System.ComponentModel
 {
@@ -43,7 +43,7 @@ public interface INotifyPropertyChanging
 }
 #endif
 
-#if SILVERLIGHT || WINRT
+#if SILVERLIGHT || WINRT || PORTABLE
 namespace System
 {
     [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = true)]