diff options
101 files changed, 1329 insertions, 3435 deletions
diff --git a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj index 9e2e5581..7ce0a97b 100644 --- a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj +++ b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj @@ -25,7 +25,6 @@ <JavaOptions /> <NuGetPackageImportStamp> </NuGetPackageImportStamp> - <XFDisableTargetsValidation>True</XFDisableTargetsValidation> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -75,53 +74,37 @@ <Private>True</Private> </Reference> <Reference Include="System.Xml" /> - <Reference Include="Xamarin.Android.Support.Annotations"> - <HintPath>..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Compat"> - <HintPath>..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.UI"> - <HintPath>..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.Utils"> - <HintPath>..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Media.Compat"> - <HintPath>..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Fragment"> - <HintPath>..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Transition"> - <HintPath>..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v4"> - <HintPath>..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v7.CardView"> - <HintPath>..\..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.Palette"> - <HintPath>..\..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.RecyclerView"> - <HintPath>..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Vector.Drawable"> - <HintPath>..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable"> - <HintPath>..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.AppCompat"> - <HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Design"> - <HintPath>..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.MediaRouter"> - <HintPath>..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <ItemGroup> @@ -181,7 +164,6 @@ </ProjectReference> <ProjectReference Include="..\PagesGallery\PagesGallery.csproj"> <Name>PagesGallery</Name> - <Project>{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}</Project> </ProjectReference> </ItemGroup> <ItemGroup> @@ -189,26 +171,20 @@ </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="..\..\.nuspec\Xamarin.Forms.targets" /> + <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> + <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" /> <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" /> </Target> <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets')" /> -</Project> + <!-- 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>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.Droid/packages.config b/PagesGallery/PagesGallery.Droid/packages.config index 263662ba..06afcedb 100644 --- a/PagesGallery/PagesGallery.Droid/packages.config +++ b/PagesGallery/PagesGallery.Droid/packages.config @@ -5,20 +5,12 @@ <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" /> <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid60" /> <package id="Newtonsoft.Json" version="6.0.4" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Design" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Transition" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.AppCompat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.CardView" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.MediaRouter" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.Palette" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> + <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.CardView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> </packages>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.WinPhone/App.xaml b/PagesGallery/PagesGallery.WinPhone/App.xaml new file mode 100644 index 00000000..1b6e49f3 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/App.xaml @@ -0,0 +1,7 @@ +<Application + x:Class="PagesGallery.WinPhone.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:PagesGallery.WinPhone"> + +</Application> diff --git a/PagesGallery/PagesGallery.WinPhone/App.xaml.cs b/PagesGallery/PagesGallery.WinPhone/App.xaml.cs new file mode 100644 index 00000000..059fbf88 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/App.xaml.cs @@ -0,0 +1,127 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Media.Animation; +using Windows.UI.Xaml.Navigation; + +// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 + +namespace PagesGallery.WinPhone +{ + /// <summary> + /// Provides application-specific behavior to supplement the default Application class. + /// </summary> + public sealed partial class App : Application + { + private TransitionCollection transitions; + + /// <summary> + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// </summary> + public App () + { + this.InitializeComponent (); + this.Suspending += this.OnSuspending; + } + + /// <summary> + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used when the application is launched to open a specific file, to display + /// search results, and so forth. + /// </summary> + /// <param name="e">Details about the launch request and process.</param> + protected override void OnLaunched (LaunchActivatedEventArgs e) + { +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + this.DebugSettings.EnableFrameRateCounter = true; + } +#endif + + Frame rootFrame = Window.Current.Content as Frame; + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == null) { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame (); + + // TODO: change this value to a cache size that is appropriate for your application + rootFrame.CacheSize = 1; + + Xamarin.Forms.Forms.Init (e); + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) { + // TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + if (rootFrame.Content == null) { + // Removes the turnstile navigation for startup. + if (rootFrame.ContentTransitions != null) { + this.transitions = new TransitionCollection (); + foreach (var c in rootFrame.ContentTransitions) { + this.transitions.Add (c); + } + } + + rootFrame.ContentTransitions = null; + rootFrame.Navigated += this.RootFrame_FirstNavigated; + + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + if (!rootFrame.Navigate (typeof (MainPage), e.Arguments)) { + throw new Exception ("Failed to create initial page"); + } + } + + // Ensure the current window is active + Window.Current.Activate (); + } + + /// <summary> + /// Restores the content transitions after the app has launched. + /// </summary> + /// <param name="sender">The object where the handler is attached.</param> + /// <param name="e">Details about the navigation event.</param> + private void RootFrame_FirstNavigated (object sender, NavigationEventArgs e) + { + var rootFrame = sender as Frame; + rootFrame.ContentTransitions = this.transitions ?? new TransitionCollection () { new NavigationThemeTransition () }; + rootFrame.Navigated -= this.RootFrame_FirstNavigated; + } + + /// <summary> + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// </summary> + /// <param name="sender">The source of the suspend request.</param> + /// <param name="e">Details about the suspend request.</param> + private void OnSuspending (object sender, SuspendingEventArgs e) + { + var deferral = e.SuspendingOperation.GetDeferral (); + + // TODO: Save application state and stop any background activity + deferral.Complete (); + } + } +}
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.WinPhone/Assets/Logo.scale-240.png b/PagesGallery/PagesGallery.WinPhone/Assets/Logo.scale-240.png Binary files differnew file mode 100644 index 00000000..76921ca9 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Assets/Logo.scale-240.png diff --git a/PagesGallery/PagesGallery.WinPhone/Assets/SmallLogo.scale-240.png b/PagesGallery/PagesGallery.WinPhone/Assets/SmallLogo.scale-240.png Binary files differnew file mode 100644 index 00000000..31663012 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Assets/SmallLogo.scale-240.png diff --git a/PagesGallery/PagesGallery.WinPhone/Assets/SplashScreen.scale-240.png b/PagesGallery/PagesGallery.WinPhone/Assets/SplashScreen.scale-240.png Binary files differnew file mode 100644 index 00000000..33f26b33 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Assets/SplashScreen.scale-240.png diff --git a/PagesGallery/PagesGallery.WinPhone/Assets/Square71x71Logo.scale-240.png b/PagesGallery/PagesGallery.WinPhone/Assets/Square71x71Logo.scale-240.png Binary files differnew file mode 100644 index 00000000..cfa54bee --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Assets/Square71x71Logo.scale-240.png diff --git a/PagesGallery/PagesGallery.WinPhone/Assets/StoreLogo.scale-240.png b/PagesGallery/PagesGallery.WinPhone/Assets/StoreLogo.scale-240.png Binary files differnew file mode 100644 index 00000000..47e084b5 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Assets/StoreLogo.scale-240.png diff --git a/PagesGallery/PagesGallery.WinPhone/Assets/WideLogo.scale-240.png b/PagesGallery/PagesGallery.WinPhone/Assets/WideLogo.scale-240.png Binary files differnew file mode 100644 index 00000000..6249d29d --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Assets/WideLogo.scale-240.png diff --git a/PagesGallery/PagesGallery.WinPhone/MainPage.xaml b/PagesGallery/PagesGallery.WinPhone/MainPage.xaml new file mode 100644 index 00000000..8ae3bc0a --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/MainPage.xaml @@ -0,0 +1,12 @@ +<forms:WindowsPhonePage + x:Class="PagesGallery.WinPhone.MainPage" + xmlns:forms="using:Xamarin.Forms.Platform.WinRT" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:PagesGallery.WinPhone" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" + Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + +</forms:WindowsPhonePage>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.WinPhone/MainPage.xaml.cs b/PagesGallery/PagesGallery.WinPhone/MainPage.xaml.cs new file mode 100644 index 00000000..45fac898 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/MainPage.xaml.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 + +namespace PagesGallery.WinPhone +{ + /// <summary> + /// An empty page that can be used on its own or navigated to within a Frame. + /// </summary> + public sealed partial class MainPage + { + public MainPage () + { + this.InitializeComponent (); + + this.NavigationCacheMode = NavigationCacheMode.Required; + + LoadApplication (new PagesGallery.App ()); + } + + /// <summary> + /// Invoked when this page is about to be displayed in a Frame. + /// </summary> + /// <param name="e">Event data that describes how this page was reached. + /// This parameter is typically used to configure the page.</param> + protected override void OnNavigatedTo (NavigationEventArgs e) + { + // TODO: Prepare page for display here. + + // TODO: If your application contains multiple pages, ensure that you are + // handling the hardware Back button by registering for the + // Windows.Phone.UI.Input.HardwareButtons.BackPressed event. + // If you are using the NavigationHelper provided by some templates, + // this event is handled for you. + } + } +} diff --git a/PagesGallery/PagesGallery.WinPhone/Package.appxmanifest b/PagesGallery/PagesGallery.WinPhone/Package.appxmanifest new file mode 100644 index 00000000..cdf2a6a3 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Package.appxmanifest @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"> + + <Identity Name="e8ebdf4c-1a3c-4b54-919a-429e98e93142" + Publisher="CN=joaqu" + Version="1.0.0.0" /> + + <mp:PhoneIdentity PhoneProductId="e8ebdf4c-1a3c-4b54-919a-429e98e93142" PhonePublisherId="00000000-0000-0000-0000-000000000000"/> + + <Properties> + <DisplayName>FPCL.Windows8.WindowsPhone</DisplayName> + <PublisherDisplayName>joaqu</PublisherDisplayName> + <Logo>Assets\StoreLogo.png</Logo> + </Properties> + + <Prerequisites> + <OSMinVersion>6.3.1</OSMinVersion> + <OSMaxVersionTested>6.3.1</OSMaxVersionTested> + </Prerequisites> + + <Resources> + <Resource Language="x-generate"/> + </Resources> + + <Applications> + <Application Id="App" + Executable="$targetnametoken$.exe" + EntryPoint="FPCL.Windows8.WindowsPhone.App"> + <m3:VisualElements + DisplayName="FPCL.Windows8.WindowsPhone" + Square150x150Logo="Assets\Logo.png" + Square44x44Logo="Assets\SmallLogo.png" + Description="FPCL.Windows8.WindowsPhone" + ForegroundText="light" + BackgroundColor="transparent"> + <m3:DefaultTile Wide310x150Logo="Assets\WideLogo.png" Square71x71Logo="Assets\Square71x71Logo.png"/> + <m3:SplashScreen Image="Assets\SplashScreen.png"/> + </m3:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="internetClientServer" /> + </Capabilities> +</Package>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.WinPhone/PagesGallery.WinPhone.csproj b/PagesGallery/PagesGallery.WinPhone/PagesGallery.WinPhone.csproj new file mode 100644 index 00000000..0adad426 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/PagesGallery.WinPhone.csproj @@ -0,0 +1,166 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{5AE58797-E40C-4EC3-836E-7DA2EF1B3180}</ProjectGuid> + <OutputType>AppContainerExe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>PagesGallery.WinPhone</RootNamespace> + <AssemblyName>PagesGallery.WinPhone</AssemblyName> + <DefaultLanguage>en-US</DefaultLanguage> + <TargetPlatformVersion>8.1</TargetPlatformVersion> + <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <SynthesizeLinkMetadata>true</SynthesizeLinkMetadata> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\ARM\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants> + <NoWarn>;2008</NoWarn> + <DebugType>full</DebugType> + <PlatformTarget>ARM</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'"> + <OutputPath>bin\ARM\Release\</OutputPath> + <DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants> + <Optimize>true</Optimize> + <NoWarn>;2008</NoWarn> + <DebugType>pdbonly</DebugType> + <PlatformTarget>ARM</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants> + <NoWarn>;2008</NoWarn> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants> + <Optimize>true</Optimize> + <NoWarn>;2008</NoWarn> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <ItemGroup> + <Compile Include="App.xaml.cs"> + <DependentUpon>App.xaml</DependentUpon> + </Compile> + <Compile Include="MainPage.xaml.cs"> + <DependentUpon>MainPage.xaml</DependentUpon> + </Compile> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + </ItemGroup> + <ItemGroup> + <Content Include="Assets\Logo.scale-240.png" /> + <Content Include="Assets\SmallLogo.scale-240.png" /> + <Content Include="Assets\SplashScreen.scale-240.png" /> + <Content Include="Assets\Square71x71Logo.scale-240.png" /> + <Content Include="Assets\StoreLogo.scale-240.png" /> + <Content Include="Assets\WideLogo.scale-240.png" /> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="MainPage.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\PagesGallery\PagesGallery.csproj"> + <Name>PagesGallery</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\wpa81\Xamarin.Forms.Core.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\wpa81\Xamarin.Forms.Platform.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Platform.WinRT, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\wpa81\Xamarin.Forms.Platform.WinRT.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Platform.WinRT.Phone, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\wpa81\Xamarin.Forms.Platform.WinRT.Phone.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\wpa81\Xamarin.Forms.Xaml.dll</HintPath> + <Private>True</Private> + </Reference> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0' "> + <VisualStudioVersion>12.0</VisualStudioVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == '' "> + <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /> + <Import Project="..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" /> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" /> + </Target> + <!-- 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>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.WinPhone/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.WinPhone/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..f1a4f4ef --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/Properties/AssemblyInfo.cs @@ -0,0 +1,29 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle ("PagesGallery.WinPhone.WindowsPhone")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("")] +[assembly: AssemblyProduct ("PagesGallery.WinPhone.WindowsPhone")] +[assembly: AssemblyCopyright ("Copyright © 2015")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion ("1.0.0.0")] +[assembly: AssemblyFileVersion ("1.0.0.0")] +[assembly: ComVisible (false)]
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.WinPhone/packages.config b/PagesGallery/PagesGallery.WinPhone/packages.config new file mode 100644 index 00000000..fe86bc49 --- /dev/null +++ b/PagesGallery/PagesGallery.WinPhone/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Xamarin.Forms" version="2.0.0.6482" targetFramework="wpa81" /> +</packages>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.Windows/App.xaml b/PagesGallery/PagesGallery.Windows/App.xaml new file mode 100644 index 00000000..66d0576c --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/App.xaml @@ -0,0 +1,7 @@ +<Application + x:Class="PagesGallery.Windows.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:PagesGallery.Windows"> + +</Application> diff --git a/PagesGallery/PagesGallery.Windows/App.xaml.cs b/PagesGallery/PagesGallery.Windows/App.xaml.cs new file mode 100644 index 00000000..6c0e11d7 --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/App.xaml.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Media.Animation; +using Windows.UI.Xaml.Navigation; + +// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 + +namespace PagesGallery.Windows +{ + /// <summary> + /// Provides application-specific behavior to supplement the default Application class. + /// </summary> + public sealed partial class App : Application + { + /// <summary> + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// </summary> + public App () + { + this.InitializeComponent (); + this.Suspending += this.OnSuspending; + } + + /// <summary> + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used when the application is launched to open a specific file, to display + /// search results, and so forth. + /// </summary> + /// <param name="e">Details about the launch request and process.</param> + protected override void OnLaunched (LaunchActivatedEventArgs e) + { +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + this.DebugSettings.EnableFrameRateCounter = true; + } +#endif + + Frame rootFrame = Window.Current.Content as Frame; + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == null) { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame (); + + // TODO: change this value to a cache size that is appropriate for your application + rootFrame.CacheSize = 1; + + Xamarin.Forms.Forms.Init (e); + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) { + // TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + if (rootFrame.Content == null) { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + if (!rootFrame.Navigate (typeof (MainPage), e.Arguments)) { + throw new Exception ("Failed to create initial page"); + } + } + + // Ensure the current window is active + Window.Current.Activate (); + } + + /// <summary> + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// </summary> + /// <param name="sender">The source of the suspend request.</param> + /// <param name="e">Details about the suspend request.</param> + private void OnSuspending (object sender, SuspendingEventArgs e) + { + var deferral = e.SuspendingOperation.GetDeferral (); + + // TODO: Save application state and stop any background activity + deferral.Complete (); + } + } +}
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.Windows/Assets/Logo.scale-100.png b/PagesGallery/PagesGallery.Windows/Assets/Logo.scale-100.png Binary files differnew file mode 100644 index 00000000..e26771cb --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/Assets/Logo.scale-100.png diff --git a/PagesGallery/PagesGallery.Windows/Assets/SmallLogo.scale-100.png b/PagesGallery/PagesGallery.Windows/Assets/SmallLogo.scale-100.png Binary files differnew file mode 100644 index 00000000..1eb0d9d5 --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/Assets/SmallLogo.scale-100.png diff --git a/PagesGallery/PagesGallery.Windows/Assets/SplashScreen.scale-100.png b/PagesGallery/PagesGallery.Windows/Assets/SplashScreen.scale-100.png Binary files differnew file mode 100644 index 00000000..c951e031 --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/Assets/SplashScreen.scale-100.png diff --git a/PagesGallery/PagesGallery.Windows/Assets/StoreLogo.scale-100.png b/PagesGallery/PagesGallery.Windows/Assets/StoreLogo.scale-100.png Binary files differnew file mode 100644 index 00000000..dcb67271 --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/Assets/StoreLogo.scale-100.png diff --git a/PagesGallery/PagesGallery.Windows/MainPage.xaml b/PagesGallery/PagesGallery.Windows/MainPage.xaml new file mode 100644 index 00000000..439770ea --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/MainPage.xaml @@ -0,0 +1,14 @@ +<forms:WindowsPage + x:Class="PagesGallery.Windows.MainPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:forms="using:Xamarin.Forms.Platform.WinRT" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:PagesGallery.Windows" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d"> + + <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + + </Grid> +</forms:WindowsPage> diff --git a/PagesGallery/PagesGallery.Windows/MainPage.xaml.cs b/PagesGallery/PagesGallery.Windows/MainPage.xaml.cs new file mode 100644 index 00000000..3029e7c2 --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/MainPage.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace PagesGallery.Windows +{ + public sealed partial class MainPage + { + public MainPage () + { + this.InitializeComponent (); + + LoadApplication (new PagesGallery.App ()); + } + } +} diff --git a/PagesGallery/PagesGallery.Windows/Package.appxmanifest b/PagesGallery/PagesGallery.Windows/Package.appxmanifest new file mode 100644 index 00000000..188ba67c --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/Package.appxmanifest @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest"> + + <Identity Name="85930d70-750c-41a6-9b95-03faaed4159c" + Publisher="CN=joaqu" + Version="1.0.0.0" /> + + <Properties> + <DisplayName>FPCL.Windows8.Windows</DisplayName> + <PublisherDisplayName>joaqu</PublisherDisplayName> + <Logo>Assets\StoreLogo.png</Logo> + </Properties> + + <Prerequisites> + <OSMinVersion>6.3.0</OSMinVersion> + <OSMaxVersionTested>6.3.0</OSMaxVersionTested> + </Prerequisites> + + <Resources> + <Resource Language="x-generate"/> + </Resources> + + <Applications> + <Application Id="App" + Executable="$targetnametoken$.exe" + EntryPoint="FPCL.Windows8.Windows.App"> + <m2:VisualElements + DisplayName="FPCL.Windows8.Windows" + Square150x150Logo="Assets\Logo.png" + Square30x30Logo="Assets\SmallLogo.png" + Description="FPCL.Windows8.Windows" + ForegroundText="light" + BackgroundColor="#464646"> + <m2:SplashScreen Image="Assets\SplashScreen.png" /> + </m2:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="internetClient" /> + </Capabilities> +</Package>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.Windows/PagesGallery.Windows.csproj b/PagesGallery/PagesGallery.Windows/PagesGallery.Windows.csproj new file mode 100644 index 00000000..13472fde --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/PagesGallery.Windows.csproj @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{0948BB67-B926-4B4C-A093-9B49211DD801}</ProjectGuid> + <OutputType>AppContainerExe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>PagesGallery.Windows</RootNamespace> + <AssemblyName>PagesGallery.Windows</AssemblyName> + <DefaultLanguage>en-US</DefaultLanguage> + <TargetPlatformVersion>8.1</TargetPlatformVersion> + <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion> + <FileAlignment>512</FileAlignment> + <SynthesizeLinkMetadata>true</SynthesizeLinkMetadata> + <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <PackageCertificateKeyFile>Windows_TemporaryKey.pfx</PackageCertificateKeyFile> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\ARM\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <NoWarn>;2008</NoWarn> + <DebugType>full</DebugType> + <PlatformTarget>ARM</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'"> + <OutputPath>bin\ARM\Release\</OutputPath> + <DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <Optimize>true</Optimize> + <NoWarn>;2008</NoWarn> + <DebugType>pdbonly</DebugType> + <PlatformTarget>ARM</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x64\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <NoWarn>;2008</NoWarn> + <DebugType>full</DebugType> + <PlatformTarget>x64</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> + <OutputPath>bin\x64\Release\</OutputPath> + <DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <Optimize>true</Optimize> + <NoWarn>;2008</NoWarn> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x64</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <NoWarn>;2008</NoWarn> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants> + <Optimize>true</Optimize> + <NoWarn>;2008</NoWarn> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <ItemGroup> + <Compile Include="App.xaml.cs"> + <DependentUpon>App.xaml</DependentUpon> + </Compile> + <Compile Include="MainPage.xaml.cs"> + <DependentUpon>MainPage.xaml</DependentUpon> + </Compile> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <None Include="packages.config" /> + <None Include="Windows_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Content Include="Assets\Logo.scale-100.png" /> + <Content Include="Assets\SmallLogo.scale-100.png" /> + <Content Include="Assets\SplashScreen.scale-100.png" /> + <Content Include="Assets\StoreLogo.scale-100.png" /> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="MainPage.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\PagesGallery\PagesGallery.csproj"> + <Name>PagesGallery</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\win81\Xamarin.Forms.Core.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\win81\Xamarin.Forms.Platform.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Platform.WinRT, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\win81\Xamarin.Forms.Platform.WinRT.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Platform.WinRT.Tablet, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\win81\Xamarin.Forms.Platform.WinRT.Tablet.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\win81\Xamarin.Forms.Xaml.dll</HintPath> + <Private>True</Private> + </Reference> + </ItemGroup> + <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0' "> + <VisualStudioVersion>12.0</VisualStudioVersion> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /> + <Import Project="..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" /> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" /> + </Target> + <!-- 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>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.Windows/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.Windows/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..2912048a --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/Properties/AssemblyInfo.cs @@ -0,0 +1,29 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle ("PagesGallery.Windows.Windows")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("")] +[assembly: AssemblyProduct ("PagesGallery.Windows.Windows")] +[assembly: AssemblyCopyright ("Copyright © 2015")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion ("1.0.0.0")] +[assembly: AssemblyFileVersion ("1.0.0.0")] +[assembly: ComVisible (false)]
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.Windows/Windows_TemporaryKey.pfx b/PagesGallery/PagesGallery.Windows/Windows_TemporaryKey.pfx Binary files differnew file mode 100644 index 00000000..27389f27 --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/Windows_TemporaryKey.pfx diff --git a/PagesGallery/PagesGallery.Windows/packages.config b/PagesGallery/PagesGallery.Windows/packages.config new file mode 100644 index 00000000..b258b22f --- /dev/null +++ b/PagesGallery/PagesGallery.Windows/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Xamarin.Forms" version="2.0.0.6482" targetFramework="win81" /> +</packages>
\ No newline at end of file diff --git a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj index 832f22b1..d2a1a8a2 100644 --- a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj +++ b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj @@ -13,7 +13,6 @@ <AssemblyName>PagesGalleryiOS</AssemblyName> <NuGetPackageImportStamp> </NuGetPackageImportStamp> - <XFDisableTargetsValidation>True</XFDisableTargetsValidation> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "> <DebugSymbols>true</DebugSymbols> @@ -155,4 +154,4 @@ </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="..\..\.nuspec\Xamarin.Forms.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj index 6ab7d331..e11700f9 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj +++ b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj @@ -19,8 +19,6 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <RestorePackages>true</RestorePackages> <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -48,29 +46,13 @@ <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> - <Reference Include="Xamarin.Android.Support.Annotations"> - <HintPath>..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Compat"> - <HintPath>..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.UI"> - <HintPath>..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.Utils"> - <HintPath>..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Media.Compat"> - <HintPath>..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Fragment"> - <HintPath>..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v4"> - <HintPath>..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v7.RecyclerView"> - <HintPath>..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <ItemGroup> @@ -104,11 +86,11 @@ </PropertyGroup> <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" /> </Target> - <Import Project="..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" /> - <Import Project="..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.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>
\ No newline at end of file diff --git a/Stubs/Xamarin.Forms.Platform.Android/packages.config b/Stubs/Xamarin.Forms.Platform.Android/packages.config index 20bde6bb..0cacd2ea 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/packages.config +++ b/Stubs/Xamarin.Forms.Platform.Android/packages.config @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid71" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid70" /> + <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" /> </packages>
\ No newline at end of file diff --git a/Xamarin.Forms.2017.sln b/Xamarin.Forms.2017.sln deleted file mode 100644 index 5e367ab5..00000000 --- a/Xamarin.Forms.2017.sln +++ /dev/null @@ -1,1328 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26923.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms", "Xamarin.Forms", "{9AD757F5-E57A-459D-A0A7-E0675E045B84}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{29AC50BF-B4FB-450B-9386-0C5AD4B84226}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{33A20844-7EF4-441D-83DA-2ACAF5E1CDFA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Control Gallery", "Control Gallery", "{4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml", "{32F608E2-6406-4DCF-9105-E2A7CB7085CF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS", "Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS.csproj", "{271193C1-6E7C-429C-A36D-3F1BE5267231}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android", "Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj", "{0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.UnitTests", "Xamarin.Forms.Core.UnitTests\Xamarin.Forms.Core.UnitTests.csproj", "{00259593-A283-47A5-ACB7-9C3819B16364}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.Android", "Xamarin.Forms.ControlGallery.Android\Xamarin.Forms.ControlGallery.Android.csproj", "{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Xamlg", "Xamarin.Forms.Xaml.Xamlg\Xamarin.Forms.Xaml.Xamlg.csproj", "{D597E3C6-1A50-4042-99FA-3E7CE28E4819}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.UnitTests", "Xamarin.Forms.Xaml.UnitTests\Xamarin.Forms.Xaml.UnitTests.csproj", "{4B14D295-C09B-4C38-B880-7CC768E50585}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Xamlc", "Xamarin.Forms.Xaml.Xamlc\Xamarin.Forms.Xaml.Xamlc.csproj", "{928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{29583A59-ACE2-4C2C-8A73-768D6979551A}" - ProjectSection(SolutionItems) = preProject - .nuget\packages.config = .nuget\packages.config - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12C50D-A570-4DF1-94E1-8599843FA87C}" - ProjectSection(SolutionItems) = preProject - .nuspec\Xamarin.Forms.AppLinks.nuspec = .nuspec\Xamarin.Forms.AppLinks.nuspec - .nuspec\Xamarin.Forms.Debug.targets = .nuspec\Xamarin.Forms.Debug.targets - .nuspec\Xamarin.Forms.DefaultItems.props = .nuspec\Xamarin.Forms.DefaultItems.props - .nuspec\Xamarin.Forms.DefaultItems.targets = .nuspec\Xamarin.Forms.DefaultItems.targets - .nuspec\Xamarin.Forms.Maps.nuspec = .nuspec\Xamarin.Forms.Maps.nuspec - .nuspec\Xamarin.Forms.Maps.props = .nuspec\Xamarin.Forms.Maps.props - .nuspec\Xamarin.Forms.Maps.targets = .nuspec\Xamarin.Forms.Maps.targets - .nuspec\Xamarin.Forms.nuspec = .nuspec\Xamarin.Forms.nuspec - .nuspec\Xamarin.Forms.Pages.Azure.nuspec = .nuspec\Xamarin.Forms.Pages.Azure.nuspec - .nuspec\Xamarin.Forms.Pages.nuspec = .nuspec\Xamarin.Forms.Pages.nuspec - .nuspec\Xamarin.Forms.props = .nuspec\Xamarin.Forms.props - .nuspec\Xamarin.Forms.targets = .nuspec\Xamarin.Forms.targets - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core", "Xamarin.Forms.Core\Xamarin.Forms.Core.csproj", "{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj", "{9DB2F292-8034-4E06-89AD-98BBDA4306B9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Controls", "Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj", "{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Build.Tasks", "Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj", "{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Maps", "Xamarin.Forms.Maps", "{132FB9A4-613F-44CE-95D5-758D32D231DD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps", "Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj", "{7D13BAC2-C6A4-416A-B07E-C169B199E52B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.iOS", "Xamarin.Forms.Maps.iOS\Xamarin.Forms.Maps.iOS.csproj", "{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.Android", "Xamarin.Forms.Maps.Android\Xamarin.Forms.Maps.Android.csproj", "{BD50B39A-EBC5-408F-9C5E-923A8EBAE473}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UITests", "UITests", "{D4D57221-71D6-4031-A6F4-EC66AF0929D9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{DDDFBCAF-93DE-4868-8296-FD909EF32EF7}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "APIDocs", "docs\APIDocs.shproj", "{DC1F3933-AC99-4887-8B09-E13C2B346D4F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.FormsViewGroup", "Xamarin.Forms.Platform.Android.FormsViewGroup\Xamarin.Forms.Platform.Android.FormsViewGroup.csproj", "{3B72465B-ACAE-43AE-9327-10F372FE5F80}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.iOS.UITests", "Xamarin.Forms.Core.iOS.UITests\Xamarin.Forms.Core.iOS.UITests.csproj", "{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Android.UITests", "Xamarin.Forms.Core.Android.UITests\Xamarin.Forms.Core.Android.UITests.csproj", "{A34EBE01-25BF-4E69-A2DC-2288DC625541}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.CustomAttributes", "Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj", "{4DCD0420-1168-4B77-86DB-6196EE4BD491}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.iOS", "Xamarin.Forms.ControlGallery.iOS\Xamarin.Forms.ControlGallery.iOS.csproj", "{C7131F14-274F-4B55-ACA9-E81731AD012F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform", "Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forwarders", "Forwarders", "{5A2DADBC-9510-4DD1-BE58-01501F2DF65D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android (Forwarders)", "Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj", "{6E53FEB1-1100-46AE-8013-17BBA35CC197}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS (Forwarders)", "Stubs\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS (Forwarders).csproj", "{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Controls.Issues", "Xamarin.Forms.Controls.Issues", "{B2927DF0-F98E-45C8-A917-27941B2B6838}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Forms.Controls.Issues.Shared", "Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.shproj", "{0F0DB9CC-EA65-429C-9363-38624BF8F49C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.WindowsUniversal", "Xamarin.Forms.ControlGallery.WindowsUniversal\Xamarin.Forms.ControlGallery.WindowsUniversal.csproj", "{AC257966-9368-478A-9DF4-F0D28E320FE3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.UAP", "Xamarin.Forms.Platform.UAP\Xamarin.Forms.Platform.UAP.csproj", "{00D8D049-FFAA-4759-8FC9-1ECA30777F72}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Design", "Xamarin.Forms.Xaml.Design\Xamarin.Forms.Xaml.Design.csproj", "{65BC4888-CC59-428A-9B75-540CF1C09480}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.Design", "Xamarin.Forms.Maps.Design\Xamarin.Forms.Maps.Design.csproj", "{C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Design", "Xamarin.Forms.Core.Design\Xamarin.Forms.Core.Design.csproj", "{98637471-8E5C-4DDE-89CA-2EAA664FB0EF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.UWP", "Xamarin.Forms.Maps.UWP\Xamarin.Forms.Maps.UWP.csproj", "{04D89A60-78EF-4A32-AE17-87E47E0233A5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Windows.UITests", "Xamarin.Forms.Core.Windows.UITests\Xamarin.Forms.Core.Windows.UITests.csproj", "{0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages", "Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj", "{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages.UnitTests", "Xamarin.Forms.Pages.UnitTests\Xamarin.Forms.Pages.UnitTests.csproj", "{447DC60E-C485-4427-8CF7-50074C6B61DE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pages Gallery", "Pages Gallery", "{80BAC3FB-357A-4D05-A050-9F234DF49C97}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery", "PagesGallery\PagesGallery\PagesGallery.csproj", "{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.Droid", "PagesGallery\PagesGallery.Droid\PagesGallery.Droid.csproj", "{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.UWP", "PagesGallery\PagesGallery.UWP\PagesGallery.UWP.csproj", "{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.AppLinks", "Xamarin.Forms.Platform.Android.AppLinks\Xamarin.Forms.Platform.Android.AppLinks.csproj", "{42DB052E-0909-45D2-8240-187F99F393FB}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages.Azure", "Xamarin.Forms.Pages.Azure\Xamarin.Forms.Pages.Azure.csproj", "{C9696465-7657-4843-872E-3C01891C4A9B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.iOS", "PagesGallery\PagesGallery.iOS\PagesGallery.iOS.csproj", "{392156B2-760A-4EE3-A822-CABD3238A21D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.MacOS", "Xamarin.Forms.Platform.MacOS\Xamarin.Forms.Platform.MacOS.csproj", "{C0059C45-EA1E-42F3-8A0E-794BB547EC3C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.MacOS", "Xamarin.Forms.ControlGallery.MacOS\Xamarin.Forms.ControlGallery.MacOS.csproj", "{8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.MacOS", "Xamarin.Forms.Maps.MacOS\Xamarin.Forms.Maps.MacOS.csproj", "{C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.macOS.UITests", "Xamarin.Forms.Core.macOS.UITests\Xamarin.Forms.Core.macOS.UITests.csproj", "{9DB0CABB-24CC-4538-88EC-6E0A0FE40248}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Forms.Core.UITests.Shared", "Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.Shared.shproj", "{E175485B-3C8C-47D7-8DD5-F7FED627EB25}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4 - Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4 - Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0f0db9cc-ea65-429c-9363-38624bf8f49c}*SharedItemsImports = 13 - Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4 - Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4 - Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4 - Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4 - Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}*SharedItemsImports = 4 - docs\APIDocs.projitems*{dc1f3933-ac99-4887-8b09-e13c2b346d4f}*SharedItemsImports = 13 - Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13 - Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4 - Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Debug|Templates = Debug|Templates - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator - Release|Templates = Release|Templates - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|ARM.ActiveCfg = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|ARM.Build.0 = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhone.Build.0 = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|Templates.ActiveCfg = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x64.ActiveCfg = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x64.Build.0 = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x86.ActiveCfg = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x86.Build.0 = Debug|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|Any CPU.Build.0 = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|ARM.ActiveCfg = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|ARM.Build.0 = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhone.ActiveCfg = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhone.Build.0 = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|Templates.ActiveCfg = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x64.ActiveCfg = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x64.Build.0 = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x86.ActiveCfg = Release|Any CPU - {271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x86.Build.0 = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|ARM.Build.0 = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|iPhone.Build.0 = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|Templates.ActiveCfg = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|x64.ActiveCfg = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|x64.Build.0 = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|x86.ActiveCfg = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Debug|x86.Build.0 = Debug|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|Any CPU.Build.0 = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|ARM.ActiveCfg = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|ARM.Build.0 = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|iPhone.ActiveCfg = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|iPhone.Build.0 = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|Templates.ActiveCfg = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|x64.ActiveCfg = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|x64.Build.0 = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|x86.ActiveCfg = Release|Any CPU - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}.Release|x86.Build.0 = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|ARM.ActiveCfg = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|ARM.Build.0 = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhone.Build.0 = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|Templates.ActiveCfg = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x64.ActiveCfg = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x64.Build.0 = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x86.ActiveCfg = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x86.Build.0 = Debug|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|Any CPU.Build.0 = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|ARM.ActiveCfg = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|ARM.Build.0 = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhone.ActiveCfg = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhone.Build.0 = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|Templates.ActiveCfg = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|x64.ActiveCfg = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|x64.Build.0 = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|x86.ActiveCfg = Release|Any CPU - {00259593-A283-47A5-ACB7-9C3819B16364}.Release|x86.Build.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|ARM.Build.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|ARM.Deploy.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|iPhone.Build.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|Templates.ActiveCfg = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|x64.ActiveCfg = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|x64.Build.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|x64.Deploy.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|x86.ActiveCfg = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|x86.Build.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|x86.Deploy.0 = Debug|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|Any CPU.Build.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|Any CPU.Deploy.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|ARM.ActiveCfg = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|ARM.Build.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|ARM.Deploy.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|iPhone.ActiveCfg = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|iPhone.Build.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|iPhone.Deploy.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|Templates.ActiveCfg = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x64.ActiveCfg = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x64.Build.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x64.Deploy.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x86.ActiveCfg = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x86.Build.0 = Release|Any CPU - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x86.Deploy.0 = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|ARM.ActiveCfg = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|ARM.Build.0 = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|iPhone.Build.0 = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|Templates.ActiveCfg = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|x64.ActiveCfg = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|x64.Build.0 = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|x86.ActiveCfg = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Debug|x86.Build.0 = Debug|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|Any CPU.Build.0 = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|ARM.ActiveCfg = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|ARM.Build.0 = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|iPhone.ActiveCfg = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|iPhone.Build.0 = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|Templates.ActiveCfg = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|x64.ActiveCfg = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|x64.Build.0 = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|x86.ActiveCfg = Release|Any CPU - {D597E3C6-1A50-4042-99FA-3E7CE28E4819}.Release|x86.Build.0 = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|ARM.Build.0 = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhone.Build.0 = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Templates.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|x64.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|x64.Build.0 = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|x86.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|x86.Build.0 = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|Any CPU.Build.0 = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|ARM.ActiveCfg = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|ARM.Build.0 = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|iPhone.ActiveCfg = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|iPhone.Build.0 = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|Templates.ActiveCfg = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|x64.ActiveCfg = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|x64.Build.0 = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|x86.ActiveCfg = Release|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Release|x86.Build.0 = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|ARM.Build.0 = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|iPhone.Build.0 = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|Templates.ActiveCfg = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|x64.ActiveCfg = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|x64.Build.0 = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Debug|x86.Build.0 = Debug|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|Any CPU.Build.0 = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|ARM.ActiveCfg = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|ARM.Build.0 = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|iPhone.ActiveCfg = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|iPhone.Build.0 = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|Templates.ActiveCfg = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|x64.ActiveCfg = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|x64.Build.0 = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|x86.ActiveCfg = Release|Any CPU - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}.Release|x86.Build.0 = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|ARM.ActiveCfg = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|ARM.Build.0 = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhone.Build.0 = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Templates.ActiveCfg = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x64.ActiveCfg = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x64.Build.0 = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x86.ActiveCfg = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x86.Build.0 = Debug|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|Any CPU.Build.0 = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|ARM.ActiveCfg = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|ARM.Build.0 = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhone.ActiveCfg = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhone.Build.0 = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|Templates.ActiveCfg = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x64.ActiveCfg = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x64.Build.0 = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x86.ActiveCfg = Release|Any CPU - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x86.Build.0 = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|ARM.Build.0 = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|iPhone.Build.0 = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|Templates.ActiveCfg = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|x64.ActiveCfg = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|x64.Build.0 = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|x86.ActiveCfg = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Debug|x86.Build.0 = Debug|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|Any CPU.Build.0 = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|ARM.ActiveCfg = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|ARM.Build.0 = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|iPhone.ActiveCfg = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|iPhone.Build.0 = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|Templates.ActiveCfg = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|x64.ActiveCfg = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|x64.Build.0 = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|x86.ActiveCfg = Release|Any CPU - {9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|x86.Build.0 = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|ARM.Build.0 = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhone.Build.0 = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|Templates.ActiveCfg = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x64.ActiveCfg = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x64.Build.0 = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x86.ActiveCfg = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x86.Build.0 = Debug|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|Any CPU.Build.0 = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|ARM.ActiveCfg = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|ARM.Build.0 = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhone.ActiveCfg = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhone.Build.0 = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|Templates.ActiveCfg = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x64.ActiveCfg = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x64.Build.0 = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x86.ActiveCfg = Release|Any CPU - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x86.Build.0 = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|ARM.Build.0 = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|iPhone.Build.0 = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|Templates.ActiveCfg = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|x64.ActiveCfg = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|x64.Build.0 = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|x86.ActiveCfg = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|x86.Build.0 = Debug|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|Any CPU.Build.0 = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|ARM.ActiveCfg = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|ARM.Build.0 = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|iPhone.ActiveCfg = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|iPhone.Build.0 = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|Templates.ActiveCfg = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|x64.ActiveCfg = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|x64.Build.0 = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|x86.ActiveCfg = Release|Any CPU - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|x86.Build.0 = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|ARM.Build.0 = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|iPhone.Build.0 = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|Templates.ActiveCfg = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|x64.ActiveCfg = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|x64.Build.0 = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Debug|x86.Build.0 = Debug|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|ARM.ActiveCfg = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|ARM.Build.0 = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|iPhone.ActiveCfg = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|iPhone.Build.0 = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|Templates.ActiveCfg = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|x64.ActiveCfg = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|x64.Build.0 = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|x86.ActiveCfg = Release|Any CPU - {7D13BAC2-C6A4-416A-B07E-C169B199E52B}.Release|x86.Build.0 = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|ARM.ActiveCfg = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|ARM.Build.0 = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|iPhone.Build.0 = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|Templates.ActiveCfg = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|x64.ActiveCfg = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|x64.Build.0 = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|x86.ActiveCfg = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Debug|x86.Build.0 = Debug|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|Any CPU.Build.0 = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|ARM.ActiveCfg = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|ARM.Build.0 = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|iPhone.ActiveCfg = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|iPhone.Build.0 = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|Templates.ActiveCfg = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|x64.ActiveCfg = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|x64.Build.0 = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|x86.ActiveCfg = Release|Any CPU - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|x86.Build.0 = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|ARM.Build.0 = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|iPhone.Build.0 = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|Templates.ActiveCfg = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|x64.Build.0 = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Debug|x86.Build.0 = Debug|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|Any CPU.Build.0 = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|ARM.ActiveCfg = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|ARM.Build.0 = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|iPhone.ActiveCfg = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|iPhone.Build.0 = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|Templates.ActiveCfg = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|x64.ActiveCfg = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|x64.Build.0 = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|x86.ActiveCfg = Release|Any CPU - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473}.Release|x86.Build.0 = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|ARM.ActiveCfg = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|ARM.Build.0 = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|iPhone.Build.0 = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|Templates.ActiveCfg = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|x64.ActiveCfg = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|x64.Build.0 = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Debug|x86.Build.0 = Debug|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|Any CPU.Build.0 = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|ARM.ActiveCfg = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|ARM.Build.0 = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|iPhone.ActiveCfg = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|iPhone.Build.0 = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|Templates.ActiveCfg = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|x64.ActiveCfg = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|x64.Build.0 = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|x86.ActiveCfg = Release|Any CPU - {3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|x86.Build.0 = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|ARM.Build.0 = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhone.Build.0 = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|Templates.ActiveCfg = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x64.ActiveCfg = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x64.Build.0 = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x86.ActiveCfg = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x86.Build.0 = Debug|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|Any CPU.Build.0 = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|ARM.ActiveCfg = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|ARM.Build.0 = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhone.ActiveCfg = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhone.Build.0 = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|Templates.ActiveCfg = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x64.ActiveCfg = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x64.Build.0 = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x86.ActiveCfg = Release|Any CPU - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x86.Build.0 = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|ARM.Build.0 = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|iPhone.Build.0 = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|Templates.ActiveCfg = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|x64.ActiveCfg = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|x64.Build.0 = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|x86.ActiveCfg = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|x86.Build.0 = Debug|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|Any CPU.Build.0 = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|ARM.ActiveCfg = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|ARM.Build.0 = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|iPhone.ActiveCfg = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|iPhone.Build.0 = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|Templates.ActiveCfg = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|x64.ActiveCfg = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|x64.Build.0 = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|x86.ActiveCfg = Release|Any CPU - {A34EBE01-25BF-4E69-A2DC-2288DC625541}.Release|x86.Build.0 = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|ARM.Build.0 = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|iPhone.Build.0 = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|Templates.ActiveCfg = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|x64.ActiveCfg = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|x64.Build.0 = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|x86.ActiveCfg = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Debug|x86.Build.0 = Debug|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|Any CPU.Build.0 = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|ARM.ActiveCfg = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|ARM.Build.0 = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|iPhone.ActiveCfg = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|iPhone.Build.0 = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|Templates.ActiveCfg = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x64.ActiveCfg = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x64.Build.0 = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x86.ActiveCfg = Release|Any CPU - {4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x86.Build.0 = Release|Any CPU - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|ARM.ActiveCfg = Debug|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhone.ActiveCfg = Debug|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhone.Build.0 = Debug|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|Templates.ActiveCfg = Debug|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|x64.ActiveCfg = Debug|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|x86.ActiveCfg = Debug|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|Any CPU.Build.0 = Release|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|ARM.ActiveCfg = Release|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhone.ActiveCfg = Release|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhone.Build.0 = Release|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|Templates.ActiveCfg = Release|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|x64.ActiveCfg = Release|iPhone - {C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|x86.ActiveCfg = Release|iPhone - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|ARM.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|ARM.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhone.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Templates.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x64.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x64.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x86.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x86.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|ARM.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|ARM.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhone.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhone.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Templates.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x64.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x64.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x86.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x86.Build.0 = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|ARM.Build.0 = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|iPhone.Build.0 = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|Templates.ActiveCfg = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|x64.ActiveCfg = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|x64.Build.0 = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|x86.ActiveCfg = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|x86.Build.0 = Debug|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|Any CPU.Build.0 = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|ARM.ActiveCfg = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|ARM.Build.0 = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|iPhone.ActiveCfg = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|iPhone.Build.0 = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|Templates.ActiveCfg = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|x64.ActiveCfg = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|x64.Build.0 = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|x86.ActiveCfg = Release|Any CPU - {6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|x86.Build.0 = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|ARM.Build.0 = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|iPhone.Build.0 = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|Templates.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|x64.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|x64.Build.0 = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|x86.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|x86.Build.0 = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|Any CPU.Build.0 = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|ARM.ActiveCfg = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|ARM.Build.0 = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|iPhone.ActiveCfg = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|iPhone.Build.0 = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|Templates.ActiveCfg = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|x64.ActiveCfg = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|x64.Build.0 = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|x86.ActiveCfg = Release|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Release|x86.Build.0 = Release|Any CPU - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|Any CPU.ActiveCfg = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|Any CPU.Build.0 = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|Any CPU.Deploy.0 = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|ARM.ActiveCfg = Debug|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|ARM.Build.0 = Debug|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|ARM.Deploy.0 = Debug|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|iPhone.ActiveCfg = Debug|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|Templates.ActiveCfg = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|x64.ActiveCfg = Debug|x64 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|x64.Build.0 = Debug|x64 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|x64.Deploy.0 = Debug|x64 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|x86.ActiveCfg = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|x86.Build.0 = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Debug|x86.Deploy.0 = Debug|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|Any CPU.ActiveCfg = Release|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|Any CPU.Build.0 = Release|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|Any CPU.Deploy.0 = Release|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|ARM.ActiveCfg = Release|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|ARM.Build.0 = Release|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|ARM.Deploy.0 = Release|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|iPhone.ActiveCfg = Release|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|iPhone.Build.0 = Release|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|iPhone.Deploy.0 = Release|ARM - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|Templates.ActiveCfg = Release|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|x64.ActiveCfg = Release|x64 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|x64.Build.0 = Release|x64 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|x64.Deploy.0 = Release|x64 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|x86.ActiveCfg = Release|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|x86.Build.0 = Release|x86 - {AC257966-9368-478A-9DF4-F0D28E320FE3}.Release|x86.Deploy.0 = Release|x86 - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|ARM.ActiveCfg = Debug|ARM - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|ARM.Build.0 = Debug|ARM - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|Templates.ActiveCfg = Debug|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|x64.ActiveCfg = Debug|x64 - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|x64.Build.0 = Debug|x64 - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|x86.ActiveCfg = Debug|x86 - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Debug|x86.Build.0 = Debug|x86 - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|Any CPU.Build.0 = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|ARM.ActiveCfg = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|ARM.Build.0 = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|iPhone.ActiveCfg = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|iPhone.Build.0 = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|Templates.ActiveCfg = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|x64.ActiveCfg = Release|x64 - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|x64.Build.0 = Release|x64 - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|x86.ActiveCfg = Release|Any CPU - {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|x86.Build.0 = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|ARM.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|ARM.Build.0 = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhone.Build.0 = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Templates.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Templates.Build.0 = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x64.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x64.Build.0 = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x86.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x86.Build.0 = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Any CPU.Build.0 = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|ARM.ActiveCfg = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|ARM.Build.0 = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhone.ActiveCfg = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhone.Build.0 = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Templates.ActiveCfg = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Templates.Build.0 = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x64.ActiveCfg = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x64.Build.0 = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.ActiveCfg = Release|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.Build.0 = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|ARM.Build.0 = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhone.Build.0 = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Templates.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Templates.Build.0 = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x64.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x64.Build.0 = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x86.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x86.Build.0 = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Any CPU.Build.0 = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|ARM.ActiveCfg = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|ARM.Build.0 = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhone.ActiveCfg = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhone.Build.0 = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Templates.ActiveCfg = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Templates.Build.0 = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x64.ActiveCfg = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x64.Build.0 = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x86.ActiveCfg = Release|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x86.Build.0 = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|ARM.Build.0 = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhone.Build.0 = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Templates.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Templates.Build.0 = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x64.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x64.Build.0 = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x86.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x86.Build.0 = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Any CPU.Build.0 = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|ARM.ActiveCfg = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|ARM.Build.0 = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhone.ActiveCfg = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhone.Build.0 = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Templates.ActiveCfg = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Templates.Build.0 = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x64.ActiveCfg = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x64.Build.0 = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x86.ActiveCfg = Release|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x86.Build.0 = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|ARM.ActiveCfg = Debug|ARM - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|ARM.Build.0 = Debug|ARM - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|Templates.ActiveCfg = Debug|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|Templates.Build.0 = Debug|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|x64.ActiveCfg = Debug|x64 - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|x64.Build.0 = Debug|x64 - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|x86.ActiveCfg = Debug|x86 - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Debug|x86.Build.0 = Debug|x86 - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|Any CPU.Build.0 = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|ARM.ActiveCfg = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|ARM.Build.0 = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|iPhone.ActiveCfg = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|iPhone.Build.0 = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|Templates.ActiveCfg = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|Templates.Build.0 = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|x64.ActiveCfg = Release|x64 - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|x64.Build.0 = Release|x64 - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|x86.ActiveCfg = Release|Any CPU - {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Release|x86.Build.0 = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|Templates.ActiveCfg = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|Templates.Build.0 = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|Any CPU.Build.0 = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|ARM.ActiveCfg = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|iPhone.ActiveCfg = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|iPhone.Build.0 = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|Templates.ActiveCfg = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|Templates.Build.0 = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|x64.ActiveCfg = Release|Any CPU - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|x86.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|ARM.ActiveCfg = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|ARM.Build.0 = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhone.Build.0 = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|Templates.ActiveCfg = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|Templates.Build.0 = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x64.ActiveCfg = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x64.Build.0 = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x86.ActiveCfg = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x86.Build.0 = Debug|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|Any CPU.Build.0 = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|ARM.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|ARM.Build.0 = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|iPhone.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|iPhone.Build.0 = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|Templates.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|Templates.Build.0 = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|x64.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|x64.Build.0 = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|x86.ActiveCfg = Release|Any CPU - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Release|x86.Build.0 = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|ARM.ActiveCfg = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|ARM.Build.0 = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhone.Build.0 = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|Templates.ActiveCfg = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|Templates.Build.0 = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x64.ActiveCfg = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x64.Build.0 = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x86.ActiveCfg = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x86.Build.0 = Debug|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|Any CPU.Build.0 = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|ARM.ActiveCfg = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|ARM.Build.0 = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|iPhone.ActiveCfg = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|iPhone.Build.0 = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|Templates.ActiveCfg = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|Templates.Build.0 = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x64.ActiveCfg = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x64.Build.0 = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x86.ActiveCfg = Release|Any CPU - {447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x86.Build.0 = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|ARM.Build.0 = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhone.Build.0 = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Templates.ActiveCfg = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Templates.Build.0 = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x64.ActiveCfg = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x64.Build.0 = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x86.ActiveCfg = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x86.Build.0 = Debug|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|Any CPU.Build.0 = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|ARM.ActiveCfg = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|ARM.Build.0 = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|iPhone.ActiveCfg = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|iPhone.Build.0 = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|Templates.ActiveCfg = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|Templates.Build.0 = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x64.ActiveCfg = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x64.Build.0 = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x86.ActiveCfg = Release|Any CPU - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x86.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|ARM.Build.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|ARM.Deploy.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhone.Build.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Templates.ActiveCfg = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Templates.Build.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Templates.Deploy.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x64.ActiveCfg = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x64.Build.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x64.Deploy.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x86.ActiveCfg = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x86.Build.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x86.Deploy.0 = Debug|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|Any CPU.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|Any CPU.Deploy.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|ARM.ActiveCfg = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|ARM.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|ARM.Deploy.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|iPhone.ActiveCfg = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|iPhone.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|iPhone.Deploy.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|Templates.ActiveCfg = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|Templates.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|Templates.Deploy.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x64.ActiveCfg = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x64.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x64.Deploy.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.ActiveCfg = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Build.0 = Release|Any CPU - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Deploy.0 = Release|Any CPU - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.ActiveCfg = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Build.0 = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Deploy.0 = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.ActiveCfg = Debug|ARM - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Build.0 = Debug|ARM - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Deploy.0 = Debug|ARM - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhone.ActiveCfg = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Templates.ActiveCfg = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.ActiveCfg = Debug|x64 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Build.0 = Debug|x64 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Deploy.0 = Debug|x64 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.ActiveCfg = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Build.0 = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Deploy.0 = Debug|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.ActiveCfg = Release|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|ARM.ActiveCfg = Release|ARM - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|ARM.Build.0 = Release|ARM - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|ARM.Deploy.0 = Release|ARM - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|iPhone.ActiveCfg = Release|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Templates.ActiveCfg = Release|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|x64.ActiveCfg = Release|x64 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|x64.Build.0 = Release|x64 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|x64.Deploy.0 = Release|x64 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|x86.ActiveCfg = Release|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|x86.Build.0 = Release|x86 - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|x86.Deploy.0 = Release|x86 - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|ARM.ActiveCfg = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|ARM.Build.0 = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|iPhone.Build.0 = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|Templates.ActiveCfg = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|Templates.Build.0 = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|x64.ActiveCfg = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|x64.Build.0 = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|x86.ActiveCfg = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Debug|x86.Build.0 = Debug|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|Any CPU.Build.0 = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|ARM.ActiveCfg = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|ARM.Build.0 = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|iPhone.ActiveCfg = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|iPhone.Build.0 = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|Templates.ActiveCfg = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|Templates.Build.0 = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|x64.ActiveCfg = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|x64.Build.0 = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|x86.ActiveCfg = Release|Any CPU - {42DB052E-0909-45D2-8240-187F99F393FB}.Release|x86.Build.0 = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|ARM.Build.0 = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.Build.0 = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Templates.ActiveCfg = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Templates.Build.0 = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.ActiveCfg = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.Build.0 = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x86.ActiveCfg = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x86.Build.0 = Debug|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Any CPU.Build.0 = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|ARM.ActiveCfg = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|ARM.Build.0 = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhone.ActiveCfg = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhone.Build.0 = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Templates.ActiveCfg = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Templates.Build.0 = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x64.ActiveCfg = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x64.Build.0 = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.ActiveCfg = Release|Any CPU - {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.Build.0 = Release|Any CPU - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|ARM.ActiveCfg = Debug|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.ActiveCfg = Debug|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.Build.0 = Debug|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Templates.ActiveCfg = Debug|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x64.ActiveCfg = Debug|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x86.ActiveCfg = Debug|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|Any CPU.ActiveCfg = Release|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|ARM.ActiveCfg = Release|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhone.ActiveCfg = Release|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhone.Build.0 = Release|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|Templates.ActiveCfg = Release|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x64.ActiveCfg = Release|iPhone - {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x86.ActiveCfg = Release|iPhone - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|ARM.Build.0 = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|iPhone.Build.0 = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|Templates.ActiveCfg = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|Templates.Build.0 = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|x64.ActiveCfg = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|x64.Build.0 = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|x86.ActiveCfg = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Debug|x86.Build.0 = Debug|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|Any CPU.Build.0 = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|ARM.ActiveCfg = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|ARM.Build.0 = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|iPhone.ActiveCfg = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|iPhone.Build.0 = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|Templates.ActiveCfg = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|Templates.Build.0 = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|x64.ActiveCfg = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|x64.Build.0 = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|x86.ActiveCfg = Release|Any CPU - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C}.Release|x86.Build.0 = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|ARM.Build.0 = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|iPhone.Build.0 = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|Templates.ActiveCfg = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|Templates.Build.0 = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|x64.ActiveCfg = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|x64.Build.0 = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|x86.ActiveCfg = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Debug|x86.Build.0 = Debug|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|Any CPU.Build.0 = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|ARM.ActiveCfg = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|ARM.Build.0 = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|iPhone.ActiveCfg = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|iPhone.Build.0 = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|Templates.ActiveCfg = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|Templates.Build.0 = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|x64.ActiveCfg = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|x64.Build.0 = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|x86.ActiveCfg = Release|Any CPU - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D}.Release|x86.Build.0 = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|ARM.Build.0 = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|iPhone.Build.0 = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|Templates.ActiveCfg = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|Templates.Build.0 = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|x64.ActiveCfg = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|x64.Build.0 = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|x86.ActiveCfg = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Debug|x86.Build.0 = Debug|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|Any CPU.Build.0 = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|ARM.ActiveCfg = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|ARM.Build.0 = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|iPhone.ActiveCfg = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|iPhone.Build.0 = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|Templates.ActiveCfg = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|Templates.Build.0 = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|x64.ActiveCfg = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|x64.Build.0 = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|x86.ActiveCfg = Release|Any CPU - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}.Release|x86.Build.0 = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|ARM.Build.0 = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|iPhone.Build.0 = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|Templates.ActiveCfg = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|Templates.Build.0 = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|x64.ActiveCfg = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|x64.Build.0 = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|x86.ActiveCfg = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Debug|x86.Build.0 = Debug|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|Any CPU.Build.0 = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|ARM.ActiveCfg = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|ARM.Build.0 = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|iPhone.ActiveCfg = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|iPhone.Build.0 = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|Templates.ActiveCfg = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|Templates.Build.0 = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x64.ActiveCfg = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x64.Build.0 = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.ActiveCfg = Release|Any CPU - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {271193C1-6E7C-429C-A36D-3F1BE5267231} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {0E16E70A-D6DD-4323-AD5D-363ABFF42D6A} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {00259593-A283-47A5-ACB7-9C3819B16364} = {33A20844-7EF4-441D-83DA-2ACAF5E1CDFA} - {1346A7F1-4457-4BB4-A371-2C8E28BBD53E} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} - {D597E3C6-1A50-4042-99FA-3E7CE28E4819} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF} - {4B14D295-C09B-4C38-B880-7CC768E50585} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF} - {928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF} - {57B8B73D-C3B5-4C42-869E-7B2F17D354AC} = {9AD757F5-E57A-459D-A0A7-E0675E045B84} - {9DB2F292-8034-4E06-89AD-98BBDA4306B9} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF} - {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} - {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF} - {7D13BAC2-C6A4-416A-B07E-C169B199E52B} = {132FB9A4-613F-44CE-95D5-758D32D231DD} - {ABA078C4-F9BB-4924-8B2B-10FE0D2F5491} = {132FB9A4-613F-44CE-95D5-758D32D231DD} - {BD50B39A-EBC5-408F-9C5E-923A8EBAE473} = {132FB9A4-613F-44CE-95D5-758D32D231DD} - {DC1F3933-AC99-4887-8B09-E13C2B346D4F} = {DDDFBCAF-93DE-4868-8296-FD909EF32EF7} - {3B72465B-ACAE-43AE-9327-10F372FE5F80} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {EADD8100-B3AE-4A31-92C4-267A64A1C6EB} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9} - {A34EBE01-25BF-4E69-A2DC-2288DC625541} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9} - {4DCD0420-1168-4B77-86DB-6196EE4BD491} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9} - {C7131F14-274F-4B55-ACA9-E81731AD012F} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} - {67F9D3A8-F71E-4428-913F-C37AE82CDB24} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {5A2DADBC-9510-4DD1-BE58-01501F2DF65D} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {6E53FEB1-1100-46AE-8013-17BBA35CC197} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D} - {39B3457F-01D8-43D0-8E84-D8C4F73CF48D} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D} - {B2927DF0-F98E-45C8-A917-27941B2B6838} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} - {0F0DB9CC-EA65-429C-9363-38624BF8F49C} = {B2927DF0-F98E-45C8-A917-27941B2B6838} - {AC257966-9368-478A-9DF4-F0D28E320FE3} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} - {00D8D049-FFAA-4759-8FC9-1ECA30777F72} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {65BC4888-CC59-428A-9B75-540CF1C09480} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF} - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87} = {132FB9A4-613F-44CE-95D5-758D32D231DD} - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF} = {9AD757F5-E57A-459D-A0A7-E0675E045B84} - {04D89A60-78EF-4A32-AE17-87E47E0233A5} = {132FB9A4-613F-44CE-95D5-758D32D231DD} - {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9} - {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31} = {9AD757F5-E57A-459D-A0A7-E0675E045B84} - {447DC60E-C485-4427-8CF7-50074C6B61DE} = {33A20844-7EF4-441D-83DA-2ACAF5E1CDFA} - {7B5F9E6A-6334-4C74-9B77-A55B3DA60E41} = {80BAC3FB-357A-4D05-A050-9F234DF49C97} - {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2} = {80BAC3FB-357A-4D05-A050-9F234DF49C97} - {95FEB8D4-D57E-4B96-A8D8-59D241C0501B} = {80BAC3FB-357A-4D05-A050-9F234DF49C97} - {42DB052E-0909-45D2-8240-187F99F393FB} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {C9696465-7657-4843-872E-3C01891C4A9B} = {9AD757F5-E57A-459D-A0A7-E0675E045B84} - {392156B2-760A-4EE3-A822-CABD3238A21D} = {80BAC3FB-357A-4D05-A050-9F234DF49C97} - {C0059C45-EA1E-42F3-8A0E-794BB547EC3C} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} - {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884} = {132FB9A4-613F-44CE-95D5-758D32D231DD} - {9DB0CABB-24CC-4538-88EC-6E0A0FE40248} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9} - {E175485B-3C8C-47D7-8DD5-F7FED627EB25} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F5AE8B8D-5169-4EE3-B0F7-77C1EF9221D7} - EndGlobalSection -EndGlobal diff --git a/Xamarin.Forms.ControlGallery.Android/Activity1.cs b/Xamarin.Forms.ControlGallery.Android/Activity1.cs index bb78d318..9036cc53 100644 --- a/Xamarin.Forms.ControlGallery.Android/Activity1.cs +++ b/Xamarin.Forms.ControlGallery.Android/Activity1.cs @@ -169,8 +169,6 @@ namespace Xamarin.Forms.ControlGallery.Android // And put things back to normal so we can keep running tests uiModeManager.DisableCarMode(DisableCarModeFlags.None); - - ((App)Xamarin.Forms.Application.Current).Reset(); }); } } diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index d978b1df..31ef91cb 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -65,6 +64,12 @@ <TreatWarningsAsErrors>true</TreatWarningsAsErrors> <NoWarn> </NoWarn> + <BundleAssemblies>False</BundleAssemblies> + <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> + <AotAssemblies>False</AotAssemblies> + <EnableLLVM>False</EnableLLVM> + <AndroidEnableMultiDex>False</AndroidEnableMultiDex> + <EnableProguard>False</EnableProguard> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -118,77 +123,52 @@ <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> - <Reference Include="Xamarin.Firebase.AppIndexing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\lib\MonoAndroid70\Xamarin.Firebase.AppIndexing.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.Firebase.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Firebase.Common.42.1021.1\lib\MonoAndroid70\Xamarin.Firebase.Common.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.GooglePlayServices.AppIndexing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.AppIndexing.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.AppIndexing.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Base.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Basement.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.GooglePlayServices.Tasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.Insights"> - <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Annotations"> - <HintPath>..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.UI"> - <HintPath>..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.Utils"> - <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Media.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Fragment"> - <HintPath>..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Transition"> - <HintPath>..\packages\Xamarin.Android.Support.Transition.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v4"> - <HintPath>..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v7.CardView"> - <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v7.Palette"> - <HintPath>..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.RecyclerView"> - <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Vector.Drawable"> - <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Base.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable"> - <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> + <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.AppCompat"> - <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> + <Reference Include="Xamarin.GooglePlayServices.Maps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Design"> - <HintPath>..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll</HintPath> + <Reference Include="Xamarin.Insights"> + <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -324,43 +304,18 @@ <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="..\packages\Xamarin.Insights.1.11.4\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.4\build\MonoAndroid10\Xamarin.Insights.targets')" /> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" /> + </Target> <Target Name="BeforeBuild"> <CreateItem Include="Properties\MapsKey.cs.blank"> <Output TaskParameter="Include" ItemName="MapsKey" /> </CreateItem> <Copy SourceFiles="@(MapsKey)" DestinationFiles="Properties\MapsKey.cs" Condition="!Exists('Properties\MapsKey.cs')" /> </Target> + <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" /> <Import Project="..\packages\Xamarin.Insights.1.12.3\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.3\build\MonoAndroid10\Xamarin.Insights.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets'))" /> - </Target> - <Import Project="..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets')" /> - <Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets')" /> - <Import Project="..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets" Condition="Exists('..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets')" /> - <Import Project="..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets')" /> - <Import Project="..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets" Condition="Exists('..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets')" /> - <Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets')" /> </Project>
\ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.Android/packages.config b/Xamarin.Forms.ControlGallery.Android/packages.config index 625599ba..3dfba0a7 100644 --- a/Xamarin.Forms.ControlGallery.Android/packages.config +++ b/Xamarin.Forms.ControlGallery.Android/packages.config @@ -1,26 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Design" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Transition" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.AppCompat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.CardView" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.Palette" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Build.Download" version="0.4.7" targetFramework="monoandroid71" /> - <package id="Xamarin.Firebase.AppIndexing" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.Firebase.Common" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.AppIndexing" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Base" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Basement" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Tasks" version="42.1021.1" targetFramework="monoandroid71" /> + <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.CardView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid60" /> + <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid60" /> + <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid60" /> <package id="Xamarin.Insights" version="1.12.3" targetFramework="monoandroid70" /> </packages>
\ No newline at end of file diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs index a88bc507..f8f48aeb 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs @@ -44,12 +44,15 @@ namespace Xamarin.Forms.Controls.Issues public void DatePickerCancelShouldUnfocus() { RunningApp.Tap(q => q.Marked(DatePicker)); - - RunningApp.Back(); + RunningApp.WaitForElement(q => q.Marked("Cancel")); + + RunningApp.Tap(q => q.Marked("Cancel")); RunningApp.WaitForElement(q => q.Marked("Click to focus DatePicker")); RunningApp.Tap(q => q.Marked("Click to focus DatePicker")); - RunningApp.Back(); + RunningApp.WaitForElement(q => q.Marked("Cancel")); + + RunningApp.Tap(q => q.Marked("Cancel")); } #endif diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs index 5f1a0ef3..04bcdf8c 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs @@ -44,12 +44,15 @@ namespace Xamarin.Forms.Controls.Issues public void TimePickerCancelShouldUnfocus() { RunningApp.Tap(q => q.Marked(TimePicker)); + RunningApp.WaitForElement(q => q.Marked("Cancel")); - RunningApp.Back(); + RunningApp.Tap(q => q.Marked("Cancel")); RunningApp.WaitForElement(q => q.Marked("Click to focus TimePicker")); RunningApp.Tap(q => q.Marked("Click to focus TimePicker")); - RunningApp.Back(); + RunningApp.WaitForElement(q => q.Marked("Cancel")); + + RunningApp.Tap(q => q.Marked("Cancel")); } #endif diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs index a86a625d..91ef39a4 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs @@ -14,26 +14,16 @@ namespace Xamarin.Forms.Controls.Issues #endif [Preserve(AllMembers = true)] - [Issue(IssueTracker.Bugzilla, 44096, "Grid, StackLayout, and ContentView still participate in hit testing on " - + "Android after IsEnabled is set to false", PlatformAffected.Android)] + [Issue(IssueTracker.Bugzilla, 44096, "Grid, StackLayout, and ContentView still participate in hit testing on Android after IsEnabled is set to false", PlatformAffected.Android)] public class Bugzilla44096 : TestContentPage { bool _flag; - const string Child = "Child"; - const string Original = "Original"; - const string ToggleColor = "color"; - const string ToggleIsEnabled = "disabled"; - - const string StackLayout = "stackLayout"; - const string ContentView = "contentView"; - const string Grid = "grid"; - const string RelativeLayout = "relativeLayout"; protected override void Init() { var result = new Label { - Text = Original + Text = "Original" }; var grid = new Grid @@ -41,7 +31,7 @@ namespace Xamarin.Forms.Controls.Issues IsEnabled = true, WidthRequest = 250, HeightRequest = 50, - AutomationId = Grid + AutomationId = "grid" }; AddTapGesture(result, grid); @@ -50,7 +40,7 @@ namespace Xamarin.Forms.Controls.Issues IsEnabled = true, WidthRequest = 250, HeightRequest = 50, - AutomationId = ContentView + AutomationId = "contentView" }; AddTapGesture(result, contentView); @@ -59,19 +49,10 @@ namespace Xamarin.Forms.Controls.Issues IsEnabled = true, WidthRequest = 250, HeightRequest = 50, - AutomationId = StackLayout + AutomationId = "stackLayout" }; AddTapGesture(result, stackLayout); - var relativeLayout = new RelativeLayout - { - IsEnabled = true, - WidthRequest = 250, - HeightRequest = 50, - AutomationId = RelativeLayout - }; - AddTapGesture(result, relativeLayout); - var color = new Button { Text = "Toggle colors", @@ -82,34 +63,31 @@ namespace Xamarin.Forms.Controls.Issues grid.BackgroundColor = Color.Red; contentView.BackgroundColor = Color.Blue; stackLayout.BackgroundColor = Color.Yellow; - relativeLayout.BackgroundColor = Color.Green; } else { grid.BackgroundColor = Color.Default; contentView.BackgroundColor = Color.Default; stackLayout.BackgroundColor = Color.Default; - relativeLayout.BackgroundColor = Color.Default; } _flag = !_flag; }), - AutomationId = ToggleColor + AutomationId = "color" }; var disabled = new Button { - Text = "Toggle IsEnabled", + Text = "Disabled", Command = new Command(() => { grid.IsEnabled = false; contentView.IsEnabled = false; stackLayout.IsEnabled = false; - relativeLayout.IsEnabled = false; - result.Text = Original; + result.Text = "Original"; }), - AutomationId = ToggleIsEnabled + AutomationId = "disabled" }; var parent = new StackLayout @@ -125,8 +103,7 @@ namespace Xamarin.Forms.Controls.Issues result, grid, contentView, - stackLayout, - relativeLayout + stackLayout } }; @@ -139,64 +116,72 @@ namespace Xamarin.Forms.Controls.Issues { Command = new Command(() => { - result.Text = Child; + result.Text = "Child"; }) }; view.GestureRecognizers.Add(tapGestureRecognizer); } #if UITEST - [Test] - public void TestGrid() + public void Test() { - TestControl(Grid); - } + RunningApp.WaitForElement(q => q.Marked("grid")); + RunningApp.Tap(q => q.Marked("grid")); + RunningApp.WaitForElement(q => q.Marked("Child")); - [Test] - public void TestContentView() - { - TestControl(ContentView); - } + RunningApp.WaitForElement(q => q.Marked("contentView")); + RunningApp.Tap(q => q.Marked("contentView")); + RunningApp.WaitForElement(q => q.Marked("Child")); - [Test] - public void TestStackLayout() - { - TestControl(StackLayout); - } + RunningApp.WaitForElement(q => q.Marked("stackLayout")); + RunningApp.Tap(q => q.Marked("stackLayout")); + RunningApp.WaitForElement(q => q.Marked("Child")); - [Test] - public void TestRelativeLayout() - { - TestControl(RelativeLayout); - } + RunningApp.WaitForElement(q => q.Marked("color")); + RunningApp.Tap(q => q.Marked("color")); - void TestControl(string control) - { - RunningApp.WaitForElement(q => q.Marked(control)); - RunningApp.Tap(q => q.Marked(control)); - RunningApp.WaitForElement(q => q.Marked(Child)); + RunningApp.WaitForElement(q => q.Marked("grid")); + RunningApp.Tap(q => q.Marked("grid")); + RunningApp.WaitForElement(q => q.Marked("Child")); + + RunningApp.WaitForElement(q => q.Marked("contentView")); + RunningApp.Tap(q => q.Marked("contentView")); + RunningApp.WaitForElement(q => q.Marked("Child")); + + RunningApp.WaitForElement(q => q.Marked("stackLayout")); + RunningApp.Tap(q => q.Marked("stackLayout")); + RunningApp.WaitForElement(q => q.Marked("Child")); + + RunningApp.WaitForElement(q => q.Marked("disabled")); + RunningApp.Tap(q => q.Marked("disabled")); + + RunningApp.WaitForElement(q => q.Marked("grid")); + RunningApp.Tap(q => q.Marked("grid")); + RunningApp.WaitForElement(q => q.Marked("Original")); - RunningApp.WaitForElement(q => q.Marked(ToggleColor)); - RunningApp.Tap(q => q.Marked(ToggleColor)); + RunningApp.WaitForElement(q => q.Marked("contentView")); + RunningApp.Tap(q => q.Marked("contentView")); + RunningApp.WaitForElement(q => q.Marked("Original")); - RunningApp.WaitForElement(q => q.Marked(control)); - RunningApp.Tap(q => q.Marked(control)); - RunningApp.WaitForElement(q => q.Marked(Child)); + RunningApp.WaitForElement(q => q.Marked("stackLayout")); + RunningApp.Tap(q => q.Marked("stackLayout")); + RunningApp.WaitForElement(q => q.Marked("Original")); - RunningApp.WaitForElement(q => q.Marked(ToggleIsEnabled)); - RunningApp.Tap(q => q.Marked(ToggleIsEnabled)); + RunningApp.WaitForElement(q => q.Marked("color")); + RunningApp.Tap(q => q.Marked("color")); - RunningApp.WaitForElement(q => q.Marked(control)); - RunningApp.Tap(q => q.Marked(control)); - RunningApp.WaitForElement(q => q.Marked(Original)); + RunningApp.WaitForElement(q => q.Marked("grid")); + RunningApp.Tap(q => q.Marked("grid")); + RunningApp.WaitForElement(q => q.Marked("Original")); - RunningApp.WaitForElement(q => q.Marked(ToggleColor)); - RunningApp.Tap(q => q.Marked(ToggleColor)); + RunningApp.WaitForElement(q => q.Marked("contentView")); + RunningApp.Tap(q => q.Marked("contentView")); + RunningApp.WaitForElement(q => q.Marked("Original")); - RunningApp.WaitForElement(q => q.Marked(control)); - RunningApp.Tap(q => q.Marked(control)); - RunningApp.WaitForElement(q => q.Marked(Original)); + RunningApp.WaitForElement(q => q.Marked("stackLayout")); + RunningApp.Tap(q => q.Marked("stackLayout")); + RunningApp.WaitForElement(q => q.Marked("Original")); } #endif } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363_2.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363_2.cs deleted file mode 100644 index 8bc88b4f..00000000 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363_2.cs +++ /dev/null @@ -1,127 +0,0 @@ -using System.Collections.Generic; -using Xamarin.Forms.CustomAttributes; -using Xamarin.Forms.Internals; - -#if UITEST -using Xamarin.Forms.Core.UITests; -using Xamarin.UITest; -using NUnit.Framework; -#endif - -namespace Xamarin.Forms.Controls.Issues -{ -#if UITEST - [Category(UITestCategories.Gestures)] - [Category(UITestCategories.ListView)] - [Category(UITestCategories.Cells)] - [Category(UITestCategories.ContextActions)] -#endif - - [Preserve(AllMembers = true)] - [Issue(IssueTracker.Bugzilla, 46363, "TapGestureRecognizer blocks List View Context Actions", - PlatformAffected.Android, issueTestNumber: 1)] - public class Bugzilla46363_2 : TestContentPage - { - // This test case covers a scenario similar to Bugzilla46363, but with the TapGesture - // added to a nested StackLayout within the ViewCell template - - const string Target = "Two"; - const string ContextAction = "Context Action"; - const string TapSuccess = "Tap Success"; - const string TapFailure = "Tap command executed more than once"; - const string ContextSuccess = "Context Menu Success"; - const string Testing = "Testing"; - - static Command s_tapCommand; - static Command s_contextCommand; - - protected override void Init() - { - var list = new List<string> { "One", Target, "Three", "Four" }; - - var lv = new ListView - { - ItemsSource = list, - ItemTemplate = new DataTemplate(typeof(_46363Template_2)) - }; - - var instructions = new Label(); - var result = new Label { Text = Testing }; - - s_tapCommand = new Command(() => - { - if (result.Text == TapSuccess || result.Text == TapFailure) - { - // We want this test to fail if the tap command is executed more than once - result.Text = TapFailure; - } - else - { - result.Text = TapSuccess; - } - }); - - s_contextCommand = new Command(() => - { - result.Text = ContextSuccess; - }); - - var layout = new StackLayout { VerticalOptions = LayoutOptions.Fill, HorizontalOptions = LayoutOptions.Fill }; - - layout.Children.Add(instructions); - layout.Children.Add(result); - layout.Children.Add(lv); - - Content = layout; - } - - [Preserve(AllMembers = true)] - class _46363Template_2 : ViewCell - { - public _46363Template_2() - { - var label = new Label(); - label.SetBinding(Label.TextProperty, "."); - - var innerStackLayout = new StackLayout { Children = { label }, Padding = new Thickness(4, 4, 4, 10) }; - var outerStackLayout = new StackLayout { Children = { innerStackLayout } }; - - View = outerStackLayout; - - ContextActions.Add(new MenuItem - { - Text = ContextAction, - Command = s_contextCommand - }); - - innerStackLayout.GestureRecognizers.Add(new TapGestureRecognizer - { - Command = s_tapCommand - }); - } - } - -#if UITEST - [Test] - public void _46363_2_Tap_Succeeds() - { - RunningApp.WaitForElement(Testing); - RunningApp.Tap(Target); - RunningApp.WaitForElement(TapSuccess); - - // Verify that we aren't also opening the context menu - RunningApp.WaitForNoElement(ContextAction); - } - - [Test] - public void _46363_2_ContextAction_Succeeds() - { - RunningApp.WaitForElement(Testing); - RunningApp.ActivateContextMenu(Target); - RunningApp.WaitForElement(ContextAction); - RunningApp.Tap(ContextAction); - RunningApp.WaitForElement(ContextSuccess); - } -#endif - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58779.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58779.cs deleted file mode 100644 index e83f5012..00000000 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58779.cs +++ /dev/null @@ -1,67 +0,0 @@ -using Xamarin.Forms.CustomAttributes; -using Xamarin.Forms.Internals; -using System.Collections.ObjectModel; -using System; - -#if UITEST -using Xamarin.UITest; -using NUnit.Framework; -#endif - -namespace Xamarin.Forms.Controls.Issues -{ - [Preserve(AllMembers = true)] - [Issue(IssueTracker.Bugzilla, 58779, "[MacOS] DisplayActionSheet on MacOS needs scroll bars if list is long", PlatformAffected.All)] - public class Bugzilla58779 : TestContentPage - { - const string ButtonId = "button"; - - protected override void Init() - { - Button button = new Button - { - Text = "Click Here", - Font = Font.SystemFontOfSize(NamedSize.Large), - BorderWidth = 1, - HorizontalOptions = LayoutOptions.Center, - VerticalOptions = LayoutOptions.CenterAndExpand, - AutomationId = ButtonId, - }; - - // The root page of your application - var content = new StackLayout { - VerticalOptions = LayoutOptions.Center, - Children = { - new Label { - HorizontalTextAlignment = TextAlignment.Center, - Text = "Tap on the button to show the DisplayActionSheet with 15 items" - }, - new Label { - HorizontalTextAlignment = TextAlignment.Center, - Text = "The list of items should be scrollable and Cancel should be visible" - }, - button - - } - }; - - button.Clicked += (sender, e) => { - String[] string_array = {"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"}; - this.DisplayActionSheet("title","cancel","destruction",string_array); - }; - - Content = content; - } - - -#if UITEST - [Test] - public void Bugzilla58779Test() - { - RunningApp.WaitForElement(q => q.Marked(ButtonId)); - RunningApp.Tap(q => q.Marked(ButtonId)); - RunningApp.Screenshot ("Check list fits on screen"); - } -#endif - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs index c23d3db8..38736211 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs @@ -72,15 +72,13 @@ namespace Xamarin.Forms.Controls.Issues // These controls show a pop-up which we have to cancel/done out of before we can continue #if __ANDROID__ var cancelButtonText = "Cancel"; - RunningApp.Back(); #elif __IOS__ var cancelButtonText = "Done"; - RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); - RunningApp.Tap(q => q.Marked(cancelButtonText)); #else var cancelButtonText = "X"; #endif - + RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); + RunningApp.Tap(q => q.Marked(cancelButtonText)); } if (frameShouldRegisterTap) diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs index 080acfb7..1d23f149 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs @@ -65,15 +65,13 @@ namespace Xamarin.Forms.Controls.Issues // These controls show a pop-up which we have to cancel/done out of before we can continue #if __ANDROID__ var cancelButtonText = "Cancel"; - System.Threading.Tasks.Task.Delay(1000).Wait(); - RunningApp.Back(); #elif __IOS__ var cancelButtonText = "Done"; - RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); - RunningApp.Tap(q => q.Marked(cancelButtonText)); #else var cancelButtonText = "Cancel"; #endif + RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); + RunningApp.Tap(q => q.Marked(cancelButtonText)); } // Since InputTransparent is set to false, the start label should not have changed diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs index f3fc875c..85bd841a 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs @@ -19,32 +19,26 @@ namespace Xamarin.Forms.Controls.Issues public class RestartAppTest : TestContentPage { public const string ForceRestart = "ForceRestart"; - public const string Success = "Android CoreGallery"; - public const string RestartButton = "Restart"; + public const string Success = "Success"; protected override void Init() { - var restartButton = new Button { Text = "Restart", AutomationId = RestartButton }; - restartButton.Clicked += (sender, e) => MessagingCenter.Send(this, ForceRestart); - Content = new StackLayout { Padding = new Thickness(0, 20, 0, 0), Children = { - new Label { Text = Success }, - restartButton + new Label { Text = Success } } }; + + MessagingCenter.Send(this, ForceRestart); } #if UITEST [Test] public void ForcingRestartDoesNotCauseCrash() { - RunningApp.WaitForElement(RestartButton); - RunningApp.Tap(RestartButton); - // If the app hasn't crashed, this test has passed RunningApp.WaitForElement(Success); } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems index 30aa67b4..7da67781 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems @@ -170,7 +170,6 @@ <Compile Include="$(MSBuildThisFileDirectory)Bugzilla45215.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44500.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla46363.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Bugzilla46363_2.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla47548.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla52419.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla53834.cs" /> @@ -603,7 +602,6 @@ <Compile Include="$(MSBuildThisFileDirectory)Bugzilla52700.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39407.cs" /> <Compile Include="$(MSBuildThisFileDirectory)ButtonFastRendererTest.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Bugzilla58779.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml"> diff --git a/Xamarin.Forms.Controls/CompressedLayout.xaml b/Xamarin.Forms.Controls/CompressedLayout.xaml deleted file mode 100644 index 52704865..00000000 --- a/Xamarin.Forms.Controls/CompressedLayout.xaml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" - xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" - x:Class="Xamarin.Forms.Controls.CompressedLayout" - Padding="0,20,0,0"> - <StackLayout Padding="6" CompressedLayout.IsHeadless="true"> - <Label Text="First"/> - <StackLayout Padding="6" CompressedLayout.IsHeadless="true"> - <Label Text="Second"/> - <ContentView Padding="6" CompressedLayout.IsHeadless="true" BackgroundColor="Pink" > - <Label x:Name="this" Text="{Binding X, Source={x:Reference this}, StringFormat='Label.X:{0}'}"/> - </ContentView> - <Label Text="Fourth"/> - </StackLayout> - <Label Text="Fifth"/> - </StackLayout> -</ContentPage>
\ No newline at end of file diff --git a/Xamarin.Forms.Controls/CompressedLayout.xaml.cs b/Xamarin.Forms.Controls/CompressedLayout.xaml.cs deleted file mode 100644 index d92fd802..00000000 --- a/Xamarin.Forms.Controls/CompressedLayout.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -using Xamarin.Forms; - -namespace Xamarin.Forms.Controls -{ - public partial class CompressedLayout : ContentPage - { - public CompressedLayout() - { - InitializeComponent(); - } - } -} diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj index 5ac8b40b..eda7b852 100644 --- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj +++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj @@ -261,9 +261,6 @@ <Compile Include="GalleryPages\MacTwitterDemo.xaml.cs"> <DependentUpon>MacTwitterDemo.xaml</DependentUpon> </Compile> - <Compile Include="CompressedLayout.xaml.cs"> - <DependentUpon>CompressedLayout.xaml</DependentUpon> - </Compile> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <Import Project="..\.nuspec\Xamarin.Forms.targets" /> @@ -300,9 +297,6 @@ <EmbeddedResource Include="HanselForms\TwitterPage.xaml"> <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> - <EmbeddedResource Include="CompressedLayout.xaml"> - <Generator>MSBuild:UpdateDesignTimeXaml</Generator> - </EmbeddedResource> </ItemGroup> <Import Project="..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems" Label="Shared" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> @@ -352,4 +346,4 @@ <Copy SourceFiles="@(ConfigFile)" DestinationFiles="controlgallery.config" Condition="!Exists('controlgallery.config')" /> </Target> <Import Project="..\packages\Xamarin.Insights.1.12.3\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.3\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets')" /> -</Project> +</Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs b/Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs index 9db091e5..861d9af1 100644 --- a/Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs +++ b/Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs @@ -123,36 +123,6 @@ namespace Xamarin.Forms.Core.UnitTests Assert.AreEqual(count, 1); } - class MockVMEquals { - public string Key { get; set; } - public string Text { get; set; } - public override bool Equals(object obj) - { - var other = obj as MockVMEquals; - if (other == null) - return false; - return Key == other.Key; - } - - public override int GetHashCode() - { - return base.GetHashCode(); - } - } - - [Test] - //https://bugzilla.xamarin.com/show_bug.cgi?id=59507 - public void BindingContextChangedCompareReferences() - { - var mock = new MockBindable(); - mock.BindingContext = new MockVMEquals { Key = "Foo", Text = "Foo" }; - mock.BindingContextChanged += (sender, args) => Assert.Pass(); - - mock.BindingContext = new MockVMEquals { Key = "Foo", Text = "Bar" }; - - Assert.Fail("The BindingContextChanged event was not fired."); - } - [Test] public void ParentAndChildBindingContextChanged() { diff --git a/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs b/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs index 157b43f1..d1a43732 100644 --- a/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs +++ b/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs @@ -3,7 +3,6 @@ using System.Linq; using NUnit.Framework; using System.Collections.Generic; using Xamarin.Forms.Internals; -using System.Collections.ObjectModel; namespace Xamarin.Forms.Core.UnitTests { @@ -349,7 +348,7 @@ namespace Xamarin.Forms.Core.UnitTests [Test] public void TryGetValueLookupInMerged() { - var rd = new ResourceDictionary { + var rd = new ResourceDictionary { {"baz", "BAZ"}, {"qux", "QUX"}, }; @@ -358,114 +357,6 @@ namespace Xamarin.Forms.Core.UnitTests object _; Assert.That(rd.TryGetValue("foo", out _), Is.True); Assert.That(rd.TryGetValue("baz", out _), Is.True); - } - - [Test] - public void MergedDictionaryResourcesAreFound() - { - var rd0 = new ResourceDictionary(); - rd0.MergedDictionaries.Add(new ResourceDictionary() { { "foo", "bar" } }); - - object value; - Assert.True(rd0.TryGetValue("foo", out value)); - Assert.AreEqual("bar", value); - } - - [Test] - public void MergedDictionaryResourcesAreFoundLastDictionaryTakesPriority() - { - var rd0 = new ResourceDictionary(); - rd0.MergedDictionaries.Add(new ResourceDictionary() { { "foo", "bar" } }); - rd0.MergedDictionaries.Add(new ResourceDictionary() { { "foo", "bar1" } }); - rd0.MergedDictionaries.Add(new ResourceDictionary() { { "foo", "bar2" } }); - - object value; - Assert.True(rd0.TryGetValue("foo", out value)); - Assert.AreEqual("bar2", value); - } - - [Test] - public void CountDoesNotIncludeMergedDictionaries() - { - var rd = new ResourceDictionary { - {"baz", "Baz"}, - {"qux", "Qux"}, - }; - rd.MergedDictionaries.Add(new ResourceDictionary() { { "foo", "bar" } }); - - Assert.That(rd.Count, Is.EqualTo(2)); - } - - [Test] - public void ClearMergedDictionaries() - { - var rd = new ResourceDictionary { - {"baz", "Baz"}, - {"qux", "Qux"}, - }; - rd.MergedDictionaries.Add(new ResourceDictionary() { { "foo", "bar" } }); - - Assert.That(rd.Count, Is.EqualTo(2)); - - rd.MergedDictionaries.Clear(); - - Assert.That(rd.MergedDictionaries.Count, Is.EqualTo(0)); - } - - [Test] - public void AddingMergedRDTriggersValueChanged() - { - var rd = new ResourceDictionary(); - var label = new Label { - Resources = rd - }; - label.SetDynamicResource(Label.TextProperty, "foo"); - Assert.That(label.Text, Is.EqualTo(Label.TextProperty.DefaultValue)); - - rd.MergedDictionaries.Add(new ResourceDictionary { { "foo", "Foo"} }); - Assert.That(label.Text, Is.EqualTo("Foo")); - } - - [Test] - //this is to keep the alignment with resources removed from RD - public void RemovingMergedRDDoesntTriggersValueChanged() - { - var rd = new ResourceDictionary { - MergedDictionaries = { - new ResourceDictionary { - { "foo", "Foo" } - } - } - }; - var label = new Label { - Resources = rd, - }; - - label.SetDynamicResource(Label.TextProperty, "foo"); - Assert.That(label.Text, Is.EqualTo("Foo")); - - rd.MergedDictionaries.Clear(); - Assert.That(label.Text, Is.EqualTo("Foo")); - } - - [Test] - public void AddingResourceInMergedRDTriggersValueChanged() - { - var rd0 = new ResourceDictionary (); - var rd = new ResourceDictionary { - MergedDictionaries = { - rd0 - } - }; - - var label = new Label { - Resources = rd, - }; - label.SetDynamicResource(Label.TextProperty, "foo"); - Assert.That(label.Text, Is.EqualTo(Label.TextProperty.DefaultValue)); - - rd0.Add("foo", "Foo"); - Assert.That(label.Text, Is.EqualTo("Foo")); - } +} } }
\ No newline at end of file diff --git a/Xamarin.Forms.Core/Application.cs b/Xamarin.Forms.Core/Application.cs index b084b52a..5df8ad6c 100644 --- a/Xamarin.Forms.Core/Application.cs +++ b/Xamarin.Forms.Core/Application.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Threading; using System.ComponentModel; using System.Threading.Tasks; using Xamarin.Forms.Internals; @@ -16,13 +15,14 @@ namespace Xamarin.Forms readonly Lazy<PlatformConfigurationRegistry<Application>> _platformConfigurationRegistry; IAppIndexingProvider _appIndexProvider; + bool _isSaving; ReadOnlyCollection<Element> _logicalChildren; Page _mainPage; ResourceDictionary _resources; - static SemaphoreSlim SaveSemaphore = new SemaphoreSlim(1, 1); + bool _saveAgain; protected Application() { @@ -304,16 +304,16 @@ namespace Xamarin.Forms async Task SetPropertiesAsync() { - await SaveSemaphore.WaitAsync(); - try - { - await DependencyService.Get<IDeserializer>().SerializePropertiesAsync(Properties); - } - finally - { - SaveSemaphore.Release(); - } - + if (_isSaving) + { + _saveAgain = true; + return; + } + _isSaving = true; + await DependencyService.Get<IDeserializer>().SerializePropertiesAsync(Properties); + if (_saveAgain) + await DependencyService.Get<IDeserializer>().SerializePropertiesAsync(Properties); + _isSaving = _saveAgain = false; } class NavigationImpl : NavigationProxy diff --git a/Xamarin.Forms.Core/BindableObject.cs b/Xamarin.Forms.Core/BindableObject.cs index 1df88b7d..755ad8f0 100644 --- a/Xamarin.Forms.Core/BindableObject.cs +++ b/Xamarin.Forms.Core/BindableObject.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; -using System.Reflection; using System.Runtime.CompilerServices; using Xamarin.Forms.Internals; @@ -553,7 +552,7 @@ namespace Xamarin.Forms bool clearOneWayBindings = (attributes & SetValueFlags.ClearOneWayBindings) != 0; bool clearTwoWayBindings = (attributes & SetValueFlags.ClearTwoWayBindings) != 0; - bool same = ReferenceEquals(context.Property, BindingContextProperty) ? ReferenceEquals(value, original) : Equals(value, original); + bool same = Equals(value, original); if (!silent && (!same || raiseOnEqual)) { if (property.PropertyChanging != null) diff --git a/Xamarin.Forms.Core/CompressedLayout.cs b/Xamarin.Forms.Core/CompressedLayout.cs deleted file mode 100644 index bd93b560..00000000 --- a/Xamarin.Forms.Core/CompressedLayout.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.ComponentModel; - -namespace Xamarin.Forms -{ - public static class CompressedLayout - { - public static readonly BindableProperty IsHeadlessProperty = - BindableProperty.Create("IsHeadless", typeof(bool), typeof(CompressedLayout), default(bool), - propertyChanged: OnIsHeadlessPropertyChanged); - - public static bool GetIsHeadless(BindableObject bindable) - => (bool)bindable.GetValue(IsHeadlessProperty); - - public static void SetIsHeadless(BindableObject bindable, bool value) - => bindable.SetValue(IsHeadlessProperty, value); - - static void OnIsHeadlessPropertyChanged(BindableObject bindable, object oldValue, object newValue) - { - var ve = bindable as IVisualElementController; - if (ve == null) - return; - if (ve.IsPlatformEnabled) - throw new InvalidOperationException("IsHeadless can not be modified when the view is rendered"); - } - - static readonly BindablePropertyKey HeadlessOffsetPropertyKey = - BindableProperty.CreateReadOnly("HeadlessOffset", typeof(Point), typeof(CompressedLayout), default(Point)); - - [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty HeadlessOffsetProperty = HeadlessOffsetPropertyKey.BindableProperty; - - [EditorBrowsable(EditorBrowsableState.Never)] - public static Point GetHeadlessOffset(BindableObject bindable) - => (Point)bindable.GetValue(HeadlessOffsetProperty); - - internal static void SetHeadlessOffset(BindableObject bindable, Point value) - => bindable.SetValue(HeadlessOffsetPropertyKey, value); - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Core/Device.cs b/Xamarin.Forms.Core/Device.cs index f1b35544..a0cd0bdc 100644 --- a/Xamarin.Forms.Core/Device.cs +++ b/Xamarin.Forms.Core/Device.cs @@ -211,4 +211,4 @@ namespace Xamarin.Forms public static readonly Style CaptionStyle = new Style(typeof(Label)) { BaseResourceKey = CaptionStyleKey }; } } -} +}
\ No newline at end of file diff --git a/Xamarin.Forms.Core/Layout.cs b/Xamarin.Forms.Core/Layout.cs index 537fd971..29565b7c 100644 --- a/Xamarin.Forms.Core/Layout.cs +++ b/Xamarin.Forms.Core/Layout.cs @@ -237,11 +237,6 @@ namespace Xamarin.Forms double w = Math.Max(0, width - Padding.HorizontalThickness); double h = Math.Max(0, height - Padding.VerticalThickness); - var isHeadless = CompressedLayout.GetIsHeadless(this); - var headlessOffset = CompressedLayout.GetHeadlessOffset(this); - for (var i = 0; i < LogicalChildrenInternal.Count; i++) - CompressedLayout.SetHeadlessOffset((VisualElement)LogicalChildrenInternal[i], isHeadless ? new Point(headlessOffset.X + Bounds.X, headlessOffset.Y + Bounds.Y) : new Point()); - LayoutChildren(x, y, w, h); for (var i = 0; i < oldBounds.Length; i++) @@ -250,7 +245,9 @@ namespace Xamarin.Forms Rectangle newBound = ((VisualElement)LogicalChildrenInternal[i]).Bounds; if (oldBound != newBound) { - LayoutChanged?.Invoke(this, EventArgs.Empty); + EventHandler handler = LayoutChanged; + if (handler != null) + handler(this, EventArgs.Empty); return; } } diff --git a/Xamarin.Forms.Core/PlatformConfiguration/macOSSpecific/NavigationPage.cs b/Xamarin.Forms.Core/PlatformConfiguration/macOSSpecific/NavigationPage.cs deleted file mode 100644 index 1e424b38..00000000 --- a/Xamarin.Forms.Core/PlatformConfiguration/macOSSpecific/NavigationPage.cs +++ /dev/null @@ -1,56 +0,0 @@ -namespace Xamarin.Forms.PlatformConfiguration.macOSSpecific -{ - using FormsElement = Forms.NavigationPage; - - public static class NavigationPage - { - public static readonly BindableProperty NavigationTransitionPushStyleProperty = BindableProperty.Create("NavigationTransitionPushStyle", typeof(NavigationTransitionStyle), typeof(NavigationPage), NavigationTransitionStyle.SlideForward); - public static readonly BindableProperty NavigationTransitionPopStyleProperty = BindableProperty.Create("NavigationTransitionPopStyle", typeof(NavigationTransitionStyle), typeof(NavigationPage), NavigationTransitionStyle.SlideBackward); - - #region PushStyle - public static NavigationTransitionStyle GetNavigationTransitionPushStyle(BindableObject element) - { - return (NavigationTransitionStyle)element.GetValue(NavigationTransitionPushStyleProperty); - } - - public static void SetNavigationTransitionPushStyle(BindableObject element, NavigationTransitionStyle value) - { - element.SetValue(NavigationTransitionPushStyleProperty, value); - } - - public static NavigationTransitionStyle GetNavigationTransitionPushStyle(this IPlatformElementConfiguration<macOS, FormsElement> config) - { - return GetNavigationTransitionPushStyle(config.Element); - } - #endregion - - #region PopStyle - public static NavigationTransitionStyle GetNavigationTransitionPopStyle(BindableObject element) - { - return (NavigationTransitionStyle)element.GetValue(NavigationTransitionPopStyleProperty); - } - - public static void SetNavigationTransitionPopStyle(BindableObject element, NavigationTransitionStyle value) - { - element.SetValue(NavigationTransitionPopStyleProperty, value); - } - - public static NavigationTransitionStyle GetNavigationTransitionPopStyle(this IPlatformElementConfiguration<macOS, FormsElement> config) - { - return GetNavigationTransitionPopStyle(config.Element); - } - #endregion - - public static void SetNavigationTransitionStyle(BindableObject element, NavigationTransitionStyle pushStyle, NavigationTransitionStyle popStyle) - { - SetNavigationTransitionPushStyle(element, pushStyle); - SetNavigationTransitionPopStyle(element, popStyle); - } - - public static IPlatformElementConfiguration<macOS, FormsElement> SetNavigationTransitionStyle(this IPlatformElementConfiguration<macOS, FormsElement> config, NavigationTransitionStyle pushStyle, NavigationTransitionStyle popStyle) - { - SetNavigationTransitionStyle(config.Element, pushStyle, popStyle); - return config; - } - } -} diff --git a/Xamarin.Forms.Core/PlatformConfiguration/macOSSpecific/NavigationTransitionStyle.cs b/Xamarin.Forms.Core/PlatformConfiguration/macOSSpecific/NavigationTransitionStyle.cs deleted file mode 100644 index 06d80ded..00000000 --- a/Xamarin.Forms.Core/PlatformConfiguration/macOSSpecific/NavigationTransitionStyle.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Xamarin.Forms.PlatformConfiguration.macOSSpecific -{ - public enum NavigationTransitionStyle - { - None, - Crossfade, - SlideUp, - SlideDown, - SlideLeft, - SlideRight, - SlideForward, - SlideBackward - } -} diff --git a/Xamarin.Forms.Core/ResourceDictionary.cs b/Xamarin.Forms.Core/ResourceDictionary.cs index b3cb3214..2fc11ffc 100644 --- a/Xamarin.Forms.Core/ResourceDictionary.cs +++ b/Xamarin.Forms.Core/ResourceDictionary.cs @@ -5,8 +5,6 @@ using System.Runtime.CompilerServices; using System.Linq; using System.Reflection; using Xamarin.Forms.Internals; -using System.Collections.ObjectModel; -using System.Collections.Specialized; namespace Xamarin.Forms { @@ -14,13 +12,12 @@ namespace Xamarin.Forms { static ConditionalWeakTable<Type, ResourceDictionary> s_instances = new ConditionalWeakTable<Type, ResourceDictionary>(); readonly Dictionary<string, object> _innerDictionary = new Dictionary<string, object>(); - ResourceDictionary _mergedInstance; - Type _mergedWith; + Type _mergedWith; [TypeConverter (typeof(TypeTypeConverter))] public Type MergedWith { get { return _mergedWith; } - set { + set { if (_mergedWith == value) return; @@ -31,69 +28,12 @@ namespace Xamarin.Forms if (_mergedWith == null) return; - _mergedInstance = s_instances.GetValue(_mergedWith, (key) => (ResourceDictionary)Activator.CreateInstance(key)); - OnValuesChanged(_mergedInstance.ToArray()); - } - } - - ICollection<ResourceDictionary> _mergedDictionaries; - public ICollection<ResourceDictionary> MergedDictionaries { - get { - if (_mergedDictionaries == null) { - var col = new ObservableCollection<ResourceDictionary>(); - col.CollectionChanged += MergedDictionaries_CollectionChanged; - _mergedDictionaries = col; - } - return _mergedDictionaries; - } - } - - IList<ResourceDictionary> _collectionTrack; - - void MergedDictionaries_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) - { - // Move() isn't exposed by ICollection - if (e.Action == NotifyCollectionChangedAction.Move) - return; - - _collectionTrack = _collectionTrack ?? new List<ResourceDictionary>(); - // Collection has been cleared - if (e.Action == NotifyCollectionChangedAction.Reset) { - foreach (var dictionary in _collectionTrack) - dictionary.ValuesChanged -= Item_ValuesChanged; - - _collectionTrack.Clear(); - return; - } - - // New Items - if (e.NewItems != null) - { - foreach (var item in e.NewItems) - { - var rd = (ResourceDictionary)item; - _collectionTrack.Add(rd); - rd.ValuesChanged += Item_ValuesChanged; - OnValuesChanged(rd.ToArray()); - } - } - - // Old Items - if (e.OldItems != null) - { - foreach (var item in e.OldItems) - { - var rd = (ResourceDictionary)item; - rd.ValuesChanged -= Item_ValuesChanged; - _collectionTrack.Remove(rd); - } + _mergedInstance = s_instances.GetValue(_mergedWith,(key) => (ResourceDictionary)Activator.CreateInstance(key)); + OnValuesChanged (_mergedInstance.ToArray()); } } - void Item_ValuesChanged(object sender, ResourcesChangedEventArgs e) - { - OnValuesChanged(e.Values.ToArray()); - } + ResourceDictionary _mergedInstance; void ICollection<KeyValuePair<string, object>>.Add(KeyValuePair<string, object> item) { @@ -154,10 +94,6 @@ namespace Xamarin.Forms return _innerDictionary[index]; if (_mergedInstance != null && _mergedInstance.ContainsKey(index)) return _mergedInstance[index]; - if (MergedDictionaries != null) - foreach (var dict in MergedDictionaries.Reverse()) - if (dict.ContainsKey(index)) - return dict[index]; throw new KeyNotFoundException($"The resource '{index}' is not present in the dictionary."); } set @@ -194,9 +130,6 @@ namespace Xamarin.Forms internal IEnumerable<KeyValuePair<string, object>> MergedResources { get { - if (MergedDictionaries != null) - foreach (var r in MergedDictionaries.Reverse().SelectMany(x => x.MergedResources)) - yield return r; if (_mergedInstance != null) foreach (var r in _mergedInstance.MergedResources) yield return r; @@ -207,19 +140,7 @@ namespace Xamarin.Forms public bool TryGetValue(string key, out object value) { - return _innerDictionary.TryGetValue(key, out value) - || (_mergedInstance != null && _mergedInstance.TryGetValue(key, out value)) - || (MergedDictionaries != null && TryGetMergedDictionaryValue(key, out value)); - } - - bool TryGetMergedDictionaryValue(string key, out object value) - { - foreach (var dictionary in MergedDictionaries.Reverse()) - if (dictionary.TryGetValue(key, out value)) - return true; - - value = null; - return false; + return _innerDictionary.TryGetValue(key, out value) || (_mergedInstance != null && _mergedInstance.TryGetValue(key, out value)); } event EventHandler<ResourcesChangedEventArgs> IResourceDictionary.ValuesChanged diff --git a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj index 796f043e..13db8128 100644 --- a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj +++ b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj @@ -473,9 +473,6 @@ <Compile Include="Xaml\TypeConversionExtensions.cs" /> <Compile Include="Xaml\ValueConverterProvider.cs" /> <Compile Include="PlatformConfiguration\macOSSpecific\Page.cs" /> - <Compile Include="CompressedLayout.cs" /> - <Compile Include="PlatformConfiguration\macOSSpecific\NavigationPage.cs" /> - <Compile Include="PlatformConfiguration\macOSSpecific\NavigationTransitionStyle.cs" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <ItemGroup> diff --git a/Xamarin.Forms.Maps.Android/MapRenderer.cs b/Xamarin.Forms.Maps.Android/MapRenderer.cs index 79e5cc28..138cd57d 100644 --- a/Xamarin.Forms.Maps.Android/MapRenderer.cs +++ b/Xamarin.Forms.Maps.Android/MapRenderer.cs @@ -15,7 +15,8 @@ using Math = System.Math; namespace Xamarin.Forms.Maps.Android { - public class MapRenderer : ViewRenderer<Map, MapView>, GoogleMap.IOnCameraMoveListener, IOnMapReadyCallback + public class MapRenderer : ViewRenderer<Map, MapView>, + GoogleMap.IOnCameraChangeListener, IOnMapReadyCallback { const string MoveMessageName = "MapMoveToRegion"; @@ -41,6 +42,11 @@ namespace Xamarin.Forms.Maps.Android set { s_bundle = value; } } + public void OnCameraChange(CameraPosition pos) + { + UpdateVisibleRegion(pos.Target); + } + public override SizeRequest GetDesiredSize(int widthConstraint, int heightConstraint) { return new SizeRequest(new Size(Context.ToPixels(40), Context.ToPixels(40))); @@ -71,7 +77,7 @@ namespace Xamarin.Forms.Maps.Android if (NativeMap != null) { NativeMap.MyLocationEnabled = false; - NativeMap.SetOnCameraMoveListener(null); + NativeMap.SetOnCameraChangeListener(null); NativeMap.InfoWindowClick -= MapOnMarkerClick; NativeMap.Dispose(); NativeMap = null; @@ -103,7 +109,7 @@ namespace Xamarin.Forms.Maps.Android if (NativeMap != null) { - NativeMap.SetOnCameraMoveListener(null); + NativeMap.SetOnCameraChangeListener(null); NativeMap.InfoWindowClick -= MapOnMarkerClick; NativeMap = null; } @@ -183,7 +189,7 @@ namespace Xamarin.Forms.Maps.Android return; } - map.SetOnCameraMoveListener(this); + map.SetOnCameraChangeListener(this); map.InfoWindowClick += MapOnMarkerClick; map.UiSettings.ZoomControlsEnabled = Map.HasZoomEnabled; @@ -387,10 +393,5 @@ namespace Xamarin.Forms.Maps.Android NativeMap = map; OnMapReady(map); } - - void GoogleMap.IOnCameraMoveListener.OnCameraMove() - { - UpdateVisibleRegion(NativeMap.CameraPosition.Target); - } } } diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj index 1948eea7..aa1a9e9e 100644 --- a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj +++ b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -66,57 +65,37 @@ <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> - <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Base.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Basement.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.GooglePlayServices.Maps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Maps.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Maps.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.GooglePlayServices.Tasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Annotations"> - <HintPath>..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.UI"> - <HintPath>..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.Utils"> - <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Media.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Fragment"> - <HintPath>..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v4"> - <HintPath>..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v7.Palette"> - <HintPath>..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Vector.Drawable"> - <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable"> - <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> + <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Base.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.AppCompat"> - <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> + <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.MediaRouter"> - <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> + <Reference Include="Xamarin.GooglePlayServices.Maps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <ItemGroup> @@ -151,22 +130,13 @@ </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> + <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Maps.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Maps.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Maps.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Maps.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets'))" /> + <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" /> </Target> - <Import Project="..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets')" /> - <Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets')" /> - <Import Project="..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets')" /> - <Import Project="..\packages\Xamarin.GooglePlayServices.Maps.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Maps.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Maps.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Maps.targets')" /> - <Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.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"> @@ -174,15 +144,4 @@ <Target Name="AfterBuild"> </Target> --> - <Import Project="..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets')" /> </Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Maps.Android/packages.config b/Xamarin.Forms.Maps.Android/packages.config index 192c3f33..7fe2b876 100644 --- a/Xamarin.Forms.Maps.Android/packages.config +++ b/Xamarin.Forms.Maps.Android/packages.config @@ -1,20 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.AppCompat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.MediaRouter" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.Palette" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Build.Download" version="0.4.7" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Base" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Basement" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Maps" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Tasks" version="42.1021.1" targetFramework="monoandroid71" /> + <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid60" /> + <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid60" /> + <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid60" /> </packages>
\ No newline at end of file diff --git a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj index 3eceb9e9..61dadbf9 100644 --- a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj +++ b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj @@ -17,7 +17,6 @@ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <NuGetPackageImportStamp> </NuGetPackageImportStamp> - <XFDisableTargetsValidation>True</XFDisableTargetsValidation> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -106,4 +105,4 @@ <Target Name="AfterBuild"> </Target> --> -</Project> +</Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs b/Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs index df9b4e9d..975e65fb 100644 --- a/Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs +++ b/Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs @@ -1,19 +1,19 @@ using System; -using Android.Util; -using Android.App; +using System.Threading.Tasks; using Android.Content; -using Android.Gms.Tasks; +using Android.Gms.AppIndexing; +using Android.Gms.Common.Apis; using Android.Runtime; -using Firebase.AppIndexing; -using Actions = Firebase.AppIndexing.Builders.Actions; -using GMSTask = Android.Gms.Tasks.Task; -using IndexingAction = Firebase.AppIndexing.IAction; +using IndexingAction = Android.Gms.AppIndexing.Action; +using Android.App; namespace Xamarin.Forms.Platform.Android.AppLinks { [Preserve(AllMembers = true)] public class AndroidAppLinks : IAppLinks, IDisposable { + readonly GoogleApiClient _client; + bool _disposed; public static bool IsInitialized { get; private set; } @@ -31,6 +31,8 @@ namespace Xamarin.Forms.Platform.Android.AppLinks public AndroidAppLinks(Context context) { + _client = new GoogleApiClient.Builder(context).AddApi(AppIndex.API).Build(); + _client.Connect(); } public void DeregisterLink(IAppLinkEntry appLink) @@ -43,10 +45,9 @@ namespace Xamarin.Forms.Platform.Android.AppLinks RemoveFromIndexItemAsync(appLinkUri.ToString()); } - public void RegisterLink(IAppLinkEntry appLink) + public async void RegisterLink(IAppLinkEntry appLink) { - IndexItemAsync(appLink); - + await IndexItemAsync(appLink); } public void Dispose() @@ -59,95 +60,54 @@ namespace Xamarin.Forms.Platform.Android.AppLinks if (isDisposing && !_disposed) { _disposed = true; + _client.Disconnect(); + _client.Dispose(); } } - void IndexItemAsync(IAppLinkEntry appLink) + static IndexingAction BuildIndexAction(IAppLinkEntry appLink) { - //IndexingAction indexAction = BuildIndexAction(appLink); - var url = global::Android.Net.Uri.Parse(appLink.AppLinkUri.AbsoluteUri).ToString(); - IIndexable indexable = GetIndexable(appLink, url); - IndexingAction indexAction = GetAction(appLink, url); - /* If you’re logging an action on an item that has already been added to the index, - * you don’t have to add the following update line. See - * https://firebase.google.com/docs/app-indexing/android/personal-content#update-the-index for - * adding content to the index - */ - FirebaseAppIndex.Instance.Update(indexable); - GMSTask gmsTask = FirebaseUserActions.Instance - .Start(indexAction) - .AddOnSuccessListener(Context as Activity, - new AndroidActionSuccessListener(appLink as AppLinkEntry, indexAction)) - .AddOnFailureListener(Context as Activity, - new AndroidActionFailureListener(appLink as AppLinkEntry, indexAction)); + Thing item = new Thing.Builder().SetName(appLink.Title).SetDescription(appLink.Description).SetUrl(global::Android.Net.Uri.Parse(appLink.AppLinkUri.AbsoluteUri)).Build(); + Thing thing = new IndexingAction.Builder(IndexingAction.TypeView).SetObject(item).SetActionStatus(IndexingAction.StatusTypeCompleted).Build(); + var indexAction = thing.JavaCast<IndexingAction>(); + return indexAction; } - void RemoveFromIndexItemAsync(string identifier) + async Task IndexItemAsync(IAppLinkEntry appLink) { - FirebaseAppIndex.Instance.Remove(identifier); - } + IndexingAction indexAction = BuildIndexAction(appLink); - IIndexable GetIndexable(IAppLinkEntry appLink, string url) - { - var indexableBuilder = new IndexableBuilder(); - indexableBuilder.SetName(appLink.Title); - indexableBuilder.SetUrl(url); - indexableBuilder.SetDescription(appLink.Description); - return indexableBuilder.Build(); - } - - IndexingAction GetAction(IAppLinkEntry applink, string url) - { - return Actions.NewView(applink.Title, url); - } - - internal class AndroidActionSuccessListener : Java.Lang.Object, IOnSuccessListener - { - readonly AppLinkEntry appLink; - readonly IndexingAction indexAction; - - public AndroidActionSuccessListener(AppLinkEntry appLink, IndexingAction indexAction) - { - this.appLink = appLink; - this.indexAction = indexAction; - } - - public void OnSuccess(Java.Lang.Object result) + if (_client.IsConnected && appLink.IsLinkActive) { - if (appLink != null) + Statuses resultStart = await AppIndex.AppIndexApi.StartAsync(_client, indexAction); + if (resultStart.IsSuccess) { - appLink.PropertyChanged += (sender, e) => + var aL = appLink as AppLinkEntry; + if (aL != null) { - if (e.PropertyName == AppLinkEntry.IsLinkActiveProperty.PropertyName) + aL.PropertyChanged += async (sender, e) => { - if (appLink.IsLinkActive) - { - FirebaseUserActions.Instance.Start(indexAction); - } - else + if (e.PropertyName == AppLinkEntry.IsLinkActiveProperty.PropertyName) { - FirebaseUserActions.Instance.End(indexAction); + if (appLink.IsLinkActive) + { + await AppIndex.AppIndexApi.StartAsync(_client, indexAction); + } + else + { + await AppIndex.AppIndexApi.EndAsync(_client, indexAction); + } } - } - }; + }; + } } } } - internal class AndroidActionFailureListener : Java.Lang.Object, IOnFailureListener - { - readonly AppLinkEntry appLink; - readonly IndexingAction indexAction; - - public AndroidActionFailureListener(AppLinkEntry appLink, IndexingAction indexAction) - { - this.appLink = appLink; - this.indexAction = indexAction; - } - public void OnFailure(Java.Lang.Exception e) + void RemoveFromIndexItemAsync(string identifier) + { + if (_client.IsConnected) { - Log.Error(this.Class.Name, e, $" [{DateTime.Now}] - [AndroidAppLinks Failure] - {e.Message}"); - throw e; } } } diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj index a7c4107a..d05031c4 100644 --- a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj +++ b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -15,8 +14,6 @@ <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AssemblyName>Xamarin.Forms.Platform.Android.AppLinks</AssemblyName> <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -43,50 +40,17 @@ <Reference Include="System.Xml" /> <Reference Include="System.Core" /> <Reference Include="Mono.Android" /> - <Reference Include="Xamarin.Firebase.AppIndexing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\lib\MonoAndroid70\Xamarin.Firebase.AppIndexing.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.GooglePlayServices.Basement"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath> </Reference> - <Reference Include="Xamarin.Firebase.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Firebase.Common.42.1021.1\lib\MonoAndroid70\Xamarin.Firebase.Common.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.GooglePlayServices.Base"> + <HintPath>..\packages\Xamarin.GooglePlayServices.Base.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath> </Reference> - <Reference Include="Xamarin.GooglePlayServices.AppIndexing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.AppIndexing.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.AppIndexing.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Base.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Basement.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.GooglePlayServices.Tasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Android.Support.Annotations"> - <HintPath>..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.UI"> - <HintPath>..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.Utils"> - <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Media.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Fragment"> - <HintPath>..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath> + <Reference Include="Xamarin.GooglePlayServices.AppIndexing"> + <HintPath>..\packages\Xamarin.GooglePlayServices.AppIndexing.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppIndexing.dll</HintPath> </Reference> <Reference Include="Xamarin.Android.Support.v4"> - <HintPath>..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -95,8 +59,8 @@ <Compile Include="AndroidAppLinks.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="Resources\AboutResources.txt" /> + <None Include="packages.config" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\Strings.xml" /> @@ -108,28 +72,4 @@ <Name>Xamarin.Forms.Core</Name> </ProjectReference> </ItemGroup> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props'))" /> - <Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets'))" /> - </Target> - <Import Project="..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Basement.targets')" /> - <Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.targets')" /> - <Import Project="..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets" Condition="Exists('..\packages\Xamarin.Firebase.Common.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.Common.targets')" /> - <Import Project="..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.42.1021.1\build\MonoAndroid70\Xamarin.GooglePlayServices.Base.targets')" /> - <Import Project="..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets" Condition="Exists('..\packages\Xamarin.Firebase.AppIndexing.42.1021.1\build\MonoAndroid70\Xamarin.Firebase.AppIndexing.targets')" /> - <Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" /> </Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Android.AppLinks/packages.config b/Xamarin.Forms.Platform.Android.AppLinks/packages.config index 13d5e8c8..b488c682 100644 --- a/Xamarin.Forms.Platform.Android.AppLinks/packages.config +++ b/Xamarin.Forms.Platform.Android.AppLinks/packages.config @@ -1,17 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Build.Download" version="0.4.7" targetFramework="monoandroid71" /> - <package id="Xamarin.Firebase.AppIndexing" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.Firebase.Common" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.AppIndexing" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Base" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Basement" version="42.1021.1" targetFramework="monoandroid71" /> - <package id="Xamarin.GooglePlayServices.Tasks" version="42.1021.1" targetFramework="monoandroid71" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="MonoAndroid60" /> + <package id="Xamarin.GooglePlayServices.AppIndexing" version="29.0.0.1" targetFramework="MonoAndroid60" /> + <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="MonoAndroid60" /> + <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="MonoAndroid60" /> </packages>
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj b/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj index bf7ef2b1..2fb860b3 100644 --- a/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj +++ b/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj @@ -53,7 +53,6 @@ <Reference Include="Mono.Android" /> <Reference Include="System" /> <Reference Include="System.Core" /> - <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs"> diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs index ed28656e..26024613 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs @@ -22,7 +22,6 @@ using AColor = Android.Graphics.Color; using AlertDialog = Android.Support.V7.App.AlertDialog; using ARelativeLayout = Android.Widget.RelativeLayout; using Xamarin.Forms.Internals; -using System.Threading.Tasks; #endregion @@ -170,7 +169,7 @@ namespace Xamarin.Forms.Platform.Android callback(resultCode, data); } - protected override async void OnCreate(Bundle savedInstanceState) + protected override void OnCreate(Bundle savedInstanceState) { if (!AllowFragmentRestore) { @@ -202,7 +201,7 @@ namespace Xamarin.Forms.Platform.Android _previousState = _currentState; _currentState = AndroidApplicationLifecycleState.OnCreate; - await OnStateChanged(); + OnStateChanged(); if (Forms.IsLollipopOrNewer) { @@ -229,7 +228,7 @@ namespace Xamarin.Forms.Platform.Android CheckForAppLink(intent); } - protected override async void OnPause() + protected override void OnPause() { _layout.HideKeyboard(true); @@ -242,20 +241,20 @@ namespace Xamarin.Forms.Platform.Android _previousState = _currentState; _currentState = AndroidApplicationLifecycleState.OnPause; - await OnStateChanged(); + OnStateChanged(); } - protected override async void OnRestart() + protected override void OnRestart() { base.OnRestart(); _previousState = _currentState; _currentState = AndroidApplicationLifecycleState.OnRestart; - await OnStateChanged(); + OnStateChanged(); } - protected override async void OnResume() + protected override void OnResume() { // counterpart to OnPause base.OnResume(); @@ -271,24 +270,24 @@ namespace Xamarin.Forms.Platform.Android _previousState = _currentState; _currentState = AndroidApplicationLifecycleState.OnResume; - await OnStateChanged(); + OnStateChanged(); } - protected override async void OnStart() + protected override void OnStart() { base.OnStart(); _previousState = _currentState; _currentState = AndroidApplicationLifecycleState.OnStart; - await OnStateChanged(); + OnStateChanged(); } // Scenarios that stop and restart your app // -- Switches from your app to another app, activity restarts when clicking on the app again. // -- Action in your app that starts a new Activity, the current activity is stopped and the second is created, pressing back restarts the activity // -- The user receives a phone call while using your app on his or her phone - protected override async void OnStop() + protected override void OnStop() { // writing to storage happens here! // full UI obstruction @@ -301,7 +300,7 @@ namespace Xamarin.Forms.Platform.Android _previousState = _currentState; _currentState = AndroidApplicationLifecycleState.OnStop; - await OnStateChanged(); + OnStateChanged(); } void AppOnPropertyChanged(object sender, PropertyChangedEventArgs args) @@ -388,7 +387,7 @@ namespace Xamarin.Forms.Platform.Android UpdateProgressBarVisibility(_busyCount > 0); } - async Task OnStateChanged() + async void OnStateChanged() { if (_application == null) return; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs index 16fe6f6f..8c7059d3 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs @@ -69,6 +69,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat { // But first, if the previous occupant of this container was a fragment, we need to remove it properly FragmentTransaction transaction = FragmentManager.BeginTransaction(); + transaction.DisallowAddToBackStack(); transaction.Remove(_currentFragment); transaction.SetTransition((int)FragmentTransit.None); @@ -96,6 +97,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat }); FragmentTransaction transaction = FragmentManager.BeginTransaction(); + transaction.DisallowAddToBackStack(); if (_currentFragment != null) { @@ -139,6 +141,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat if (_currentFragment != null && !FragmentManager.IsDestroyed) { FragmentTransaction transaction = FragmentManager.BeginTransaction(); + transaction.DisallowAddToBackStack(); transaction.Remove(_currentFragment); transaction.SetTransition((int)FragmentTransit.None); transaction.CommitAllowingStateLoss(); diff --git a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs index 458dc2f0..e262c605 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs @@ -642,6 +642,8 @@ namespace Xamarin.Forms.Platform.Android.AppCompat if (animated) SetupPageTransition(transaction, !removed); + transaction.DisallowAddToBackStack(); + if (_fragmentStack.Count == 0) { transaction.Add(Id, fragment); diff --git a/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs index 7352e319..78fc19cb 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs @@ -113,7 +113,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat if (_tabLayout != null) { - _tabLayout.AddOnTabSelectedListener(null); + _tabLayout.SetOnTabSelectedListener(null); _tabLayout.Dispose(); _tabLayout = null; } @@ -272,7 +272,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat { tabs.SetupWithViewPager(pager); UpdateTabIcons(); - tabs.AddOnTabSelectedListener(this); + tabs.SetOnTabSelectedListener(this); } UpdateIgnoreContainerAreas(); diff --git a/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs b/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs index 46b3321d..44f2bbbc 100644 --- a/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs @@ -242,13 +242,7 @@ namespace Xamarin.Forms.Platform.Android // LongClick handling from happening. So we need to watch locally for LongPress and if we see it, // trigger the LongClick manually. _watchForLongPress = _viewCell.ContextActions.Count > 0 - && HasTapGestureRecognizers(vw); - } - - static bool HasTapGestureRecognizers(View view) - { - return view.GestureRecognizers.Any(t => t is TapGestureRecognizer) - || view.LogicalChildren.OfType<View>().Any(HasTapGestureRecognizers); + && vw.GestureRecognizers.Any(t => t is TapGestureRecognizer); } void TriggerLongClick() diff --git a/Xamarin.Forms.Platform.Android/Deserializer.cs b/Xamarin.Forms.Platform.Android/Deserializer.cs index ccce9cdf..c85aaa73 100644 --- a/Xamarin.Forms.Platform.Android/Deserializer.cs +++ b/Xamarin.Forms.Platform.Android/Deserializer.cs @@ -20,28 +20,22 @@ namespace Xamarin.Forms.Platform.Android return Task.Run(() => { using (IsolatedStorageFile store = IsolatedStorageFile.GetUserStoreForApplication()) + using (IsolatedStorageFileStream stream = store.OpenFile(PropertyStoreFile, System.IO.FileMode.OpenOrCreate)) + using (XmlDictionaryReader reader = XmlDictionaryReader.CreateBinaryReader(stream, XmlDictionaryReaderQuotas.Max)) { - if (!store.FileExists(PropertyStoreFile)) + if (stream.Length == 0) return null; - using (IsolatedStorageFileStream stream = store.OpenFile(PropertyStoreFile, System.IO.FileMode.Open, System.IO.FileAccess.Read)) - using (XmlDictionaryReader reader = XmlDictionaryReader.CreateBinaryReader(stream, XmlDictionaryReaderQuotas.Max)) + try { - if (stream.Length == 0) - return null; - - try - { - var dcs = new DataContractSerializer(typeof(Dictionary<string, object>)); - return (IDictionary<string, object>)dcs.ReadObject(reader); - } - catch (Exception e) - { - Debug.WriteLine("Could not deserialize properties: " + e.Message); - Log.Warning("Xamarin.Forms PropertyStore", $"Exception while reading Application properties: {e}"); - } + var dcs = new DataContractSerializer(typeof(Dictionary<string, object>)); + return (IDictionary<string, object>)dcs.ReadObject(reader); + } + catch (Exception e) + { + Debug.WriteLine("Could not deserialize properties: " + e.Message); + Log.Warning("Xamarin.Forms PropertyStore", $"Exception while reading Application properties: {e}"); } - } return null; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs b/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs index e3dd01ba..bf678236 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs @@ -9,7 +9,6 @@ using Android.Widget; using AView = Android.Views.View; using AListView = Android.Widget.ListView; using Xamarin.Forms.Internals; -using System.Collections; namespace Xamarin.Forms.Platform.Android { @@ -33,7 +32,7 @@ namespace Xamarin.Forms.Platform.Android // To prevent a conflict in the event that a ListView supports both templates and non-templates, we will start the DataTemplate key at 2. int _listCount = -1; // -1 we need to get count from the list - Dictionary<object, Cell> _prototypicalCellByTypeOrDataTemplate; + Cell _enabledCheckCell; bool _fromNative; AView _lastSelected; @@ -47,7 +46,6 @@ namespace Xamarin.Forms.Platform.Android _context = context; _realListView = realListView; _listView = listView; - _prototypicalCellByTypeOrDataTemplate = new Dictionary<object, Cell>(); if (listView.SelectedItem != null) SelectItem(listView.SelectedItem); @@ -311,68 +309,6 @@ namespace Xamarin.Forms.Platform.Android return layout; } - internal void InvalidatePrototypicalCellCache() - { - _prototypicalCellByTypeOrDataTemplate.Clear(); - } - - internal ITemplatedItemsList<Cell> GetTemplatedItemsListForPath(int indexPath) - { - var templatedItems = TemplatedItemsView.TemplatedItems; - if (_listView.IsGroupingEnabled) - templatedItems = (ITemplatedItemsList<Cell>)((IList)templatedItems)[indexPath]; - - return templatedItems; - } - - internal DataTemplate GetDataTemplateForPath(int indexPath) - { - var templatedItemsList = GetTemplatedItemsListForPath(indexPath); - var item = templatedItemsList.ListProxy[indexPath]; - return templatedItemsList.SelectDataTemplate(item); - } - - internal Type GetItemTypeForPath(int indexPath) - { - var templatedItemsList = GetTemplatedItemsListForPath(indexPath); - var item = templatedItemsList.ListProxy[indexPath]; - return item.GetType(); - } - - internal Cell GetCellForPath(int indexPath) - { - var templatedItemsList = GetTemplatedItemsListForPath(indexPath); - var cell = templatedItemsList[indexPath]; - return cell; - } - - internal Cell GetPrototypicalCell(int indexPath) - { - var itemTypeOrDataTemplate = default(object); - - var cachingStrategy = _listView.CachingStrategy; - if (cachingStrategy == ListViewCachingStrategy.RecycleElement) - itemTypeOrDataTemplate = GetDataTemplateForPath(indexPath); - - else if (cachingStrategy == ListViewCachingStrategy.RecycleElementAndDataTemplate) - itemTypeOrDataTemplate = GetItemTypeForPath(indexPath); - - else // ListViewCachingStrategy.RetainElement - return GetCellForPosition(indexPath); - - Cell protoCell; - if (!_prototypicalCellByTypeOrDataTemplate.TryGetValue(itemTypeOrDataTemplate, out protoCell)) - { - // cache prototypical cell by item type; Items of the same Type share - // the same DataTemplate (this is enforced by RecycleElementAndDataTemplate) - protoCell = GetCellForPosition(indexPath); - _prototypicalCellByTypeOrDataTemplate[itemTypeOrDataTemplate] = protoCell; - } - - var templatedItems = GetTemplatedItemsListForPath(indexPath); - return templatedItems.UpdateContent(protoCell, indexPath); - } - public override bool IsEnabled(int position) { ListView list = _listView; @@ -385,7 +321,17 @@ namespace Xamarin.Forms.Platform.Android return leftOver > 0; } - Cell item = GetPrototypicalCell(position); + var strategy = ((IListViewController)list).CachingStrategy; + if ((strategy & ListViewCachingStrategy.RecycleElement) != 0) + { + if (_enabledCheckCell == null) + _enabledCheckCell = GetCellForPosition(position); + else + templatedItemsView.TemplatedItems.UpdateContent(_enabledCheckCell, position); + return _enabledCheckCell.IsEnabled; + } + + Cell item = GetCellForPosition(position); return item.IsEnabled; } diff --git a/Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs b/Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs index 76e72388..009cffbb 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs @@ -34,9 +34,7 @@ namespace Xamarin.Forms.Platform.Android if ((inputTypes & InputTypes.NumberFlagDecimal) == 0) { // If decimal isn't allowed, we can just use the Android version -#pragma warning disable 0618 return DigitsKeyListener.GetInstance(inputTypes.HasFlag(InputTypes.NumberFlagSigned), false); -#pragma warning restore 0618 } // Figure out what the decimal separator is for the current locale @@ -45,9 +43,7 @@ namespace Xamarin.Forms.Platform.Android if (decimalSeparator == '.') { // If it's '.', then we can just use the default Android version -#pragma warning disable 0618 return DigitsKeyListener.GetInstance(inputTypes.HasFlag(InputTypes.NumberFlagSigned), true); -#pragma warning restore 0618 } // If decimals are enabled and the locale's decimal separator is not '.' diff --git a/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs index 1f259c7d..edfe9e7b 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs @@ -142,7 +142,7 @@ namespace Xamarin.Forms.Platform.Android _dialog = builder.Create(); _dialog.DismissEvent += (sender, args) => { - ElementController?.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false); + ElementController.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false); }; _dialog.Show(); } diff --git a/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs index 6ded75d8..c2bf10db 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs @@ -14,8 +14,6 @@ namespace Xamarin.Forms.Platform.Android { AlertDialog _dialog; TextColorSwitcher _textColorSwitcher; - bool _is24HourFormat; - string _timeFormat; public TimePickerRenderer() { @@ -26,9 +24,9 @@ namespace Xamarin.Forms.Platform.Android void TimePickerDialog.IOnTimeSetListener.OnTimeSet(ATimePicker view, int hourOfDay, int minute) { - ElementController.SetValueFromRenderer(TimePicker.TimeProperty, new TimeSpan(hourOfDay, minute, 0)); - ElementController.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false); + + ElementController.SetValueFromRenderer(TimePicker.TimeProperty, new TimeSpan(hourOfDay, minute, 0)); Control.ClearFocus(); if (Forms.IsLollipopOrNewer) @@ -52,9 +50,7 @@ namespace Xamarin.Forms.Platform.Android textField.SetOnClickListener(TimePickerListener.Instance); SetNativeControl(textField); - _textColorSwitcher = new TextColorSwitcher(textField.TextColors); - _is24HourFormat = DateFormat.Is24HourFormat(Context); - _timeFormat = _is24HourFormat ? "HH:mm" : Element.Format; + _textColorSwitcher = new TextColorSwitcher(textField.TextColors); } SetTime(e.NewElement.Time); @@ -96,8 +92,9 @@ namespace Xamarin.Forms.Platform.Android { TimePicker view = Element; ElementController.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, true); - - _dialog = new TimePickerDialog(Context, this, view.Time.Hours, view.Time.Minutes, _is24HourFormat); + + bool is24HourFormat = DateFormat.Is24HourFormat(Context); + _dialog = new TimePickerDialog(Context, this, view.Time.Hours, view.Time.Minutes, is24HourFormat); if (Forms.IsLollipopOrNewer) _dialog.CancelEvent += OnCancelButtonClicked; @@ -112,7 +109,7 @@ namespace Xamarin.Forms.Platform.Android void SetTime(TimeSpan time) { - Control.Text = DateTime.Today.Add(time).ToString(_timeFormat); + Control.Text = DateTime.Today.Add(time).ToString(Element.Format); } void UpdateTextColor() diff --git a/Xamarin.Forms.Platform.Android/ResourceManager.cs b/Xamarin.Forms.Platform.Android/ResourceManager.cs index f09f9978..402e52be 100644 --- a/Xamarin.Forms.Platform.Android/ResourceManager.cs +++ b/Xamarin.Forms.Platform.Android/ResourceManager.cs @@ -24,11 +24,6 @@ namespace Xamarin.Forms.Platform.Android if(drawable == null) { var bitmap = GetBitmap(resource, file) ?? BitmapFactory.DecodeFile(file); - if (bitmap == null) - { - var source = Registrar.Registered.GetHandler<IImageSourceHandler>(fileImageSource.GetType()); - bitmap = source.LoadImageAsync(fileImageSource, Forms.Context).GetAwaiter().GetResult(); - } if (bitmap != null) drawable = new BitmapDrawable(resource, bitmap); } diff --git a/Xamarin.Forms.Platform.Android/VisualElementPackager.cs b/Xamarin.Forms.Platform.Android/VisualElementPackager.cs index 28f3d74b..1d886629 100644 --- a/Xamarin.Forms.Platform.Android/VisualElementPackager.cs +++ b/Xamarin.Forms.Platform.Android/VisualElementPackager.cs @@ -18,16 +18,11 @@ namespace Xamarin.Forms.Platform.Android IVisualElementRenderer _renderer; - VisualElement _element; - - IElementController ElementController => _element; - - public VisualElementPackager(IVisualElementRenderer renderer, VisualElement element = null) + public VisualElementPackager(IVisualElementRenderer renderer) { if (renderer == null) - throw new ArgumentNullException(nameof(renderer)); + throw new ArgumentNullException("renderer"); - _element = element ?? renderer.Element; _childAddedHandler = OnChildAdded; _childRemovedHandler = OnChildRemoved; _childReorderedHandler = OnChildrenReordered; @@ -36,6 +31,8 @@ namespace Xamarin.Forms.Platform.Android _renderer.ElementChanged += (sender, args) => SetElement(args.OldElement, args.NewElement); } + IElementController ElementController => _renderer.Element as IElementController; + public void Dispose() { Dispose(true); @@ -66,55 +63,48 @@ namespace Xamarin.Forms.Platform.Android } _renderer = null; } - - _element = null; } public void Load() { - SetElement(null, _element); + SetElement(null, _renderer.Element); } void AddChild(VisualElement view, IVisualElementRenderer oldRenderer = null, RendererPool pool = null, bool sameChildren = false) { Performance.Start(); - if (CompressedLayout.GetIsHeadless(view)) { - var packager = new VisualElementPackager(_renderer, view); - view.IsPlatformEnabled = true; - packager.Load(); - } else { - if (_childViews == null) - _childViews = new List<IVisualElementRenderer>(); + if (_childViews == null) + _childViews = new List<IVisualElementRenderer>(); - IVisualElementRenderer renderer = oldRenderer; - if (pool != null) - renderer = pool.GetFreeRenderer(view); - if (renderer == null) - { - Performance.Start("New renderer"); - renderer = Platform.CreateRenderer(view); - Performance.Stop("New renderer"); - } + IVisualElementRenderer renderer = oldRenderer; + if (pool != null) + renderer = pool.GetFreeRenderer(view); + if (renderer == null) + { + Performance.Start("New renderer"); + renderer = Platform.CreateRenderer(view); + Performance.Stop("New renderer"); + } - if (renderer == oldRenderer) - { - Platform.SetRenderer(renderer.Element, null); - renderer.SetElement(view); - } + if (renderer == oldRenderer) + { + Platform.SetRenderer(renderer.Element, null); + renderer.SetElement(view); + } - Performance.Start("Set renderer"); - Platform.SetRenderer(view, renderer); - Performance.Stop("Set renderer"); + Performance.Start("Set renderer"); + Platform.SetRenderer(view, renderer); + Performance.Stop("Set renderer"); - Performance.Start("Add view"); - if (!sameChildren) - { - (_renderer.View as ViewGroup)?.AddView(renderer.View); - _childViews.Add(renderer); - } - Performance.Stop("Add view"); + Performance.Start("Add view"); + if (!sameChildren) + { + (_renderer.View as ViewGroup)?.AddView(renderer.View); + _childViews.Add(renderer); } + Performance.Stop("Add view"); + Performance.Stop(); } @@ -127,8 +117,7 @@ namespace Xamarin.Forms.Platform.Android if (element != null) { IVisualElementRenderer r = Platform.GetRenderer(element); - if (r != null) - (_renderer.View as ViewGroup)?.BringChildToFront(r.View); + (_renderer.View as ViewGroup)?.BringChildToFront(r.View); } } } @@ -241,4 +230,4 @@ namespace Xamarin.Forms.Platform.Android Performance.Stop(); } } -} +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs b/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs index d580a0bb..098e85f6 100644 --- a/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs @@ -283,20 +283,13 @@ namespace Xamarin.Forms.Platform.Android return; ReadOnlyCollection<Element> children = ((IElementController)Element).LogicalChildren; - UpdateLayout(((IElementController)Element).LogicalChildren); - } - - static void UpdateLayout(IEnumerable<Element> children) - { - foreach (Element element in children) { + foreach (Element element in children) + { var visualElement = element as VisualElement; if (visualElement == null) continue; IVisualElementRenderer renderer = Platform.GetRenderer(visualElement); - if (renderer == null && CompressedLayout.GetIsHeadless(visualElement)) - UpdateLayout(visualElement.LogicalChildren); - renderer?.UpdateLayout(); } } diff --git a/Xamarin.Forms.Platform.Android/VisualElementTracker.cs b/Xamarin.Forms.Platform.Android/VisualElementTracker.cs index 76533005..f4436209 100644 --- a/Xamarin.Forms.Platform.Android/VisualElementTracker.cs +++ b/Xamarin.Forms.Platform.Android/VisualElementTracker.cs @@ -78,9 +78,8 @@ namespace Xamarin.Forms.Platform.Android VisualElement view = _renderer.Element; AView aview = _renderer.View; - var headlessOffset = CompressedLayout.GetHeadlessOffset(view); - var x = (int)_context.ToPixels(view.X + headlessOffset.X); - var y = (int)_context.ToPixels(view.Y + headlessOffset.Y); + var x = (int)_context.ToPixels(view.X); + var y = (int)_context.ToPixels(view.Y); var width = Math.Max(0, (int)_context.ToPixels(view.Width)); var height = Math.Max(0, (int)_context.ToPixels(view.Height)); diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj index 107754dd..aa91dedb 100644 --- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj +++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj @@ -42,7 +42,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn>CS0109</NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> <DebugSymbols>true</DebugSymbols> @@ -65,47 +66,33 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> <Reference Include="System.Net.Http" /> - <Reference Include="Xamarin.Android.Support.Annotations"> - <HintPath>..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.UI"> - <HintPath>..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Core.Utils"> - <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Media.Compat"> - <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Fragment"> - <HintPath>..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Transition"> - <HintPath>..\packages\Xamarin.Android.Support.Transition.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v4"> - <HintPath>..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.CardView"> - <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.RecyclerView"> - <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Vector.Drawable"> - <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable"> - <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.v7.AppCompat"> - <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Android.Support.Design"> - <HintPath>..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <ItemGroup> @@ -291,22 +278,16 @@ <Name>Xamarin.Forms.Platform.Android.FormsViewGroup</Name> </ProjectReference> </ItemGroup> - <ItemGroup /> <ItemGroup> <None Include="packages.config" /> </ItemGroup> + <ItemGroup /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" /> - <Import Project="..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets')" /> + <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" /> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" /> + </Target> </Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Android/packages.config b/Xamarin.Forms.Platform.Android/packages.config index 7049da47..6a2d070a 100644 --- a/Xamarin.Forms.Platform.Android/packages.config +++ b/Xamarin.Forms.Platform.Android/packages.config @@ -1,17 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Design" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Transition" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.AppCompat" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.CardView" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid71" /> - <package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" /> + <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.CardView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> </packages>
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.MacOS/Platform.cs b/Xamarin.Forms.Platform.MacOS/Platform.cs index f936a320..7e853ac4 100644 --- a/Xamarin.Forms.Platform.MacOS/Platform.cs +++ b/Xamarin.Forms.Platform.MacOS/Platform.cs @@ -43,17 +43,7 @@ namespace Xamarin.Forms.Platform.MacOS var alert = NSAlert.WithMessage(arguments.Title, arguments.Cancel, arguments.Destruction, null, ""); if (arguments.Buttons != null) { - int maxScrollHeight = (int)(0.6 * NSScreen.MainScreen.Frame.Height); - NSView extraButtons = GetExtraButton(arguments); - if (extraButtons.Frame.Height > maxScrollHeight) { - NSScrollView scrollView = new NSScrollView(); - scrollView.Frame = new RectangleF(0, 0, extraButtons.Frame.Width, maxScrollHeight); - scrollView.DocumentView = extraButtons; - scrollView.HasVerticalScroller = true; - alert.AccessoryView = scrollView; - } else { - alert.AccessoryView = extraButtons; - } + alert.AccessoryView = GetExtraButton(arguments); alert.Layout(); } diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs index 595de47d..50957746 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs @@ -7,7 +7,6 @@ using AppKit; using CoreAnimation; using Foundation; using Xamarin.Forms.Internals; -using Xamarin.Forms.PlatformConfiguration.macOSSpecific; namespace Xamarin.Forms.Platform.MacOS { @@ -264,30 +263,6 @@ namespace Xamarin.Forms.Platform.MacOS } } - NSViewControllerTransitionOptions ToViewControllerTransitionOptions(NavigationTransitionStyle transitionStyle) - { - switch (transitionStyle) - { - case NavigationTransitionStyle.Crossfade: - return NSViewControllerTransitionOptions.Crossfade; - case NavigationTransitionStyle.SlideBackward: - return NSViewControllerTransitionOptions.SlideBackward; - case NavigationTransitionStyle.SlideDown: - return NSViewControllerTransitionOptions.SlideDown; - case NavigationTransitionStyle.SlideForward: - return NSViewControllerTransitionOptions.SlideForward; - case NavigationTransitionStyle.SlideLeft: - return NSViewControllerTransitionOptions.SlideLeft; - case NavigationTransitionStyle.SlideRight: - return NSViewControllerTransitionOptions.SlideRight; - case NavigationTransitionStyle.SlideUp: - return NSViewControllerTransitionOptions.SlideUp; - - default: - return NSViewControllerTransitionOptions.None; - } - } - async Task<bool> PopPageAsync(Page page, bool animated) { if (page == null) @@ -306,10 +281,8 @@ namespace Xamarin.Forms.Platform.MacOS if (animated) { var previousPageRenderer = Platform.GetRenderer(previousPage); - var transitionStyle = NavigationPage.OnThisPlatform().GetNavigationTransitionPopStyle(); - return await this.HandleAsyncAnimation(target.ViewController, previousPageRenderer.ViewController, - ToViewControllerTransitionOptions(transitionStyle), () => Platform.DisposeRendererAndChildren(target), true); + NSViewControllerTransitionOptions.SlideBackward, () => Platform.DisposeRendererAndChildren(target), true); } RemovePage(page, false); @@ -340,10 +313,8 @@ namespace Xamarin.Forms.Platform.MacOS } var vco = Platform.GetRenderer(oldPage); AddChildViewController(vc.ViewController); - - var transitionStyle = NavigationPage.OnThisPlatform().GetNavigationTransitionPushStyle(); return await this.HandleAsyncAnimation(vco.ViewController, vc.ViewController, - ToViewControllerTransitionOptions(transitionStyle), () => page?.SendAppearing(), true); + NSViewControllerTransitionOptions.SlideForward, () => page?.SendAppearing(), true); } void UpdateBackgroundColor() diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs index 42cbec13..ee3af812 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs @@ -195,6 +195,7 @@ namespace Xamarin.Forms.Platform.MacOS return; ContentView.Frame = new RectangleF(ContentView.Frame.X, ContentView.Frame.Y, Frame.Width, Frame.Height); + ResetNativeNonScroll(); } private bool ResetNativeNonScroll( ) diff --git a/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs b/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs index 77f05236..005d30ce 100644 --- a/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs @@ -90,25 +90,13 @@ namespace Xamarin.Forms.Platform.WinRT void UpdateMaximumDate() { DateTime maxdate = Element.MaximumDate; - Control.MaxYear = new DateTimeOffset(maxdate); + Control.MaxYear = new DateTimeOffset(maxdate.Date); } void UpdateMinimumDate() { DateTime mindate = Element.MinimumDate; - - try - { - Control.MinYear = new DateTimeOffset(mindate); - } - catch (ArgumentOutOfRangeException) - { - // This will be thrown when mindate equals DateTime.MinValue and the UTC offset is positive - // because the resulting DateTimeOffset.UtcDateTime will be out of range. In that case let's - // specify the Kind as UTC so there is no offset. - mindate = DateTime.SpecifyKind(mindate, DateTimeKind.Utc); - Control.MinYear = new DateTimeOffset(mindate); - } + Control.MinYear = new DateTimeOffset(mindate); } void UpdateTextColor() diff --git a/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs b/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs index 836cdd51..56026d18 100644 --- a/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs @@ -124,7 +124,7 @@ namespace Xamarin.Forms.Platform.WinRT } Control.Stretch = GetStretch(Element.Aspect); - if (Element.Aspect == Aspect.AspectFill || Element.Aspect == Aspect.AspectFit) // Then Center Crop + if (Element.Aspect == Aspect.AspectFill) // Then Center Crop { Control.HorizontalAlignment = HorizontalAlignment.Center; Control.VerticalAlignment = VerticalAlignment.Center; diff --git a/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs b/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs index 96fd9258..7bef3e93 100644 --- a/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs @@ -71,22 +71,6 @@ namespace Xamarin.Forms.Platform.WinRT } } - protected override void UpdateBackgroundColor() - { - if (Control != null) - { - Color backgroundColor = Element.BackgroundColor; - if (!backgroundColor.IsDefault) - { - Control.Background = backgroundColor.ToBrush(); - } - else - { - Control.ClearValue(Windows.UI.Xaml.Controls.Control.BackgroundProperty); - } - } - } - protected override bool PreventGestureBubbling { get; set; } = true; void OnNativeValueChanged(object sender, RangeBaseValueChangedEventArgs e) diff --git a/Xamarin.Forms.Platform.WinRT/VisualElementRenderer.cs b/Xamarin.Forms.Platform.WinRT/VisualElementRenderer.cs index 94581d5c..4843fd74 100644 --- a/Xamarin.Forms.Platform.WinRT/VisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/VisualElementRenderer.cs @@ -413,6 +413,8 @@ namespace Xamarin.Forms.Platform.WinRT Control.HorizontalAlignment = HorizontalAlignment.Stretch; Control.VerticalAlignment = VerticalAlignment.Stretch; + Children.Add(control); + if (Element == null) throw new InvalidOperationException( "Cannot assign a native control without an Element; Renderer unbound and/or disposed. " + @@ -423,7 +425,7 @@ namespace Xamarin.Forms.Platform.WinRT control.GotFocus += OnControlGotFocus; control.LostFocus += OnControlLostFocus; - Children.Add(control); + UpdateBackgroundColor(); if (Element != null && !string.IsNullOrEmpty(Element.AutomationId)) diff --git a/Xamarin.Forms.Platform.iOS/RendererPool.cs b/Xamarin.Forms.Platform.iOS/RendererPool.cs index e95148da..563201f0 100644 --- a/Xamarin.Forms.Platform.iOS/RendererPool.cs +++ b/Xamarin.Forms.Platform.iOS/RendererPool.cs @@ -108,14 +108,10 @@ namespace Xamarin.Forms.Platform.MacOS var child = logicalChild as VisualElement; if (child != null) { - if (CompressedLayout.GetIsHeadless(child)) { - child.IsPlatformEnabled = true; - FillChildrenWithRenderers(child); - } else { - var renderer = GetFreeRenderer(child) ?? Platform.CreateRenderer(child); - Platform.SetRenderer(child, renderer); - _parent.NativeView.AddSubview(renderer.NativeView); - } + var renderer = GetFreeRenderer(child) ?? Platform.CreateRenderer(child); + Platform.SetRenderer(child, renderer); + + _parent.NativeView.AddSubview(renderer.NativeView); } } } diff --git a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs index 72ab654a..fa91cf6a 100644 --- a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs +++ b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs @@ -13,20 +13,16 @@ namespace Xamarin.Forms.Platform.MacOS bool _isDisposed; - IElementController ElementController => _element; + IElementController ElementController => Renderer.Element as IElementController; - public VisualElementPackager(IVisualElementRenderer renderer) : this(renderer, null) - { - } - - VisualElementPackager(IVisualElementRenderer renderer, VisualElement element) + public VisualElementPackager(IVisualElementRenderer renderer) { if (renderer == null) throw new ArgumentNullException(nameof(renderer)); Renderer = renderer; renderer.ElementChanged += OnRendererElementChanged; - SetElement(null, element ?? renderer.Element); + SetElement(null, renderer.Element); } protected IVisualElementRenderer Renderer { get; set; } @@ -69,22 +65,16 @@ namespace Xamarin.Forms.Platform.MacOS if (_isDisposed) return; - if (CompressedLayout.GetIsHeadless(view)) { - var packager = new VisualElementPackager(Renderer, view); - view.IsPlatformEnabled = true; - packager.Load(); - } else { - var viewRenderer = Platform.CreateRenderer(view); - Platform.SetRenderer(view, viewRenderer); + var viewRenderer = Platform.CreateRenderer(view); + Platform.SetRenderer(view, viewRenderer); - var uiview = Renderer.NativeView; - uiview.AddSubview(viewRenderer.NativeView); + var uiview = Renderer.NativeView; + uiview.AddSubview(viewRenderer.NativeView); - if (Renderer.ViewController != null && viewRenderer.ViewController != null) - Renderer.ViewController.AddChildViewController(viewRenderer.ViewController); + if (Renderer.ViewController != null && viewRenderer.ViewController != null) + Renderer.ViewController.AddChildViewController(viewRenderer.ViewController); - EnsureChildrenOrder(); - } + EnsureChildrenOrder(); } protected virtual void OnChildRemoved(VisualElement view) diff --git a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs index 68625a32..5c84b991 100644 --- a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs +++ b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs @@ -138,8 +138,8 @@ namespace Xamarin.Forms.Platform.MacOS var scale = (float)view.Scale; var width = (float)view.Width; var height = (float)view.Height; - var x = (float)view.X + (float)CompressedLayout.GetHeadlessOffset(view).X; - var y = (float)view.Y + (float)CompressedLayout.GetHeadlessOffset(view).Y; + var x = (float)view.X; + var y = (float)view.Y; var opacity = (float)view.Opacity; var isVisible = view.IsVisible; diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj index 415dbc7b..c3f1f087 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -953,4 +953,4 @@ <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs b/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs index f339c879..d03682e9 100644 --- a/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs +++ b/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Xamarin.Forms.Internals; using Xamarin.Forms.Xaml.Internals; @@ -105,25 +106,12 @@ namespace Xamarin.Forms.Xaml if (ApplyPropertiesVisitor.TryGetPropertyName(node, parentNode, out propertyName)) { if ((propertyName.LocalName == "Resources" || - propertyName.LocalName == "MergedDictionaries" || - propertyName.LocalName.EndsWith(".Resources", StringComparison.Ordinal)) && value is ResourceDictionary) + propertyName.LocalName.EndsWith(".Resources", StringComparison.Ordinal)) && value is ResourceDictionary) { var source = Values[parentNode]; ApplyPropertiesVisitor.SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node); } } - - //Add ResourceDictionary into MergedDictionaries - XmlName parentPropertyName; - if (parentNode is IListNode && ApplyPropertiesVisitor.TryGetPropertyName(parentNode, parentNode.Parent, out parentPropertyName)) - { - if (parentPropertyName.LocalName == "MergedDictionaries") - { - var source = Values[parentNode.Parent]; - node.Parent = node.Parent.Parent; - ApplyPropertiesVisitor.SetPropertyValue(source, parentPropertyName, value, Context.RootElement, node, Context, node); - } - } } public void Visit(RootNode node, INode parentNode) diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/NavigationPage.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/NavigationPage.xml deleted file mode 100644 index 00ab1eb0..00000000 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/NavigationPage.xml +++ /dev/null @@ -1,217 +0,0 @@ -<Type Name="NavigationPage" FullName="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationPage"> - <TypeSignature Language="C#" Value="public static class NavigationPage" /> - <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit NavigationPage extends System.Object" /> - <AssemblyInfo> - <AssemblyName>Xamarin.Forms.Core</AssemblyName> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <Base> - <BaseTypeName>System.Object</BaseTypeName> - </Base> - <Interfaces /> - <Docs> - <summary>The navigation page instance that Xamarin.Forms created on the macOS platform.</summary> - <remarks>To be added.</remarks> - </Docs> - <Members> - <Member MemberName="GetNavigationTransitionPopStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPopStyle (Xamarin.Forms.BindableObject element);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPopStyle(class Xamarin.Forms.BindableObject element) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="element" Type="Xamarin.Forms.BindableObject" /> - </Parameters> - <Docs> - <param name="element">The platform specific element on which to perform the operation.</param> - <summary>Returns the NavigationTransitionStyle value that tells what transition is used when a page is popped from the navigation stack.</summary> - <returns>The NavigationTransitionStyle value that tells the current transition when a page is popped from the navigation stack.</returns> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="GetNavigationTransitionPopStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPopStyle (this Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> config);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPopStyle(class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> config) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage>" RefType="this" /> - </Parameters> - <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <summary>Returns the NavigationTransitionStyle value that tells what transition is used when a page is popped from the navigation stack.</summary> - <returns>The NavigationTransitionStyle value that tells the current transition when a page is popped from the navigation stack.</returns> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="GetNavigationTransitionPushStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPushStyle (Xamarin.Forms.BindableObject element);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPushStyle(class Xamarin.Forms.BindableObject element) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="element" Type="Xamarin.Forms.BindableObject" /> - </Parameters> - <Docs> - <param name="element">The platform specific element on which to perform the operation.</param> - <summary>Returns the NavigationTransitionStyle value that tells what transition is used when a page is push on the navigation stack.</summary> - <returns>The NavigationTransitionStyle value that tells the current transition when a page is pushed on the navigation stack.</returns> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="GetNavigationTransitionPushStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPushStyle (this Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> config);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPushStyle(class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> config) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage>" RefType="this" /> - </Parameters> - <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <summary>Returns the NavigationTransitionStyle value that tells what transition is used when a page is pushed on the navigation stack.</summary> - <returns>The NavigationTransitionStyle value that tells the current transition when a page is pushed on the navigation stack.</returns> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="NavigationTransitionPopStyleProperty"> - <MemberSignature Language="C#" Value="public static readonly Xamarin.Forms.BindableProperty NavigationTransitionPopStyleProperty;" /> - <MemberSignature Language="ILAsm" Value=".field public static initonly class Xamarin.Forms.BindableProperty NavigationTransitionPopStyleProperty" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.BindableProperty</ReturnType> - </ReturnValue> - <Docs> - <summary>Backing store for the attached property that controls the transition style of the platform-specific navigation page when a page is popped from the navigation stack.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="NavigationTransitionPushStyleProperty"> - <MemberSignature Language="C#" Value="public static readonly Xamarin.Forms.BindableProperty NavigationTransitionPushStyleProperty;" /> - <MemberSignature Language="ILAsm" Value=".field public static initonly class Xamarin.Forms.BindableProperty NavigationTransitionPushStyleProperty" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.BindableProperty</ReturnType> - </ReturnValue> - <Docs> - <summary>Backing store for the attached property that controls the transition style of the platform-specific navigation page when a page is pushed on the navigation stack.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="SetNavigationTransitionPopStyle"> - <MemberSignature Language="C#" Value="public static void SetNavigationTransitionPopStyle (Xamarin.Forms.BindableObject element, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle value);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetNavigationTransitionPopStyle(class Xamarin.Forms.BindableObject element, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle value) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.Void</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="element" Type="Xamarin.Forms.BindableObject" /> - <Parameter Name="value" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - </Parameters> - <Docs> - <param name="element">The platform specific element on which to perform the operation.</param> - <param name="value">The new transition style.</param> - <summary>Sets the transition style which is used, when popping from the navigation stack.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="SetNavigationTransitionPushStyle"> - <MemberSignature Language="C#" Value="public static void SetNavigationTransitionPushStyle (Xamarin.Forms.BindableObject element, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle value);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetNavigationTransitionPushStyle(class Xamarin.Forms.BindableObject element, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle value) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.Void</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="element" Type="Xamarin.Forms.BindableObject" /> - <Parameter Name="value" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - </Parameters> - <Docs> - <param name="element">The platform specific element on which to perform the operation.</param> - <param name="value">The new transition style.</param> - <summary>Sets the transition style which is used, when pushing pages on the navigation stack.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="SetNavigationTransitionStyle"> - <MemberSignature Language="C#" Value="public static void SetNavigationTransitionStyle (Xamarin.Forms.BindableObject element, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle pushStyle, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle popStyle);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetNavigationTransitionStyle(class Xamarin.Forms.BindableObject element, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle pushStyle, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle popStyle) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.Void</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="element" Type="Xamarin.Forms.BindableObject" /> - <Parameter Name="pushStyle" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - <Parameter Name="popStyle" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - </Parameters> - <Docs> - <param name="element">The platform specific element on which to perform the operation.</param> - <param name="pushStyle">The new transition style when a page is pushed on the navigation stack.</param> - <param name="popStyle">The new transition style when a page is popped from the navigation stack.</param> - <summary>Sets the transition style which is used, when popping and pushing pages on the navigation stack.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="SetNavigationTransitionStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> SetNavigationTransitionStyle (this Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> config, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle pushStyle, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle popStyle);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> SetNavigationTransitionStyle(class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> config, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle pushStyle, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle popStyle) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage></ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage>" RefType="this" /> - <Parameter Name="pushStyle" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - <Parameter Name="popStyle" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - </Parameters> - <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <param name="pushStyle">The new transition style when a page is pushed on the navigation stack.</param> - <param name="popStyle">The new transition style when a page is popped from the navigation stack.</param> - <summary>Sets the transition style which is used, when popping and pushing pages on the navigation stack.</summary> - <returns>The updated configuration object on which developers can make successive method calls.</returns> - <remarks>To be added.</remarks> - </Docs> - </Member> - </Members> -</Type> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/NavigationTransitionStyle.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/NavigationTransitionStyle.xml deleted file mode 100644 index ffea8491..00000000 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/NavigationTransitionStyle.xml +++ /dev/null @@ -1,129 +0,0 @@ -<Type Name="NavigationTransitionStyle" FullName="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle"> - <TypeSignature Language="C#" Value="public enum NavigationTransitionStyle" /> - <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed NavigationTransitionStyle extends System.Enum" /> - <AssemblyInfo> - <AssemblyName>Xamarin.Forms.Core</AssemblyName> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <Base> - <BaseTypeName>System.Enum</BaseTypeName> - </Base> - <Docs> - <summary>Enumerates navigation transition styles.</summary> - <remarks>To be added.</remarks> - </Docs> - <Members> - <Member MemberName="Crossfade"> - <MemberSignature Language="C#" Value="Crossfade" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle Crossfade = int32(1)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates a crossfade transition.</summary> - </Docs> - </Member> - <Member MemberName="None"> - <MemberSignature Language="C#" Value="None" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle None = int32(0)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates no transition.</summary> - </Docs> - </Member> - <Member MemberName="SlideBackward"> - <MemberSignature Language="C#" Value="SlideBackward" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle SlideBackward = int32(7)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates a slide backward transition.</summary> - </Docs> - </Member> - <Member MemberName="SlideDown"> - <MemberSignature Language="C#" Value="SlideDown" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle SlideDown = int32(3)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates a slide down transition.</summary> - </Docs> - </Member> - <Member MemberName="SlideForward"> - <MemberSignature Language="C#" Value="SlideForward" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle SlideForward = int32(6)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates a slide forward transition.</summary> - </Docs> - </Member> - <Member MemberName="SlideLeft"> - <MemberSignature Language="C#" Value="SlideLeft" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle SlideLeft = int32(4)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates a slide left transition.</summary> - </Docs> - </Member> - <Member MemberName="SlideRight"> - <MemberSignature Language="C#" Value="SlideRight" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle SlideRight = int32(5)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates a slide right transition.</summary> - </Docs> - </Member> - <Member MemberName="SlideUp"> - <MemberSignature Language="C#" Value="SlideUp" /> - <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle SlideUp = int32(2)" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Docs> - <summary>Indicates a slide up transition.</summary> - </Docs> - </Member> - </Members> -</Type> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/Page.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/Page.xml index 103e157b..49fdcd10 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/Page.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms.PlatformConfiguration.macOSSpecific/Page.xml @@ -10,7 +10,7 @@ </Base> <Interfaces /> <Docs> - <summary>The page instance that Xamarin.Forms created on the macOS platform..</summary> + <summary>To be added.</summary> <remarks>To be added.</remarks> </Docs> <Members> @@ -28,9 +28,9 @@ <Parameter Name="element" Type="Xamarin.Forms.BindableObject" /> </Parameters> <Docs> - <param name="element">The platform specific element on which to perform the operation.</param> - <summary>Returns the tab order of the visual elements on a page as array.</summary> - <returns>An array of VisualElement.</returns> + <param name="element">To be added.</param> + <summary>To be added.</summary> + <returns>To be added.</returns> <remarks>To be added.</remarks> </Docs> </Member> @@ -48,9 +48,9 @@ <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.Page>" RefType="this" /> </Parameters> <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <summary>Returns the tab order of the visual elements on a page as array.</summary> - <returns>An array of VisualElement.</returns> + <param name="config">To be added.</param> + <summary>To be added.</summary> + <returns>To be added.</returns> <remarks>To be added.</remarks> </Docs> </Member> @@ -75,9 +75,9 @@ </Parameter> </Parameters> <Docs> - <param name="element">The platform specific element on which to perform the operation.</param> - <param name="value">An array of VisualElement.</param> - <summary>Sets the tab order of visual elements on a page. Users can cycle through these elements with the tab key.</summary> + <param name="element">To be added.</param> + <param name="value">To be added.</param> + <summary>To be added.</summary> <remarks>To be added.</remarks> </Docs> </Member> @@ -102,10 +102,10 @@ </Parameter> </Parameters> <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <param name="value">An array of VisualElement.</param> - <summary>Sets the tab order of visual elements on a page. Users can cycle through these elements with the tab key.</summary> - <returns>The platform specific configuration that contains the element on which to perform the operation.</returns> + <param name="config">To be added.</param> + <param name="value">To be added.</param> + <summary>To be added.</summary> + <returns>To be added.</returns> <remarks>To be added.</remarks> </Docs> </Member> @@ -120,7 +120,7 @@ <ReturnType>Xamarin.Forms.BindableProperty</ReturnType> </ReturnValue> <Docs> - <summary>Backing store for the attached property that holds the tab order of the visual elements.</summary> + <summary>To be added.</summary> <remarks>To be added.</remarks> </Docs> </Member> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/CompressedLayout.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/CompressedLayout.xml deleted file mode 100644 index 55991a89..00000000 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/CompressedLayout.xml +++ /dev/null @@ -1,119 +0,0 @@ -<Type Name="CompressedLayout" FullName="Xamarin.Forms.CompressedLayout"> - <TypeSignature Language="C#" Value="public static class CompressedLayout" /> - <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit CompressedLayout extends System.Object" /> - <AssemblyInfo> - <AssemblyName>Xamarin.Forms.Core</AssemblyName> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <Base> - <BaseTypeName>System.Object</BaseTypeName> - </Base> - <Interfaces /> - <Docs> - <summary>To be added.</summary> - <remarks>To be added.</remarks> - </Docs> - <Members> - <Member MemberName="GetHeadlessOffset"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.Point GetHeadlessOffset (Xamarin.Forms.BindableObject bindable);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Forms.Point GetHeadlessOffset(class Xamarin.Forms.BindableObject bindable) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <Attributes> - <Attribute> - <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName> - </Attribute> - </Attributes> - <ReturnValue> - <ReturnType>Xamarin.Forms.Point</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="bindable" Type="Xamarin.Forms.BindableObject" /> - </Parameters> - <Docs> - <param name="bindable">To be added.</param> - <summary>To be added.</summary> - <returns>To be added.</returns> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="GetIsHeadless"> - <MemberSignature Language="C#" Value="public static bool GetIsHeadless (Xamarin.Forms.BindableObject bindable);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool GetIsHeadless(class Xamarin.Forms.BindableObject bindable) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.Boolean</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="bindable" Type="Xamarin.Forms.BindableObject" /> - </Parameters> - <Docs> - <param name="bindable">To be added.</param> - <summary>To be added.</summary> - <returns>To be added.</returns> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="HeadlessOffsetProperty"> - <MemberSignature Language="C#" Value="public static readonly Xamarin.Forms.BindableProperty HeadlessOffsetProperty;" /> - <MemberSignature Language="ILAsm" Value=".field public static initonly class Xamarin.Forms.BindableProperty HeadlessOffsetProperty" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <Attributes> - <Attribute> - <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName> - </Attribute> - </Attributes> - <ReturnValue> - <ReturnType>Xamarin.Forms.BindableProperty</ReturnType> - </ReturnValue> - <Docs> - <summary>To be added.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="IsHeadlessProperty"> - <MemberSignature Language="C#" Value="public static readonly Xamarin.Forms.BindableProperty IsHeadlessProperty;" /> - <MemberSignature Language="ILAsm" Value=".field public static initonly class Xamarin.Forms.BindableProperty IsHeadlessProperty" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.BindableProperty</ReturnType> - </ReturnValue> - <Docs> - <summary>To be added.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="SetIsHeadless"> - <MemberSignature Language="C#" Value="public static void SetIsHeadless (Xamarin.Forms.BindableObject bindable, bool value);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetIsHeadless(class Xamarin.Forms.BindableObject bindable, bool value) cil managed" /> - <MemberType>Method</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.Void</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="bindable" Type="Xamarin.Forms.BindableObject" /> - <Parameter Name="value" Type="System.Boolean" /> - </Parameters> - <Docs> - <param name="bindable">To be added.</param> - <param name="value">To be added.</param> - <summary>To be added.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - </Members> -</Type> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml index 675f629b..52f522f9 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml @@ -246,22 +246,6 @@ <remarks>To be added.</remarks> </Docs> </Member> - <Member MemberName="MergedDictionaries"> - <MemberSignature Language="C#" Value="public System.Collections.Generic.ICollection<Xamarin.Forms.ResourceDictionary> MergedDictionaries { get; }" /> - <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.ICollection`1<class Xamarin.Forms.ResourceDictionary> MergedDictionaries" /> - <MemberType>Property</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.Collections.Generic.ICollection<Xamarin.Forms.ResourceDictionary></ReturnType> - </ReturnValue> - <Docs> - <summary>To be added.</summary> - <value>To be added.</value> - <remarks>To be added.</remarks> - </Docs> - </Member> <Member MemberName="MergedWith"> <MemberSignature Language="C#" Value="public Type MergedWith { get; set; }" /> <MemberSignature Language="ILAsm" Value=".property instance class System.Type MergedWith" /> diff --git a/docs/Xamarin.Forms.Core/index.xml b/docs/Xamarin.Forms.Core/index.xml index b6a87904..1b13e335 100644 --- a/docs/Xamarin.Forms.Core/index.xml +++ b/docs/Xamarin.Forms.Core/index.xml @@ -182,7 +182,6 @@ <Type Name="ColumnDefinitionCollection" Kind="Class" /> <Type Name="Command" Kind="Class" /> <Type Name="Command`1" DisplayName="Command<T>" Kind="Class" /> - <Type Name="CompressedLayout" Kind="Class" /> <Type Name="Condition" Kind="Class" /> <Type Name="Configuration`2" DisplayName="Configuration<TPlatform,TElement>" Kind="Class" /> <Type Name="Constraint" Kind="Class" /> @@ -522,8 +521,6 @@ <Type Name="VisualElement" Kind="Class" /> </Namespace> <Namespace Name="Xamarin.Forms.PlatformConfiguration.macOSSpecific"> - <Type Name="NavigationPage" Kind="Class" /> - <Type Name="NavigationTransitionStyle" Kind="Enumeration" /> <Type Name="Page" Kind="Class" /> <Type Name="TabbedPage" Kind="Class" /> </Namespace> @@ -2382,73 +2379,6 @@ <Targets> <Target Type="T:Xamarin.Forms.IPlatformElementConfiguration`2" /> </Targets> - <Member MemberName="GetNavigationTransitionPopStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPopStyle (this Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> config);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPopStyle(class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> config) cil managed" /> - <MemberType>ExtensionMethod</MemberType> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage>" RefType="this" /> - </Parameters> - <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <summary>Returns the NavigationTransitionStyle value that tells what transition is used when a page is popped from the navigation stack.</summary> - </Docs> - <Link Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationPage" Member="M:Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationPage.GetNavigationTransitionPopStyle(Xamarin.Forms.IPlatformElementConfiguration{Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage})" /> - </Member> - </ExtensionMethod> - <ExtensionMethod> - <Targets> - <Target Type="T:Xamarin.Forms.IPlatformElementConfiguration`2" /> - </Targets> - <Member MemberName="GetNavigationTransitionPushStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPushStyle (this Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> config);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle GetNavigationTransitionPushStyle(class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> config) cil managed" /> - <MemberType>ExtensionMethod</MemberType> - <ReturnValue> - <ReturnType>Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle</ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage>" RefType="this" /> - </Parameters> - <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <summary>Returns the NavigationTransitionStyle value that tells what transition is used when a page is pushed on the navigation stack.</summary> - </Docs> - <Link Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationPage" Member="M:Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationPage.GetNavigationTransitionPushStyle(Xamarin.Forms.IPlatformElementConfiguration{Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage})" /> - </Member> - </ExtensionMethod> - <ExtensionMethod> - <Targets> - <Target Type="T:Xamarin.Forms.IPlatformElementConfiguration`2" /> - </Targets> - <Member MemberName="SetNavigationTransitionStyle"> - <MemberSignature Language="C#" Value="public static Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> SetNavigationTransitionStyle (this Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage> config, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle pushStyle, Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle popStyle);" /> - <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> SetNavigationTransitionStyle(class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.NavigationPage> config, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle pushStyle, valuetype Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle popStyle) cil managed" /> - <MemberType>ExtensionMethod</MemberType> - <ReturnValue> - <ReturnType>Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage></ReturnType> - </ReturnValue> - <Parameters> - <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage>" RefType="this" /> - <Parameter Name="pushStyle" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - <Parameter Name="popStyle" Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle" /> - </Parameters> - <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <param name="pushStyle">The new transition style when a page is pushed on the navigation stack.</param> - <param name="popStyle">The new transition style when a page is popped from the navigation stack.</param> - <summary>Sets the transition style which is used, when popping and pushing pages on the navigation stack.</summary> - </Docs> - <Link Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationPage" Member="M:Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationPage.SetNavigationTransitionStyle(Xamarin.Forms.IPlatformElementConfiguration{Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.NavigationPage},Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle,Xamarin.Forms.PlatformConfiguration.macOSSpecific.NavigationTransitionStyle)" /> - </Member> - </ExtensionMethod> - <ExtensionMethod> - <Targets> - <Target Type="T:Xamarin.Forms.IPlatformElementConfiguration`2" /> - </Targets> <Member MemberName="GetTabOrder"> <MemberSignature Language="C#" Value="public static Xamarin.Forms.VisualElement[] GetTabOrder (this Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.Page> config);" /> <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Xamarin.Forms.VisualElement[] GetTabOrder(class Xamarin.Forms.IPlatformElementConfiguration`2<class Xamarin.Forms.PlatformConfiguration.macOS, class Xamarin.Forms.Page> config) cil managed" /> @@ -2460,8 +2390,8 @@ <Parameter Name="config" Type="Xamarin.Forms.IPlatformElementConfiguration<Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.Page>" RefType="this" /> </Parameters> <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <summary>Returns the tab order of the visual elements on a page as array.</summary> + <param name="config">To be added.</param> + <summary>To be added.</summary> </Docs> <Link Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.Page" Member="M:Xamarin.Forms.PlatformConfiguration.macOSSpecific.Page.GetTabOrder(Xamarin.Forms.IPlatformElementConfiguration{Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.Page})" /> </Member> @@ -2488,9 +2418,9 @@ </Parameter> </Parameters> <Docs> - <param name="config">The platform specific configuration that contains the element on which to perform the operation.</param> - <param name="value">An array of VisualElement.</param> - <summary>Sets the tab order of visual elements on a page. Users can cycle through these elements with the tab key.</summary> + <param name="config">To be added.</param> + <param name="value">To be added.</param> + <summary>To be added.</summary> </Docs> <Link Type="Xamarin.Forms.PlatformConfiguration.macOSSpecific.Page" Member="M:Xamarin.Forms.PlatformConfiguration.macOSSpecific.Page.SetTabOrder(Xamarin.Forms.IPlatformElementConfiguration{Xamarin.Forms.PlatformConfiguration.macOS,Xamarin.Forms.Page},Xamarin.Forms.VisualElement[])" /> </Member> |
