Merge branch '4.6.0' into 4.7.0

fabulous-dev · Jun 28, 2020 · ec2f390 · ec2f390
2 parents 077d579 + 2e5181a
commit ec2f390
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,9 @@
     <Product>Xamarin.Forms</Product>
     <ProduceReferenceAssembly Condition="'$(UsingMicrosoftNETSdk)' == 'True' AND '$(Configuration)' == 'Debug'">True</ProduceReferenceAssembly>
   </PropertyGroup>
-
+  <PropertyGroup>
+    <GitDefaultBranch>main</GitDefaultBranch>
+  </PropertyGroup>
   <Import Condition="'$(SampleProject)' != 'True'" Project="SourceLink.Build.props" />
   <!-- This target is replaced by GitInfo when restored. Allows Version.targets to rely on it before restore. -->
   <Target Name="GitVersion" />

diff --git a/Xamarin.Forms.Platform.UAP/Platform.cs b/Xamarin.Forms.Platform.UAP/Platform.cs
@@ -334,6 +334,14 @@ async void SetCurrent(Page newPage, bool popping = false, bool modal = false, Ac
 					else
 					{
 						RemovePage(previousPage);
+
+						if(!modal && _modalBackgroundPage != null)
+						{
+							RemovePage(_modalBackgroundPage);
+							_modalBackgroundPage.Cleanup();
+							_modalBackgroundPage.Parent = null;
+						}
+
 						_modalBackgroundPage = null;
 					}
 
@@ -673,4 +681,4 @@ void OnBackRequested(object sender, BackRequestedEventArgs e)
 			e.Handled = BackButtonPressed();
 		}
 	}
-}
+}