From 5907152c50ee2c658b266f2804e6b383bb15a6f1 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.smith@xamarin.com>
Date: Sun, 24 Apr 2016 12:25:26 -0400
Subject: Evolve feature branch (#117)

* Initial import of evolve features

* [Android] Add Xamarin.Forms.Platform.Android.AppLinks project

* [iOS] Fix issues with c# 6 features on iOS AppLinks

* Added naive stanza to update-docs-windows.bat to produce Pages docs. Not tested. (#69)

* Update packages

* Add AppLinks android nuspec and fix linker issues

* Fix build

* Fix nusepc

* Fix nuspec

* Update android support nugets to 23.2.1

* Update Xamarin.UITest

* Add CardView

* [iOS] Fix app link for CoreSpotlight

* [Android] Update AppLinks android support libs

* Add Newtonsoft.Json dependency to nuspec

* Fix NRE when setting ControlTemplate to null

* Move to ModernHttpClient for download

* Try fix build

* Preserve android app links

* Fix margin issue

* General coding and simple fixes
---
 Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj')

diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
index b5dd6af5..3252403b 100644
--- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
+++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
@@ -72,6 +72,10 @@
       <Project>{7d13bac2-c6a4-416a-b07e-c169b199e52b}</Project>
       <Name>Xamarin.Forms.Maps</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj">
+      <Project>{d6133dbd-6c60-4bd5-bea2-07e0a3927c31}</Project>
+      <Name>Xamarin.Forms.Pages</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj">
       <Project>{9db2f292-8034-4e06-89ad-98bbda4306b9}</Project>
       <Name>Xamarin.Forms.Xaml</Name>
@@ -224,6 +228,7 @@
     <Compile Include="ControlGalleryPages\PinchGestureTestPage.cs" />
     <Compile Include="ControlGalleryPages\AppearingGalleryPage.cs" />
     <Compile Include="ControlGalleryPages\AutomationIDGallery.cs" />
+    <Compile Include="GalleryPages\AppLinkPageGallery.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\.nuspec\Xamarin.Forms.targets" />
-- 
cgit v1.2.3