diff --git a/eng/Versions.props b/eng/Versions.props index 8daa6abf8d3a..5a724378c169 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,11 +137,11 @@ 17.6.0 - 2.6.6 - 2.8.0 - 2.6.6 - 2.6.6 - 1.13.0 + 2.9.0 + 2.8.2 + 2.9.0 + 2.9.0 + 1.15.0 2.0.3 5.1.0 6.0.0 diff --git a/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs b/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs index 7b61071c38d0..36ca78d4a4de 100644 --- a/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs +++ b/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs @@ -126,33 +126,33 @@ public async Task RemoveLastPage(bool useMaui) Assert.Equal(1, pushedPage.DisappearingCount); } - // [Theory] - // [InlineData(false)] - // [InlineData(true)] - // public async Task RemoveInnerPage(bool useMaui) - // { - // ContentPage initialPage = new ContentPage(); - // ContentPage pushedPage = new ContentPage(); + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task RemoveInnerPage(bool useMaui) + { + ContentPage initialPage = new ContentPage(); + ContentPage pushedPage = new ContentPage(); - // ContentPage initialPageAppearing = null; - // ContentPage pageDisappeared = null; + ContentPage initialPageAppearing = null; + ContentPage pageDisappeared = null; - // NavigationPage nav = new TestNavigationPage(useMaui, initialPage); - // _ = new Window(nav); - // nav.SendAppearing(); + NavigationPage nav = new TestNavigationPage(useMaui, initialPage); + _ = new Window(nav); + nav.SendAppearing(); - // var pageToRemove = new ContentPage(); - // await nav.PushAsync(pageToRemove); - // await nav.PushAsync(pushedPage); + var pageToRemove = new ContentPage(); + await nav.PushAsync(pageToRemove); + await nav.PushAsync(pushedPage); - // initialPage.Appearing += (__, _) - // => throw new XunitException("Appearing Fired Incorrectly"); + initialPage.Appearing += (__, _) + => throw new XunitException("Appearing Fired Incorrectly"); - // pushedPage.Disappearing += (__, _) - // => throw new XunitException("Appearing Fired Incorrectly"); + pushedPage.Disappearing += (__, _) + => throw new XunitException("Appearing Fired Incorrectly"); - // nav.Navigation.RemovePage(pageToRemove); - // } + nav.Navigation.RemovePage(pageToRemove); + } } } diff --git a/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs b/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs index 63983a4a2a7c..1451bf322a6b 100644 --- a/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs +++ b/src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs @@ -534,25 +534,25 @@ public async Task ShellItemContentRouteWithGlobalRouteRelative(bool modal, int d Assert.Equal("//animals/monkeys/details", shell.CurrentState.Location.ToString()); } - //[Theory] - //[InlineData(true)] - //[InlineData(false)] - //public async Task GotoSameGlobalRoutesCollapsesUriCorrectly(bool modal) - //{ - // var shell = new Shell(); - // var item1 = CreateShellItem(asImplicit: true, shellItemRoute: "animals", shellContentRoute: "monkeys"); - - // if (modal) - // Routing.RegisterRoute("details", typeof(ShellModalTests.ModalTestPage)); - // else - // Routing.RegisterRoute("details", typeof(ContentPage)); - - // shell.Items.Add(item1); - - // await shell.GoToAsync("details"); - // await shell.GoToAsync("details"); - // Assert.Equal("//animals/monkeys/details/details", shell.CurrentState.Location.ToString()); - //} + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task GotoSameGlobalRoutesCollapsesUriCorrectly(bool modal) + { + var shell = new Shell(); + var item1 = CreateShellItem(asImplicit: true, shellItemRoute: "animals", shellContentRoute: "monkeys"); + + if (modal) + Routing.RegisterRoute("details", typeof(ShellModalTests.ModalTestPage)); + else + Routing.RegisterRoute("details", typeof(ContentPage)); + + shell.Items.Add(item1); + + await shell.GoToAsync("details"); + await shell.GoToAsync("details"); + Assert.Equal("//animals/monkeys/details/details", shell.CurrentState.Location.ToString()); + } [Fact] public async Task ShellSectionWithGlobalRouteAbsolute()