chore: Adjust legacy Frame behavior

unoplatform · Dec 2, 2024 · 4aaa91d · 4aaa91d
1 parent 8967b8d
commit 4aaa91d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Frame.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Frame.cs
@@ -454,7 +454,11 @@ public async Task When_Exception_In_Page_Ctor()
 
 		var exception = Assert.ThrowsException<NotSupportedException>(() => SUT.Navigate(typeof(ExceptionInCtorPage)));
 		Assert.AreEqual("Crashed", exception.Message);
-		Assert.IsFalse(navigationFailed);
+		if (FeatureConfiguration.Frame.UseWinUIBehavior)
+		{
+			// This is only valid with WinUI Frame behavior
+			Assert.IsFalse(navigationFailed);
+		}
 	}
 
 	[TestMethod]

diff --git a/src/Uno.UI/UI/Xaml/Controls/Frame/Frame.legacy.cs b/src/Uno.UI/UI/Xaml/Controls/Frame/Frame.legacy.cs
@@ -153,7 +153,7 @@ private bool InnerNavigate(PageStackEntry entry, NavigationMode mode)
 				Application.Current.RaiseRecoverableUnhandledException(new InvalidOperationException("Navigation failed", exception));
 			}
 
-			return false;
+			throw;
 		}
 		finally
 		{
-Original file line number
+Diff line change
@@ Expand Up @@
     				Application.Current.RaiseRecoverableUnhandledException(new InvalidOperationException("Navigation failed", exception));
     			}
-    			return false;
+    			throw;
     		}
     		finally
     		{
@@ Expand Down @@