From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 19 Nov 2019 01:31:25 +0000 (-0700)
Subject: Merge branch '4.3.0' into 4.4.0
X-Git-Tag: accepted/tizen/5.5/unified/20200421.150457~81^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51dba48e4256ff7eb8cb2dd1f081e909f8f83ab2;p=platform%2Fcore%2Fcsapi%2Fxsf.git

Merge branch '4.3.0' into 4.4.0

# Conflicts:
#	Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
#	build.cake
---

51dba48e4256ff7eb8cb2dd1f081e909f8f83ab2
diff --cc Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
index fde7638,3b04d18..afe184e
--- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
+++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
@@@ -56,7 -56,12 +56,13 @@@
      <Reference Include="System.Net.Http" />
    </ItemGroup>
    <ItemGroup>
 +    <Compile Include="Anticipator.cs" />
+     <Compile Include="..\Xamarin.Forms.Core\corefx\FormsQueue.cs">
+       <Link>corefx\FormsQueue.cs</Link>
+     </Compile>
+     <Compile Include="..\Xamarin.Forms.Core\corefx\FormsStack.cs">
+       <Link>corefx\FormsStack.cs</Link>
+     </Compile>
      <Compile Include="ActivityResultCallbackRegistry.cs" />
      <Compile Include="AndroidApplicationLifecycleState.cs" />
      <Compile Include="AndroidTitleBarVisibility.cs" />