Merge pull request #47 from github/akavache3

Ship Akavache 3.0
reactiveui · Jul 2, 2013 · 38dc107 · 38dc107
2 parents dee87b2 + 9876d7e
commit 38dc107
Show file tree

Hide file tree

Showing 183 changed files with 17,747 additions and 22,590 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,11 +3,6 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
 
 # Standard to msysgit
 *.doc	 diff=astextplain

diff --git a/Akavache.Mobile/Akavache.Mac_Mono.csproj → Akavache.Mobile/Akavache.Mac.csproj b/Akavache.Mobile/Akavache.Mac_Mono.csproj → Akavache.Mobile/Akavache.Mac.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Akavache.Mac</RootNamespace>
-    <AssemblyName>Akavache.Mac_Mono</AssemblyName>
+    <AssemblyName>Akavache.Mac</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Akavache\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -20,15 +20,14 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\Mono\</OutputPath>
-    <DefineConstants>DEBUG;TRACE; MONO</DefineConstants>
+    <DefineConstants>DEBUG;TRACE; MONO; APPKIT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\Mono\</OutputPath>
-    <DefineConstants>TRACE; MONO</DefineConstants>
+    <DefineConstants>TRACE; MONO; APPKIT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -44,8 +43,12 @@
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\ext\mono\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="XamMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="ReactiveUI.Cocoa">
+      <HintPath>..\ext\mono\ReactiveUI.Cocoa.dll</HintPath>
     </Reference>
     <Reference Include="ReactiveUI">
       <HintPath>..\ext\mono\ReactiveUI.dll</HintPath>
@@ -62,18 +65,13 @@
     <Reference Include="System.Reactive.PlatformServices">
       <HintPath>..\ext\mono\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Windows.Threading">
-      <HintPath>..\ext\mono\System.Reactive.Windows.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="XamMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065">
-      <Private>False</Private>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\ext\mono\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="CocoaImageExtensions.cs" />
-    <Compile Include="ServiceLocationRegistration.cs" />
+    <Compile Include="MacFilesystemProvider.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
@@ -85,9 +83,13 @@
   </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\Akavache\Akavache_Mono.csproj">
+    <ProjectReference Include="..\Akavache.Portable\Akavache.Portable_MonoMac.csproj">
+      <Project>{3EF05CA8-ED19-489C-AF42-11CFB65F7AE7}</Project>
+      <Name>Akavache.Portable_MonoMac</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Akavache\Akavache_MonoMac.csproj">
       <Project>{3EF05CA8-ED19-489C-AF42-71C4B6507AE7}</Project>
-      <Name>Akavache_Mono</Name>
+      <Name>Akavache_MonoMac</Name>
     </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/Akavache.Mobile/Akavache.Mobile.nuspec b/Akavache.Mobile/Akavache.Mobile.nuspec
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <version>2.6.7</version>
+    <version>3.0.1</version>
     <authors>GitHub</authors>
     <owners>Paul Betts</owners>
     <projectUrl>https://github.com/github/Akavache</projectUrl>
     <dependencies>
-      <dependency id="akavache" version="2.6.7" />
-      <dependency id="reactiveui-mobile" version="4.4.3" />
+      <dependency id="akavache" version="[3.0.1]" />
+      <dependency id="reactiveui-mobile" version="5.0.1" />
     </dependencies>
 
     <licenseUrl>https://raw.github.com/github/Akavache/master/LICENSE</licenseUrl>
@@ -17,11 +17,14 @@
     <title>Akavache.Mobile</title>
     <description>An implementation of ISuspensionDriver that uses Akavache to save app state on tombstoning.</description>
     <summary>An implementation of ISuspensionDriver that uses Akavache to save app state on tombstoning.</summary>
-    <copyright>Copyright GitHub© 2012</copyright>
+    <copyright>Copyright GitHub© 2012</copyright>
   </metadata>
 
   <files>
-    <file src="bin\Release\WP8\Akavache.Mobile_WP8.*" target="lib\wp8" />
-    <file src="bin\Release\WinRT45\Akavache.Mobile_WinRT.*" target="lib\WinRT45" />
+    <file src="bin\Release\WP8\Akavache.Mobile.*" target="lib\wp8" />
+    <file src="bin\Release\WinRT45\Akavache.Mobile.*" target="lib\NetCore45" />
+    <file src="bin\Release\Mono\Akavache.Mobile.*" target="lib\MonoMac" />
+    <file src="bin\Release\MonoAndroid\Akavache.Mobile.*" target="lib\MonoAndroid" />
+    <file src="bin\Release\MonoTouch\Akavache.Mobile.*" target="lib\MonoTouch" />
   </files>
 </package>
diff --git a/Akavache.Mobile/Akavache.Mobile_Monodroid.csproj b/Akavache.Mobile/Akavache.Mobile_Monodroid.csproj
@@ -5,12 +5,12 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F92A477B-BB94-A3C1-084E-E177EF9FEDB7}</ProjectGuid>
+    <ProjectGuid>{192A477B-BB94-A3C1-F14E-E177EF9FEDB7}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Akavache.Mobile</RootNamespace>
-    <AssemblyName>Akavache.Mobile_Monodroid</AssemblyName>
+    <AssemblyName>Akavache.Mobile</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
@@ -27,8 +27,8 @@
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>False</Optimize>
-    <OutputPath>bin\Debug\Monodroid</OutputPath>
-    <DefineConstants>DEBUG;MONO; XAMARIN_MOBILE</DefineConstants>
+    <OutputPath>bin\Debug\Monoandroid</OutputPath>
+    <DefineConstants>DEBUG;MONO; XAMARIN_MOBILE; ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
@@ -60,10 +60,9 @@
     <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>True</Optimize>
-    <OutputPath>bin\Release\Monodroid</OutputPath>
-    <DefineConstants>MONO; XAMARIN_MOBILE</DefineConstants>
+    <OutputPath>bin\Release\Monoandroid</OutputPath>
+    <DefineConstants>MONO; XAMARIN_MOBILE;ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
@@ -89,7 +88,6 @@
     <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
     <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
     <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <GenerateDocumentation>True</GenerateDocumentation>
   </PropertyGroup>
@@ -100,7 +98,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\ext\monotouch\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\ext\monodroid\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Core">
       <HintPath>..\ext\monodroid\System.Reactive.Core.dll</HintPath>
@@ -117,9 +115,20 @@
     <Reference Include="System.Reactive.Providers">
       <HintPath>..\ext\monodroid\System.Reactive.Providers.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI_Monodroid">
-      <HintPath>..\ext\monodroid\ReactiveUI_Monodroid.dll</HintPath>
+    <Reference Include="ReactiveUI">
+      <HintPath>..\ext\monodroid\ReactiveUI.dll</HintPath>
     </Reference>
+    <Reference Include="ReactiveUI.Android">
+      <HintPath>..\ext\monodroid\ReactiveUI.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="ReactiveUI.Mobile">
+      <HintPath>..\ext\monodroid\ReactiveUI.Mobile.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Mobile">
+      <HintPath>..\ext\monodroid\Xamarin.Mobile.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android.Support.v4" />
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
@@ -136,7 +145,19 @@
   -->
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="AkavacheDriver.cs" />
-    <Compile Include="ServiceLocationRegistration.cs" />
+    <Compile Include="Registrations.cs" />
+    <Compile Include="AndroidFilesystemProvider.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Akavache.Portable\Akavache.Portable_Monodroid.csproj">
+      <Project>{F92A4778-B294-1AC1-084E-E177EF9FEDB7}</Project>
+      <Name>Akavache.Portable_Monodroid</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Akavache\Akavache_Monodroid.csproj">
+      <Project>{F92A477B-BB94-A3C1-084E-E177EF9FEDB7}</Project>
+      <Name>Akavache_Monodroid</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/Akavache.Mobile/Akavache.Mobile_Monotouch.csproj b/Akavache.Mobile/Akavache.Mobile_Monotouch.csproj
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Akavache</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>Akavache.Mobile_Monotouch</AssemblyName>
+    <AssemblyName>Akavache.Mobile</AssemblyName>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>False</Optimize>
     <OutputPath>bin\Debug\Monotouch</OutputPath>
-    <DefineConstants>DEBUG; MONO; IOS</DefineConstants>
+    <DefineConstants>DEBUG; MONO; UIKIT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
@@ -31,7 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <DefineConstants>MONO; IOS</DefineConstants>
+    <DefineConstants>MONO; UIKIT</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -42,8 +42,8 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\ext\monotouch\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI_Monotouch">
-      <HintPath>..\ext\monotouch\ReactiveUI_Monotouch.dll</HintPath>
+    <Reference Include="ReactiveUI">
+      <HintPath>..\ext\monotouch\ReactiveUI.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Core">
       <HintPath>..\ext\monotouch\System.Reactive.Core.dll</HintPath>
@@ -57,31 +57,32 @@
     <Reference Include="System.Reactive.PlatformServices">
       <HintPath>..\ext\monotouch\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI.Mobile_Monotouch">
-      <HintPath>..\ext\monotouch\ReactiveUI.Mobile_Monotouch.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.Mobile">
       <HintPath>..\ext\monotouch\Xamarin.Mobile.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI.Routing_Monotouch">
-      <HintPath>..\ext\monotouch\ReactiveUI.Routing_Monotouch.dll</HintPath>
+    <Reference Include="ReactiveUI.Cocoa">
+      <HintPath>..\ext\monotouch\ReactiveUI.Cocoa.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI.Xaml_Monotouch">
-      <HintPath>..\ext\monotouch\ReactiveUI.Xaml_Monotouch.dll</HintPath>
+    <Reference Include="ReactiveUI.Mobile">
+      <HintPath>..\ext\monotouch\ReactiveUI.Mobile.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="AkavacheDriver.cs" />
-    <Compile Include="CocoaImageExtensions.cs" />
-    <Compile Include="ServiceLocationRegistration.cs" />
+    <Compile Include="Registrations.cs" />
+    <Compile Include="MacFilesystemProvider.cs" />
   </ItemGroup>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <ItemGroup>
     <ProjectReference Include="..\Akavache\Akavache_Monotouch.csproj">
       <Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
       <Name>Akavache_Monotouch</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Akavache.Portable\Akavache.Portable_Monotouch.csproj">
+      <Project>{A091337A-FE94-0DB1-8F1E-05E1FDA78FFC}</Project>
+      <Name>Akavache.Portable_Monotouch</Name>
+    </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-</Project>
+</Project>
diff --git a/Akavache.Mobile/Akavache.Mobile_WP8.csproj b/Akavache.Mobile/Akavache.Mobile_WP8.csproj
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Akavache.Mobile</RootNamespace>
-    <AssemblyName>Akavache.Mobile_WP8</AssemblyName>
+    <AssemblyName>Akavache.Mobile</AssemblyName>
     <TargetFrameworkIdentifier>WindowsPhone</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
@@ -43,7 +43,7 @@
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Bin\Release\WP8\Akavache.Mobile_WP8.XML</DocumentationFile>
+    <DocumentationFile>Bin\Release\WP8\Akavache.Mobile.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -90,29 +90,24 @@
   <ItemGroup>
     <Compile Include="AkavacheDriver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Registrations.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\sl4-windowsphone71\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="ReactiveUI.Blend_WP8, Version=4.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\reactiveui-xaml.4.4.1\lib\WP8\ReactiveUI.Blend_WP8.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.5.0.5\lib\portable-net45+wp80+win8\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI.Mobile_WP8">
-      <HintPath>..\packages\reactiveui-mobile.4.4.1\lib\WP8\ReactiveUI.Mobile_WP8.dll</HintPath>
+    <Reference Include="ReactiveUI">
+      <HintPath>..\packages\reactiveui-core.5.0.0.20130531-alpha\lib\Portable-Net45+WinRT45+WP8\ReactiveUI.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI.Routing_WP8, Version=4.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\reactiveui-xaml.4.4.1\lib\WP8\ReactiveUI.Routing_WP8.dll</HintPath>
+    <Reference Include="ReactiveUI.Blend">
+      <HintPath>..\packages\reactiveui-platforms.5.0.0.20130531-alpha\lib\WP8\ReactiveUI.Blend.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI.Xaml_WP8, Version=4.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\reactiveui-xaml.4.4.1\lib\WP8\ReactiveUI.Xaml_WP8.dll</HintPath>
+    <Reference Include="ReactiveUI.Mobile">
+      <HintPath>..\packages\reactiveui-mobile.5.0.0.20130531-alpha\lib\WP8\ReactiveUI.Mobile.dll</HintPath>
     </Reference>
-    <Reference Include="ReactiveUI_WP8, Version=4.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\reactiveui-core.4.4.1\lib\WP8\ReactiveUI_WP8.dll</HintPath>
+    <Reference Include="ReactiveUI.Xaml">
+      <HintPath>..\packages\reactiveui-platforms.5.0.0.20130531-alpha\lib\WP8\ReactiveUI.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -134,14 +129,18 @@
       <HintPath>..\packages\Rx-Xaml.2.1.30214.0\lib\WP8\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Mobile">
-      <HintPath>..\packages\reactiveui-mobile.4.4.1\lib\WP8\Xamarin.Mobile.dll</HintPath>
+      <HintPath>..\packages\reactiveui-mobile.5.0.0.20130531-alpha\lib\WP8\Xamarin.Mobile.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Akavache.Portable\Akavache.Portable.csproj">
+      <Project>{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}</Project>
+      <Name>Akavache.Portable</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Akavache\Akavache_WP8.csproj">
       <Project>{A54279A3-3457-41DB-9166-67E05FD0E0B1}</Project>
       <Name>Akavache_WP8</Name>