Merge branch '4.3.0' into 4.4.0
authorShane Neuville <shneuvil@microsoft.com>
Tue, 19 Nov 2019 01:31:25 +0000 (18:31 -0700)
committerShane Neuville <shneuvil@microsoft.com>
Tue, 19 Nov 2019 01:31:25 +0000 (18:31 -0700)
# Conflicts:
# Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
# build.cake

1  2 
Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs
Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj

      <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" />