diff --git a/Directory.Build.props b/Directory.Build.props
index d8fddb6cc1..515fcaa446 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -156,13 +156,13 @@
 
   <!-- Versions: Directory.Packages.props (Central Package Management). PrivateAssets=all is implicit. -->
   <ItemGroup>
-    <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
                             Condition=" $(UseMaui) != 'true' " />
-    <GlobalPackageReference Include="Nerdbank.GitVersioning"
+    <PackageReference Include="Nerdbank.GitVersioning"
                             Condition=" $(DISABLE_GITVERSIONING) != 'true' AND !$(MSBuildProjectDirectory.Contains('e2e')) " />
-    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub"
+    <PackageReference Include="Microsoft.SourceLink.GitHub"
                             Condition=" $(IsPackable) " />
-    <GlobalPackageReference Include="Microsoft.Sbom.Targets"
+    <PackageReference Include="Microsoft.Sbom.Targets"
                             Condition=" $(IsPackable) " />
   </ItemGroup>
 
diff --git a/PrismLibrary.sln b/PrismLibrary.sln
deleted file mode 100644
index cd343596cf..0000000000
--- a/PrismLibrary.sln
+++ /dev/null
@@ -1,462 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33213.308
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-		src\Directory.Build.targets = src\Directory.Build.targets
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core", "src\Prism.Core\Prism.Core.csproj", "{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{00FFDC13-7397-46F1-897E-A62A7575D28A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core.Tests", "tests\Prism.Core.Tests\Prism.Core.Tests.csproj", "{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wpf", "Wpf", "{C2BA93F6-D2E1-455F-B9FA-6221D087295E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Wpf", "src\Wpf\Prism.Wpf\Prism.Wpf.csproj", "{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Wpf", "src\Wpf\Prism.DryIoc.Wpf\Prism.DryIoc.Wpf.csproj", "{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Wpf", "src\Wpf\Prism.Unity.Wpf\Prism.Unity.Wpf.csproj", "{E9A2458B-999D-4D36-822F-663D3830575A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wpf", "Wpf", "{F1F91777-01EA-43A3-A3ED-D473B382F46C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Wpf.Tests", "tests\Wpf\Prism.Wpf.Tests\Prism.Wpf.Tests.csproj", "{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Wpf.Tests", "tests\Wpf\Prism.DryIoc.Wpf.Tests\Prism.DryIoc.Wpf.Tests.csproj", "{BA05687E-2317-4A65-805B-C596F52F7203}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Wpf.Tests", "tests\Wpf\Prism.Unity.Wpf.Tests\Prism.Unity.Wpf.Tests.csproj", "{367BE810-5B34-4894-BE47-1C8DCC67DE81}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.IocContainer.Wpf.Tests.Support", "tests\Wpf\Prism.IocContainer.Wpf.Tests.Support\Prism.IocContainer.Wpf.Tests.Support.csproj", "{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{10DFE0CA-4F29-4859-B60F-94073D43FB51}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitignore = .gitignore
-		CodeCoverage.runsettings = CodeCoverage.runsettings
-		Directory.Build.props = Directory.Build.props
-		Directory.build.targets = Directory.build.targets
-		Directory.Packages.props = Directory.Packages.props
-		global.json = global.json
-		xunit.runner.json = xunit.runner.json
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{8F959801-D494-4CAF-9437-90F30472E169}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.Container.Wpf.Shared", "tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.shproj", "{BD42A7D6-A84D-4D27-9C28-7F6A2EC477F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI", "src\Uno\Prism.Uno\Prism.Uno.WinUI.csproj", "{E74664C1-1BB1-4920-8099-2C9125CFD00B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Uno.WinUI", "src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.WinUI.csproj", "{DB530D15-0556-4B6F-96B2-1497C8DF08D6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maui", "Maui", "{24639CEB-266D-40E1-B0A8-B78BB6F8CEF8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Maui", "src\Maui\Prism.Maui\Prism.Maui.csproj", "{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Maui.Rx", "src\Maui\Prism.Maui.Rx\Prism.Maui.Rx.csproj", "{D7B41D0E-CBE4-4846-992F-C955CE45DC08}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Maui", "src\Maui\Prism.DryIoc.Maui\Prism.DryIoc.Maui.csproj", "{60D92138-66AC-4DC9-973D-FDD917F87112}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maui", "Maui", "{540CEEC1-D541-4614-BF0B-18056A83E434}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Maui.Tests", "tests\Maui\Prism.Maui.Tests\Prism.Maui.Tests.csproj", "{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Maui.Tests", "tests\Maui\Prism.DryIoc.Maui.Tests\Prism.DryIoc.Maui.Tests.csproj", "{8711D306-1118-4A11-9399-EF14AA13015E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Events", "src\Prism.Events\Prism.Events.csproj", "{8610485A-BE9F-4938-86D4-E9F1FA1739A0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI.Markup", "src\Uno\Prism.Uno.Markup\Prism.Uno.WinUI.Markup.csproj", "{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{8AE1015F-4D62-47EF-A576-2F7411EC20D5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Avalonia", "src\Avalonia\Prism.Avalonia\Prism.Avalonia.csproj", "{C505C63F-99E6-464F-8C83-1AE4239C19B1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Avalonia", "src\Avalonia\Prism.DryIoc.Avalonia\Prism.DryIoc.Avalonia.csproj", "{A6B7B19C-3288-4CD2-A737-527BEB1ED807}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Avalonia.Tests", "tests\Avalonia\Prism.Avalonia.Tests\Prism.Avalonia.Tests.csproj", "{AB501F63-8E8C-4333-8A15-81BA02F3C703}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.Container.Avalonia.Shared", "tests\Avalonia\Prism.Container.Avalonia.Shared\Prism.Container.Avalonia.Shared.shproj", "{6FDA7D49-DF44-4E8F-A182-0EB73DD3C452}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Avalonia.Tests", "tests\Avalonia\Prism.DryIoc.Avalonia.Tests\Prism.DryIoc.Avalonia.Tests.csproj", "{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.IocContainer.Avalonia.Tests.Support", "tests\Avalonia\Prism.IocContainer.Avalonia.Tests.Support\Prism.IocContainer.Avalonia.Tests.Support.csproj", "{887E0794-798D-4127-847E-6F68D5C9B334}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{904D5094-55F9-4581-90AC-D6C1131F8152}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{8B763117-8E13-0D1A-AFE0-5BC3FACCF29C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Uno.WinUI.Tests", "tests\Uno\Prism.Uno.WinUI.Tests\Prism.Uno.WinUI.Tests.csproj", "{05132055-211C-42D4-B40A-39E4BB066E7B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Prism.Uno", "Prism.Uno", "{1E1EDCAE-FD32-8442-764F-7F151A12D8D4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Uno.WinUI.Tests", "tests\Uno\Prism.DryIoc.Uno.WinUI.Tests\Prism.DryIoc.Uno.WinUI.Tests.csproj", "{158173F6-E776-422C-9127-8994C504867B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Prism.DryIoc.Uno", "Prism.DryIoc.Uno", "{064C69BC-4576-336C-79BF-6771226CD9DC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Debug|x64.Build.0 = Debug|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Debug|x86.Build.0 = Debug|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Release|x64.ActiveCfg = Release|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Release|x64.Build.0 = Release|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Release|x86.ActiveCfg = Release|Any CPU
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF}.Release|x86.Build.0 = Release|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Debug|x64.Build.0 = Debug|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Debug|x86.Build.0 = Debug|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Release|x64.ActiveCfg = Release|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Release|x64.Build.0 = Release|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Release|x86.ActiveCfg = Release|Any CPU
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A}.Release|x86.Build.0 = Release|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Debug|x64.Build.0 = Debug|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Debug|x86.Build.0 = Debug|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Release|x64.ActiveCfg = Release|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Release|x64.Build.0 = Release|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Release|x86.ActiveCfg = Release|Any CPU
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF}.Release|x86.Build.0 = Release|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Release|x64.Build.0 = Release|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2}.Release|x86.Build.0 = Release|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Debug|x64.Build.0 = Debug|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Debug|x86.Build.0 = Debug|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Release|x64.ActiveCfg = Release|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Release|x64.Build.0 = Release|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Release|x86.ActiveCfg = Release|Any CPU
-		{E9A2458B-999D-4D36-822F-663D3830575A}.Release|x86.Build.0 = Release|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Debug|x64.Build.0 = Debug|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Debug|x86.Build.0 = Debug|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Release|x64.ActiveCfg = Release|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Release|x64.Build.0 = Release|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Release|x86.ActiveCfg = Release|Any CPU
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA}.Release|x86.Build.0 = Release|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Debug|x64.Build.0 = Debug|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Debug|x86.Build.0 = Debug|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Release|x64.ActiveCfg = Release|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Release|x64.Build.0 = Release|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Release|x86.ActiveCfg = Release|Any CPU
-		{BA05687E-2317-4A65-805B-C596F52F7203}.Release|x86.Build.0 = Release|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Debug|x64.Build.0 = Debug|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Debug|x86.Build.0 = Debug|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Release|x64.ActiveCfg = Release|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Release|x64.Build.0 = Release|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Release|x86.ActiveCfg = Release|Any CPU
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81}.Release|x86.Build.0 = Release|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Debug|x64.Build.0 = Debug|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Debug|x86.Build.0 = Debug|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|x64.ActiveCfg = Release|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|x64.Build.0 = Release|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|x86.Build.0 = Release|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|x64.Build.0 = Debug|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|x86.Build.0 = Debug|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|x64.ActiveCfg = Release|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|x64.Build.0 = Release|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|x86.ActiveCfg = Release|Any CPU
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|x86.Build.0 = Release|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|x64.Build.0 = Debug|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|x86.Build.0 = Debug|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Release|x64.ActiveCfg = Release|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Release|x64.Build.0 = Release|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Release|x86.ActiveCfg = Release|Any CPU
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Release|x86.Build.0 = Release|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Debug|x64.Build.0 = Debug|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Debug|x86.Build.0 = Debug|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Release|x64.ActiveCfg = Release|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Release|x64.Build.0 = Release|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Release|x86.ActiveCfg = Release|Any CPU
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A}.Release|x86.Build.0 = Release|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Debug|x64.Build.0 = Debug|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Debug|x86.Build.0 = Debug|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Release|x64.ActiveCfg = Release|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Release|x64.Build.0 = Release|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Release|x86.ActiveCfg = Release|Any CPU
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08}.Release|x86.Build.0 = Release|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Debug|x64.Build.0 = Debug|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Debug|x86.Build.0 = Debug|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Release|x64.ActiveCfg = Release|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Release|x64.Build.0 = Release|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Release|x86.ActiveCfg = Release|Any CPU
-		{60D92138-66AC-4DC9-973D-FDD917F87112}.Release|x86.Build.0 = Release|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Debug|x64.Build.0 = Debug|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Debug|x86.Build.0 = Debug|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Release|x64.ActiveCfg = Release|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Release|x64.Build.0 = Release|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7}.Release|x86.Build.0 = Release|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Debug|x64.Build.0 = Debug|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Debug|x86.Build.0 = Debug|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Release|x64.ActiveCfg = Release|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Release|x64.Build.0 = Release|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Release|x86.ActiveCfg = Release|Any CPU
-		{8711D306-1118-4A11-9399-EF14AA13015E}.Release|x86.Build.0 = Release|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Debug|x64.Build.0 = Debug|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Debug|x86.Build.0 = Debug|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|x64.ActiveCfg = Release|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|x64.Build.0 = Release|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|x86.ActiveCfg = Release|Any CPU
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0}.Release|x86.Build.0 = Release|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x64.Build.0 = Debug|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Debug|x86.Build.0 = Debug|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x64.ActiveCfg = Release|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x64.Build.0 = Release|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x86.ActiveCfg = Release|Any CPU
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x86.Build.0 = Release|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x64.Build.0 = Debug|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x86.Build.0 = Debug|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x64.ActiveCfg = Release|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x64.Build.0 = Release|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x86.Build.0 = Release|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x64.Build.0 = Debug|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x86.Build.0 = Debug|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x64.ActiveCfg = Release|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x64.Build.0 = Release|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x86.ActiveCfg = Release|Any CPU
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x86.Build.0 = Release|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Debug|x64.Build.0 = Debug|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Debug|x86.Build.0 = Debug|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Release|x64.ActiveCfg = Release|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Release|x64.Build.0 = Release|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Release|x86.ActiveCfg = Release|Any CPU
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703}.Release|x86.Build.0 = Release|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Debug|x64.Build.0 = Debug|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Debug|x86.Build.0 = Debug|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Release|x64.ActiveCfg = Release|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Release|x64.Build.0 = Release|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Release|x86.ActiveCfg = Release|Any CPU
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF}.Release|x86.Build.0 = Release|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Debug|x64.Build.0 = Debug|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Debug|x86.Build.0 = Debug|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Release|Any CPU.Build.0 = Release|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Release|x64.ActiveCfg = Release|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Release|x64.Build.0 = Release|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Release|x86.ActiveCfg = Release|Any CPU
-		{887E0794-798D-4127-847E-6F68D5C9B334}.Release|x86.Build.0 = Release|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x64.Build.0 = Debug|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x86.Build.0 = Debug|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x64.ActiveCfg = Release|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x64.Build.0 = Release|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x86.ActiveCfg = Release|Any CPU
-		{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x86.Build.0 = Release|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Debug|x64.Build.0 = Debug|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Debug|x86.Build.0 = Debug|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Release|x64.ActiveCfg = Release|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Release|x64.Build.0 = Release|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Release|x86.ActiveCfg = Release|Any CPU
-		{158173F6-E776-422C-9127-8994C504867B}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F634CA1E-9237-4E69-B23C-91AA6FBCABFF} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
-		{8D85E3BC-6DD8-4F71-93DA-ABE51252CA2A} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
-		{C2BA93F6-D2E1-455F-B9FA-6221D087295E} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
-		{CE80554B-E37B-4B52-AA80-1F96DA1AC3EF} = {C2BA93F6-D2E1-455F-B9FA-6221D087295E}
-		{0C8AAB85-387C-41D2-ABCE-BAFAF74B62B2} = {C2BA93F6-D2E1-455F-B9FA-6221D087295E}
-		{E9A2458B-999D-4D36-822F-663D3830575A} = {C2BA93F6-D2E1-455F-B9FA-6221D087295E}
-		{F1F91777-01EA-43A3-A3ED-D473B382F46C} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
-		{C4D210AF-C91E-4310-ADE5-881A7DFE8AAA} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
-		{BA05687E-2317-4A65-805B-C596F52F7203} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
-		{367BE810-5B34-4894-BE47-1C8DCC67DE81} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
-		{2E8F565D-9D13-424E-BD86-C5A362F9AAE7} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
-		{8F959801-D494-4CAF-9437-90F30472E169} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
-		{BD42A7D6-A84D-4D27-9C28-7F6A2EC477F1} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
-		{E74664C1-1BB1-4920-8099-2C9125CFD00B} = {8F959801-D494-4CAF-9437-90F30472E169}
-		{DB530D15-0556-4B6F-96B2-1497C8DF08D6} = {8F959801-D494-4CAF-9437-90F30472E169}
-		{24639CEB-266D-40E1-B0A8-B78BB6F8CEF8} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
-		{BC84ABD6-A230-4367-8E6A-85B6BA1D851A} = {24639CEB-266D-40E1-B0A8-B78BB6F8CEF8}
-		{D7B41D0E-CBE4-4846-992F-C955CE45DC08} = {24639CEB-266D-40E1-B0A8-B78BB6F8CEF8}
-		{60D92138-66AC-4DC9-973D-FDD917F87112} = {24639CEB-266D-40E1-B0A8-B78BB6F8CEF8}
-		{540CEEC1-D541-4614-BF0B-18056A83E434} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
-		{7A1E157F-D4CD-4E6B-9CE3-1894EB2A15A7} = {540CEEC1-D541-4614-BF0B-18056A83E434}
-		{8711D306-1118-4A11-9399-EF14AA13015E} = {540CEEC1-D541-4614-BF0B-18056A83E434}
-		{8610485A-BE9F-4938-86D4-E9F1FA1739A0} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
-		{0EA416B6-0AB6-464B-9F4D-206FFCFB262D} = {8F959801-D494-4CAF-9437-90F30472E169}
-		{8AE1015F-4D62-47EF-A576-2F7411EC20D5} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
-		{C505C63F-99E6-464F-8C83-1AE4239C19B1} = {8AE1015F-4D62-47EF-A576-2F7411EC20D5}
-		{A6B7B19C-3288-4CD2-A737-527BEB1ED807} = {8AE1015F-4D62-47EF-A576-2F7411EC20D5}
-		{AB501F63-8E8C-4333-8A15-81BA02F3C703} = {904D5094-55F9-4581-90AC-D6C1131F8152}
-		{6FDA7D49-DF44-4E8F-A182-0EB73DD3C452} = {904D5094-55F9-4581-90AC-D6C1131F8152}
-		{03B9C775-9582-409F-B67F-6B8A0CE0C7AF} = {904D5094-55F9-4581-90AC-D6C1131F8152}
-		{887E0794-798D-4127-847E-6F68D5C9B334} = {904D5094-55F9-4581-90AC-D6C1131F8152}
-		{904D5094-55F9-4581-90AC-D6C1131F8152} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
-		{8B763117-8E13-0D1A-AFE0-5BC3FACCF29C} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
-		{05132055-211C-42D4-B40A-39E4BB066E7B} = {8B763117-8E13-0D1A-AFE0-5BC3FACCF29C}
-		{1E1EDCAE-FD32-8442-764F-7F151A12D8D4} = {8F959801-D494-4CAF-9437-90F30472E169}
-		{158173F6-E776-422C-9127-8994C504867B} = {8B763117-8E13-0D1A-AFE0-5BC3FACCF29C}
-		{064C69BC-4576-336C-79BF-6771226CD9DC} = {8F959801-D494-4CAF-9437-90F30472E169}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6}
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		tests\Avalonia\Prism.Container.Avalonia.Shared\Prism.Container.Avalonia.Shared.projitems*{03b9c775-9582-409f-b67f-6b8a0ce0c7af}*SharedItemsImports = 5
-		tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.projitems*{367be810-5b34-4894-be47-1c8dcc67de81}*SharedItemsImports = 5
-		tests\Avalonia\Prism.Container.Avalonia.Shared\Prism.Container.Avalonia.Shared.projitems*{6fda7d49-df44-4e8f-a182-0eb73dd3c452}*SharedItemsImports = 13
-		tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.projitems*{ba05687e-2317-4a65-805b-c596f52f7203}*SharedItemsImports = 5
-		tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.projitems*{bd42a7d6-a84d-4d27-9c28-7f6a2ec477f1}*SharedItemsImports = 13
-	EndGlobalSection
-EndGlobal
diff --git a/PrismLibrary.slnx b/PrismLibrary.slnx
new file mode 100644
index 0000000000..c06bfccc0b
--- /dev/null
+++ b/PrismLibrary.slnx
@@ -0,0 +1,68 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".gitignore" />
+    <File Path="CodeCoverage.runsettings" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.build.targets" />
+    <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
+    <File Path="xunit.runner.json" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Directory.Build.targets" />
+    <Project Path="src/Prism.Core/Prism.Core.csproj" />
+    <Project Path="src/Prism.Events/Prism.Events.csproj" />
+  </Folder>
+  <Folder Name="/src/Avalonia/">
+    <Project Path="src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj" />
+    <Project Path="src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj" />
+  </Folder>
+  <Folder Name="/src/Maui/">
+    <Project Path="src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj" />
+    <Project Path="src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj" />
+    <Project Path="src/Maui/Prism.Maui/Prism.Maui.csproj" />
+  </Folder>
+  <Folder Name="/src/Uno/">
+    <Project Path="src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj" />
+    <Project Path="src/Uno/Prism.Uno.Markup/Prism.Uno.WinUI.Markup.csproj" />
+    <Project Path="src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj" />
+  </Folder>
+  <Folder Name="/src/Uno/Prism.DryIoc.Uno/" />
+  <Folder Name="/src/Uno/Prism.Uno/" />
+  <Folder Name="/src/Wpf/">
+    <Project Path="src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj" />
+    <Project Path="src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj" />
+    <Project Path="src/Wpf/Prism.Wpf/Prism.Wpf.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/Prism.Core.Tests/Prism.Core.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Avalonia/">
+    <Project Path="tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj" />
+    <Project Path="tests/Avalonia/Prism.Container.Avalonia.Shared/Prism.Container.Avalonia.Shared.shproj" />
+    <Project Path="tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj" />
+    <Project Path="tests/Avalonia/Prism.IocContainer.Avalonia.Tests.Support/Prism.IocContainer.Avalonia.Tests.Support.csproj" />
+  </Folder>
+  <Folder Name="/tests/Maui/">
+    <Project Path="tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj" />
+    <Project Path="tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Uno/">
+    <Project Path="tests/Uno/Prism.DryIoc.Uno.WinUI.Tests/Prism.DryIoc.Uno.WinUI.Tests.csproj" />
+    <Project Path="tests/Uno/Prism.Uno.WinUI.Tests/Prism.Uno.WinUI.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Wpf/">
+    <Project Path="tests/Wpf/Prism.Container.Wpf.Shared/Prism.Container.Wpf.Shared.shproj" />
+    <Project Path="tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj" />
+    <Project Path="tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj" />
+    <Project Path="tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj" />
+    <Project Path="tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj" />
+  </Folder>
+</Solution>
diff --git a/PrismLibrary_Avalonia.slnf b/PrismLibrary_Avalonia.slnf
index 4dc61b7f6e..6487d58d6e 100644
--- a/PrismLibrary_Avalonia.slnf
+++ b/PrismLibrary_Avalonia.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "PrismLibrary.sln",
+    "path": "PrismLibrary.slnx",
     "projects": [
       "src\\Avalonia\\Prism.Avalonia\\Prism.Avalonia.csproj",
       "src\\Avalonia\\Prism.DryIoc.Avalonia\\Prism.DryIoc.Avalonia.csproj",
diff --git a/PrismLibrary_Core.slnf b/PrismLibrary_Core.slnf
index 5cbb22b6ee..e2b855df6b 100644
--- a/PrismLibrary_Core.slnf
+++ b/PrismLibrary_Core.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "PrismLibrary.sln",
+    "path": "PrismLibrary.slnx",
     "projects": [
       "src\\Prism.Core\\Prism.Core.csproj",
       "src\\Prism.Events\\Prism.Events.csproj",
diff --git a/PrismLibrary_Maui.slnf b/PrismLibrary_Maui.slnf
index 0ef9a20368..5614b7ed74 100644
--- a/PrismLibrary_Maui.slnf
+++ b/PrismLibrary_Maui.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "PrismLibrary.sln",
+    "path": "PrismLibrary.slnx",
     "projects": [
       "src\\Maui\\Prism.DryIoc.Maui\\Prism.DryIoc.Maui.csproj",
       "src\\Maui\\Prism.Maui.Rx\\Prism.Maui.Rx.csproj",
diff --git a/PrismLibrary_Uno.slnf b/PrismLibrary_Uno.slnf
index 8b995f6cb8..bc91721461 100644
--- a/PrismLibrary_Uno.slnf
+++ b/PrismLibrary_Uno.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "PrismLibrary.sln",
+    "path": "PrismLibrary.slnx",
     "projects": [
       "src\\Prism.Core\\Prism.Core.csproj",
       "src\\Prism.Events\\Prism.Events.csproj",
diff --git a/PrismLibrary_Wpf.slnf b/PrismLibrary_Wpf.slnf
index 5c212e7638..fbf94aca94 100644
--- a/PrismLibrary_Wpf.slnf
+++ b/PrismLibrary_Wpf.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "PrismLibrary.sln",
+    "path": "PrismLibrary.slnx",
     "projects": [
       "src\\Prism.Core\\Prism.Core.csproj",
       "src\\Prism.Events\\Prism.Events.csproj",
diff --git a/e2e/Avalonia/PrismAvaloniaDemo.sln b/e2e/Avalonia/PrismAvaloniaDemo.sln
deleted file mode 100644
index 903b5aa92c..0000000000
--- a/e2e/Avalonia/PrismAvaloniaDemo.sln
+++ /dev/null
@@ -1,57 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.10.35122.118
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrismAvaloniaDemo", "PrismAvaloniaDemo\PrismAvaloniaDemo.csproj", "{89EF9B20-B80E-4B4C-A202-170CC0C0B62A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Prism Library", "Prism Library", "{7EEF2BF7-98F5-432B-B36D-DB4915CF4A3D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Avalonia", "..\..\src\Avalonia\Prism.Avalonia\Prism.Avalonia.csproj", "{CD50461C-B394-433A-86CA-3DBCD13E8B22}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Avalonia", "..\..\src\Avalonia\Prism.DryIoc.Avalonia\Prism.DryIoc.Avalonia.csproj", "{FF15E73E-5D71-48DD-80D5-DDCA6A59A6B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core", "..\..\src\Prism.Core\Prism.Core.csproj", "{62ADE0CF-751D-4AC6-9C2C-21DC12CBD338}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Events", "..\..\src\Prism.Events\Prism.Events.csproj", "{FE27B57B-F986-44B7-90CE-421034A891B9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{89EF9B20-B80E-4B4C-A202-170CC0C0B62A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89EF9B20-B80E-4B4C-A202-170CC0C0B62A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89EF9B20-B80E-4B4C-A202-170CC0C0B62A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89EF9B20-B80E-4B4C-A202-170CC0C0B62A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CD50461C-B394-433A-86CA-3DBCD13E8B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD50461C-B394-433A-86CA-3DBCD13E8B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD50461C-B394-433A-86CA-3DBCD13E8B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CD50461C-B394-433A-86CA-3DBCD13E8B22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF15E73E-5D71-48DD-80D5-DDCA6A59A6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF15E73E-5D71-48DD-80D5-DDCA6A59A6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF15E73E-5D71-48DD-80D5-DDCA6A59A6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF15E73E-5D71-48DD-80D5-DDCA6A59A6B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62ADE0CF-751D-4AC6-9C2C-21DC12CBD338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62ADE0CF-751D-4AC6-9C2C-21DC12CBD338}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62ADE0CF-751D-4AC6-9C2C-21DC12CBD338}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62ADE0CF-751D-4AC6-9C2C-21DC12CBD338}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE27B57B-F986-44B7-90CE-421034A891B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE27B57B-F986-44B7-90CE-421034A891B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE27B57B-F986-44B7-90CE-421034A891B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE27B57B-F986-44B7-90CE-421034A891B9}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CD50461C-B394-433A-86CA-3DBCD13E8B22} = {7EEF2BF7-98F5-432B-B36D-DB4915CF4A3D}
-		{FF15E73E-5D71-48DD-80D5-DDCA6A59A6B2} = {7EEF2BF7-98F5-432B-B36D-DB4915CF4A3D}
-		{62ADE0CF-751D-4AC6-9C2C-21DC12CBD338} = {7EEF2BF7-98F5-432B-B36D-DB4915CF4A3D}
-		{FE27B57B-F986-44B7-90CE-421034A891B9} = {7EEF2BF7-98F5-432B-B36D-DB4915CF4A3D}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2E70249F-C31B-4FB3-A901-E3767E3A9FF5}
-	EndGlobalSection
-EndGlobal
diff --git a/e2e/Avalonia/PrismAvaloniaDemo.slnx b/e2e/Avalonia/PrismAvaloniaDemo.slnx
new file mode 100644
index 0000000000..e572cd0535
--- /dev/null
+++ b/e2e/Avalonia/PrismAvaloniaDemo.slnx
@@ -0,0 +1,9 @@
+<Solution>
+  <Folder Name="/Prism Library/">
+    <Project Path="../../src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj" />
+    <Project Path="../../src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj" />
+    <Project Path="../../src/Prism.Core/Prism.Core.csproj" />
+    <Project Path="../../src/Prism.Events/Prism.Events.csproj" />
+  </Folder>
+  <Project Path="PrismAvaloniaDemo/PrismAvaloniaDemo.csproj" />
+</Solution>
diff --git a/e2e/Maui/MauiModule/ViewModels/ViewDViewModel.cs b/e2e/Maui/MauiModule/ViewModels/ViewDViewModel.cs
index 5f0714e79a..a0e304011e 100644
--- a/e2e/Maui/MauiModule/ViewModels/ViewDViewModel.cs
+++ b/e2e/Maui/MauiModule/ViewModels/ViewDViewModel.cs
@@ -1,9 +1,32 @@
-namespace MauiModule.ViewModels;
+using Prism.Commands;
+using Prism.Dialogs;
+
+namespace MauiModule.ViewModels;
 
 public class ViewDViewModel : ViewModelBase
 {
-    public ViewDViewModel(BaseServices baseServices) 
+    public ViewDViewModel(BaseServices baseServices)
         : base(baseServices)
     {
+        ShowDialogAsyncThenGoBackCommand = new DelegateCommand(
+            OnShowDialogAsyncThenGoBack,
+            () => !string.IsNullOrEmpty(SelectedDialog))
+            .ObservesProperty(() => SelectedDialog);
+    }
+
+    /// <summary>GitHub #3395 — same continuation as <c>await ShowDialogAsync</c> then <c>await GoBackAsync</c>.</summary>
+    public DelegateCommand ShowDialogAsyncThenGoBackCommand { get; }
+
+    private async void OnShowDialogAsyncThenGoBack()
+    {
+        var name = SelectedDialog;
+        if (string.IsNullOrEmpty(name))
+            return;
+
+        Messages.Add($"#3395: await ShowDialogAsync({name})…");
+        var dialogResult = await _dialogs.ShowDialogAsync(name);
+        Messages.Add($"#3395: dialog finished (Result={dialogResult.Result}). Awaiting GoBackAsync…");
+        var navResult = await _navigationService.GoBackAsync();
+        Messages.Add($"#3395: GoBackAsync Success={navResult.Success}.");
     }
 }
diff --git a/e2e/Maui/MauiModule/Views/ViewD.xaml b/e2e/Maui/MauiModule/Views/ViewD.xaml
index a2e2ef587f..7e0b452a56 100644
--- a/e2e/Maui/MauiModule/Views/ViewD.xaml
+++ b/e2e/Maui/MauiModule/Views/ViewD.xaml
@@ -4,10 +4,10 @@
              xmlns:loc="clr-namespace:MauiModule.ViewModels"
              xmlns:prism="http://prismlibrary.com"
              x:Class="MauiModule.Views.ViewD"
-             x:DataType="loc:ViewModelBase"
+             x:DataType="loc:ViewDViewModel"
              Title="{Binding Title}"
              BackgroundColor="White">
-  <Grid RowDefinitions="*,Auto,Auto,Auto,Auto"
+  <Grid RowDefinitions="*,Auto,Auto,Auto,Auto,Auto"
         ColumnDefinitions="*,*">
     <CollectionView ItemsSource="{Binding Messages}"
                     Grid.ColumnSpan="2">
@@ -63,5 +63,10 @@
             Margin="10"
             Grid.Row="4"
             Grid.Column="0"/>
+    <Button Text="#3395: Async dialog then Go Back"
+            Command="{Binding ShowDialogAsyncThenGoBackCommand}"
+            Margin="10"
+            Grid.Row="5"
+            Grid.ColumnSpan="2" />
   </Grid>
 </ContentPage>
diff --git a/e2e/Maui/MauiRegionsModule/MauiTestRegionsModule.cs b/e2e/Maui/MauiRegionsModule/MauiTestRegionsModule.cs
index f4fb0ee8e0..ceb3c25dd3 100644
--- a/e2e/Maui/MauiRegionsModule/MauiTestRegionsModule.cs
+++ b/e2e/Maui/MauiRegionsModule/MauiTestRegionsModule.cs
@@ -1,4 +1,4 @@
-using MauiRegionsModule.ViewModels;
+using MauiRegionsModule.ViewModels;
 using MauiRegionsModule.Views;
 
 namespace MauiRegionsModule;
@@ -16,11 +16,14 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
         containerRegistry
             .RegisterForNavigation<ContentRegionPage>()
             .RegisterForNavigation<RegionHome, RegionHomeViewModel>()
+            .RegisterForNavigation<NestedRegionPage, NestedRegionPageViewModel>()
             .RegisterForNavigation<DefaultViewNamedPage>()
             .RegisterForNavigation<DefaultViewInstancePage>()
             .RegisterForNavigation<DefaultViewTypePage>()
             .RegisterForRegionNavigation<RegionViewA, RegionViewAViewModel>()
             .RegisterForRegionNavigation<RegionViewB, RegionViewBViewModel>()
-            .RegisterForRegionNavigation<RegionViewC, RegionViewCViewModel>();
+            .RegisterForRegionNavigation<RegionViewC, RegionViewCViewModel>()
+            .RegisterForRegionNavigation<OuterRegionGuestView, OuterRegionGuestViewModel>()
+            .RegisterForRegionNavigation<InnerRegionGuestView, InnerRegionGuestViewModel>();
     }
 }
diff --git a/e2e/Maui/MauiRegionsModule/NestedRegionNames.cs b/e2e/Maui/MauiRegionsModule/NestedRegionNames.cs
new file mode 100644
index 0000000000..5c34236656
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/NestedRegionNames.cs
@@ -0,0 +1,9 @@
+namespace MauiRegionsModule;
+
+/// <summary>Region names for the nested-regions playground (GitHub #3332).</summary>
+public static class NestedRegionNames
+{
+    public const string OuterRegion = "OuterRegion";
+
+    public const string InnerRegion = "InnerRegion";
+}
diff --git a/e2e/Maui/MauiRegionsModule/ViewModels/InnerRegionGuestViewModel.cs b/e2e/Maui/MauiRegionsModule/ViewModels/InnerRegionGuestViewModel.cs
new file mode 100644
index 0000000000..834f0bbeb6
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/ViewModels/InnerRegionGuestViewModel.cs
@@ -0,0 +1,19 @@
+using MauiRegionsModule.Views;
+using Prism.Mvvm;
+using Prism.Navigation.Regions;
+
+namespace MauiRegionsModule.ViewModels;
+
+public class InnerRegionGuestViewModel : BindableBase, IRegionAware
+{
+    public bool IsNavigationTarget(NavigationContext navigationContext) =>
+        navigationContext.NavigatedName() == nameof(InnerRegionGuestView);
+
+    public void OnNavigatedFrom(NavigationContext navigationContext)
+    {
+    }
+
+    public void OnNavigatedTo(NavigationContext navigationContext)
+    {
+    }
+}
diff --git a/e2e/Maui/MauiRegionsModule/ViewModels/NestedRegionPageViewModel.cs b/e2e/Maui/MauiRegionsModule/ViewModels/NestedRegionPageViewModel.cs
new file mode 100644
index 0000000000..88776bae65
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/ViewModels/NestedRegionPageViewModel.cs
@@ -0,0 +1,25 @@
+using MauiRegionsModule;
+using MauiRegionsModule.Views;
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Navigation.Regions;
+
+namespace MauiRegionsModule.ViewModels;
+
+/// <summary>View model for the nested regions playground page (GitHub #3332).</summary>
+public class NestedRegionPageViewModel : BindableBase
+{
+    private readonly IRegionManager _regionManager;
+
+    public NestedRegionPageViewModel(IRegionManager regionManager)
+    {
+        _regionManager = regionManager;
+        NavigateNestedDemoCommand = new DelegateCommand(OnNavigateNestedDemo);
+    }
+
+    /// <summary>Navigates the outer region; the outer guest navigates the inner region when it loads (same pattern as community nested-region samples).</summary>
+    public DelegateCommand NavigateNestedDemoCommand { get; }
+
+    private void OnNavigateNestedDemo() =>
+        _regionManager.RequestNavigate(NestedRegionNames.OuterRegion, nameof(OuterRegionGuestView));
+}
diff --git a/e2e/Maui/MauiRegionsModule/ViewModels/OuterRegionGuestViewModel.cs b/e2e/Maui/MauiRegionsModule/ViewModels/OuterRegionGuestViewModel.cs
new file mode 100644
index 0000000000..4fb0c25e76
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/ViewModels/OuterRegionGuestViewModel.cs
@@ -0,0 +1,28 @@
+using MauiRegionsModule;
+using MauiRegionsModule.Views;
+using Prism.Mvvm;
+using Prism.Navigation.Regions;
+
+namespace MauiRegionsModule.ViewModels;
+
+/// <summary>
+/// Outer region guest — navigates the inner region on arrival, matching the flow in the community sample
+/// NestedRegionsNotInjectableOnAndroidIssue (R8MC).
+/// </summary>
+public class OuterRegionGuestViewModel : BindableBase, IRegionAware
+{
+    private readonly IRegionManager _regionManager;
+
+    public OuterRegionGuestViewModel(IRegionManager regionManager) =>
+        _regionManager = regionManager;
+
+    public bool IsNavigationTarget(NavigationContext navigationContext) =>
+        navigationContext.NavigatedName() == nameof(OuterRegionGuestView);
+
+    public void OnNavigatedFrom(NavigationContext navigationContext)
+    {
+    }
+
+    public void OnNavigatedTo(NavigationContext navigationContext) =>
+        _regionManager.RequestNavigate(NestedRegionNames.InnerRegion, nameof(InnerRegionGuestView));
+}
diff --git a/e2e/Maui/MauiRegionsModule/Views/InnerRegionGuestView.xaml b/e2e/Maui/MauiRegionsModule/Views/InnerRegionGuestView.xaml
new file mode 100644
index 0000000000..1f2ea5269b
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/Views/InnerRegionGuestView.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="MauiRegionsModule.Views.InnerRegionGuestView"
+             x:DataType="viewmodels:InnerRegionGuestViewModel"
+             xmlns:viewmodels="clr-namespace:MauiRegionsModule.ViewModels">
+  <Border Stroke="#FF6600"
+          Padding="12"
+          Margin="4">
+    <VerticalStackLayout Spacing="6">
+      <Label Text="Inner region guest"
+             FontAttributes="Bold" />
+      <Label Text="GitHub #3332 — nested ContentView region received navigation." />
+    </VerticalStackLayout>
+  </Border>
+</ContentView>
diff --git a/e2e/Maui/MauiRegionsModule/Views/InnerRegionGuestView.xaml.cs b/e2e/Maui/MauiRegionsModule/Views/InnerRegionGuestView.xaml.cs
new file mode 100644
index 0000000000..03d438dd14
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/Views/InnerRegionGuestView.xaml.cs
@@ -0,0 +1,9 @@
+namespace MauiRegionsModule.Views;
+
+public partial class InnerRegionGuestView : ContentView
+{
+    public InnerRegionGuestView()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/e2e/Maui/MauiRegionsModule/Views/NestedRegionPage.xaml b/e2e/Maui/MauiRegionsModule/Views/NestedRegionPage.xaml
new file mode 100644
index 0000000000..e566e7d41c
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/Views/NestedRegionPage.xaml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:prism="http://prismlibrary.com"
+             x:Class="MauiRegionsModule.Views.NestedRegionPage"
+             Title="Nested regions (#3332)"
+             Padding="16">
+  <ScrollView>
+    <VerticalStackLayout Spacing="12">
+      <Label Text="GitHub #3332 playground"
+             FontSize="18"
+             FontAttributes="Bold" />
+      <Label Text="RequestNavigate into the outer region; the outer guest RequestNavigate's the inner region when it loads (#3332). Outer host uses a fixed height so layout runs inside a ScrollView."
+             LineBreakMode="WordWrap" />
+      <ContentView prism:RegionManager.RegionName="OuterRegion"
+                   HeightRequest="220"
+                   VerticalOptions="Start"
+                   BackgroundColor="#1100AA00" />
+      <Button Text="Navigate nested regions (outer then inner)"
+              Command="{Binding NavigateNestedDemoCommand}" />
+    </VerticalStackLayout>
+  </ScrollView>
+</ContentPage>
diff --git a/e2e/Maui/MauiRegionsModule/Views/NestedRegionPage.xaml.cs b/e2e/Maui/MauiRegionsModule/Views/NestedRegionPage.xaml.cs
new file mode 100644
index 0000000000..fc6206d39a
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/Views/NestedRegionPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace MauiRegionsModule.Views;
+
+public partial class NestedRegionPage : ContentPage
+{
+    public NestedRegionPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/e2e/Maui/MauiRegionsModule/Views/OuterRegionGuestView.xaml b/e2e/Maui/MauiRegionsModule/Views/OuterRegionGuestView.xaml
new file mode 100644
index 0000000000..8558b1b344
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/Views/OuterRegionGuestView.xaml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:prism="http://prismlibrary.com"
+             x:Class="MauiRegionsModule.Views.OuterRegionGuestView"
+             x:DataType="viewmodels:OuterRegionGuestViewModel"
+             xmlns:viewmodels="clr-namespace:MauiRegionsModule.ViewModels">
+  <VerticalStackLayout Padding="8" Spacing="8">
+    <Label Text="Outer region guest (GitHub #3332)"
+           FontAttributes="Bold" />
+    <Label Text="Inner region is below; it is navigated when this guest receives region navigation (see outer view model)." />
+    <ContentView x:Name="InnerRegionHostView"
+                 prism:RegionManager.RegionName="InnerRegion"
+                 MinimumHeightRequest="160"
+                 BackgroundColor="#220000FF" />
+  </VerticalStackLayout>
+</ContentView>
diff --git a/e2e/Maui/MauiRegionsModule/Views/OuterRegionGuestView.xaml.cs b/e2e/Maui/MauiRegionsModule/Views/OuterRegionGuestView.xaml.cs
new file mode 100644
index 0000000000..2508c86428
--- /dev/null
+++ b/e2e/Maui/MauiRegionsModule/Views/OuterRegionGuestView.xaml.cs
@@ -0,0 +1,22 @@
+namespace MauiRegionsModule.Views;
+
+/// <summary>
+/// Outer region guest with an inner <see cref="ContentView"/> region (GitHub #3332).
+/// When this view receives a non-zero size, the inner host is invalidated so layout runs without page-level code-behind.
+/// </summary>
+public partial class OuterRegionGuestView : ContentView
+{
+    public OuterRegionGuestView()
+    {
+        InitializeComponent();
+        SizeChanged += OnSizeChanged;
+    }
+
+    void OnSizeChanged(object? sender, EventArgs e)
+    {
+        if (Width <= 0 || Height <= 0)
+            return;
+
+        InnerRegionHostView.InvalidateMeasure();
+    }
+}
diff --git a/e2e/Maui/MauiRegionsModule/Views/RegionHome.xaml b/e2e/Maui/MauiRegionsModule/Views/RegionHome.xaml
index e22942a4ca..b7cb50c27e 100644
--- a/e2e/Maui/MauiRegionsModule/Views/RegionHome.xaml
+++ b/e2e/Maui/MauiRegionsModule/Views/RegionHome.xaml
@@ -18,6 +18,9 @@
         <Button Text="Default View by Instance"
                 Command="{Binding NavigateCommand}"
                 CommandParameter="NavigationPage/DefaultViewInstancePage" />
+        <Button Text="Nested regions (#3332)"
+                Command="{Binding NavigateCommand}"
+                CommandParameter="NavigationPage/NestedRegionPage" />
         <Button Text="Root Page"
                 Command="{Binding NavigateCommand}"
                 CommandParameter="/RootPage" />
diff --git a/e2e/Maui/PrismMauiDemo.sln b/e2e/Maui/PrismMauiDemo.sln
deleted file mode 100644
index 3b50e47146..0000000000
--- a/e2e/Maui/PrismMauiDemo.sln
+++ /dev/null
@@ -1,108 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiModule", "MauiModule\MauiModule.csproj", "{3B47AE8B-3773-4920-A012-B42182742ACA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiRegionsModule", "MauiRegionsModule\MauiRegionsModule.csproj", "{2FF1C748-EA4C-45B1-80BA-A7D9E9E2C8F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrismMauiDemo", "PrismMauiDemo\PrismMauiDemo.csproj", "{BB949746-5591-41FB-80B1-65BE609F6A0E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core", "..\..\src\Prism.Core\Prism.Core.csproj", "{2323BE09-7036-4FA7-B5B5-63046BE825E8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Maui", "..\..\src\Maui\Prism.Maui\Prism.Maui.csproj", "{2B756425-AB8D-4A78-80C5-13EA97C1AC73}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Maui.Rx", "..\..\src\Maui\Prism.Maui.Rx\Prism.Maui.Rx.csproj", "{CC05A6F0-D8FF-498C-80F0-59DC9AAEB08E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8202B92A-A573-4365-8A15-E246504A7CBD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Maui", "..\..\src\Maui\Prism.DryIoc.Maui\Prism.DryIoc.Maui.csproj", "{2CE09D7A-B67C-4586-8432-64EA2D1A3CE4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E91F80AA-3D61-4C28-B876-3EDFB5921E7D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Maui.Tests", "..\..\tests\Maui\Prism.DryIoc.Maui.Tests\Prism.DryIoc.Maui.Tests.csproj", "{EE6F0C99-61D1-4E2E-8185-FBA0D246D5C7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Maui.Tests", "..\..\tests\Maui\Prism.Maui.Tests\Prism.Maui.Tests.csproj", "{F3D2DFDB-95FB-4CBB-A624-35EB6550854D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core.Tests", "..\..\tests\Prism.Core.Tests\Prism.Core.Tests.csproj", "{E0F13AA9-8083-47CA-B10D-93C5285D1505}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Events", "..\..\src\Prism.Events\Prism.Events.csproj", "{5623CB62-59C1-49BC-BB16-4C5D63D82DAC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{16C4C33B-CC0F-4FA4-A117-B9EF161CB7B8}"
-	ProjectSection(SolutionItems) = preProject
-		..\..\Directory.Packages.props = ..\..\Directory.Packages.props
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3B47AE8B-3773-4920-A012-B42182742ACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B47AE8B-3773-4920-A012-B42182742ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B47AE8B-3773-4920-A012-B42182742ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B47AE8B-3773-4920-A012-B42182742ACA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FF1C748-EA4C-45B1-80BA-A7D9E9E2C8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FF1C748-EA4C-45B1-80BA-A7D9E9E2C8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FF1C748-EA4C-45B1-80BA-A7D9E9E2C8F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FF1C748-EA4C-45B1-80BA-A7D9E9E2C8F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB949746-5591-41FB-80B1-65BE609F6A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB949746-5591-41FB-80B1-65BE609F6A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB949746-5591-41FB-80B1-65BE609F6A0E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{BB949746-5591-41FB-80B1-65BE609F6A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB949746-5591-41FB-80B1-65BE609F6A0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2323BE09-7036-4FA7-B5B5-63046BE825E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2323BE09-7036-4FA7-B5B5-63046BE825E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2323BE09-7036-4FA7-B5B5-63046BE825E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2323BE09-7036-4FA7-B5B5-63046BE825E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B756425-AB8D-4A78-80C5-13EA97C1AC73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B756425-AB8D-4A78-80C5-13EA97C1AC73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B756425-AB8D-4A78-80C5-13EA97C1AC73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B756425-AB8D-4A78-80C5-13EA97C1AC73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC05A6F0-D8FF-498C-80F0-59DC9AAEB08E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC05A6F0-D8FF-498C-80F0-59DC9AAEB08E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC05A6F0-D8FF-498C-80F0-59DC9AAEB08E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC05A6F0-D8FF-498C-80F0-59DC9AAEB08E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CE09D7A-B67C-4586-8432-64EA2D1A3CE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CE09D7A-B67C-4586-8432-64EA2D1A3CE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CE09D7A-B67C-4586-8432-64EA2D1A3CE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CE09D7A-B67C-4586-8432-64EA2D1A3CE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE6F0C99-61D1-4E2E-8185-FBA0D246D5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE6F0C99-61D1-4E2E-8185-FBA0D246D5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE6F0C99-61D1-4E2E-8185-FBA0D246D5C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE6F0C99-61D1-4E2E-8185-FBA0D246D5C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3D2DFDB-95FB-4CBB-A624-35EB6550854D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3D2DFDB-95FB-4CBB-A624-35EB6550854D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3D2DFDB-95FB-4CBB-A624-35EB6550854D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3D2DFDB-95FB-4CBB-A624-35EB6550854D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0F13AA9-8083-47CA-B10D-93C5285D1505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0F13AA9-8083-47CA-B10D-93C5285D1505}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0F13AA9-8083-47CA-B10D-93C5285D1505}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0F13AA9-8083-47CA-B10D-93C5285D1505}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5623CB62-59C1-49BC-BB16-4C5D63D82DAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5623CB62-59C1-49BC-BB16-4C5D63D82DAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5623CB62-59C1-49BC-BB16-4C5D63D82DAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5623CB62-59C1-49BC-BB16-4C5D63D82DAC}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2323BE09-7036-4FA7-B5B5-63046BE825E8} = {8202B92A-A573-4365-8A15-E246504A7CBD}
-		{2B756425-AB8D-4A78-80C5-13EA97C1AC73} = {8202B92A-A573-4365-8A15-E246504A7CBD}
-		{CC05A6F0-D8FF-498C-80F0-59DC9AAEB08E} = {8202B92A-A573-4365-8A15-E246504A7CBD}
-		{2CE09D7A-B67C-4586-8432-64EA2D1A3CE4} = {8202B92A-A573-4365-8A15-E246504A7CBD}
-		{EE6F0C99-61D1-4E2E-8185-FBA0D246D5C7} = {E91F80AA-3D61-4C28-B876-3EDFB5921E7D}
-		{F3D2DFDB-95FB-4CBB-A624-35EB6550854D} = {E91F80AA-3D61-4C28-B876-3EDFB5921E7D}
-		{E0F13AA9-8083-47CA-B10D-93C5285D1505} = {E91F80AA-3D61-4C28-B876-3EDFB5921E7D}
-		{5623CB62-59C1-49BC-BB16-4C5D63D82DAC} = {8202B92A-A573-4365-8A15-E246504A7CBD}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {50B0D1F3-D832-4C6C-858E-24F5F3B33632}
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\..\src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{2ce09d7a-b67c-4586-8432-64ea2d1a3ce4}*SharedItemsImports = 5
-	EndGlobalSection
-EndGlobal
diff --git a/e2e/Maui/PrismMauiDemo.slnx b/e2e/Maui/PrismMauiDemo.slnx
new file mode 100644
index 0000000000..8bddf07ac3
--- /dev/null
+++ b/e2e/Maui/PrismMauiDemo.slnx
@@ -0,0 +1,22 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="../../Directory.Packages.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="../../src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj" />
+    <Project Path="../../src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj" />
+    <Project Path="../../src/Maui/Prism.Maui/Prism.Maui.csproj" />
+    <Project Path="../../src/Prism.Core/Prism.Core.csproj" />
+    <Project Path="../../src/Prism.Events/Prism.Events.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="../../tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj" />
+    <Project Path="../../tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj" />
+    <Project Path="../../tests/Prism.Core.Tests/Prism.Core.Tests.csproj" />
+  </Folder>
+  <Project Path="MauiModule/MauiModule.csproj" />
+  <Project Path="MauiRegionsModule/MauiRegionsModule.csproj" />
+  <Project Path="PrismMauiDemo/PrismMauiDemo.csproj">
+    <Deploy Solution="Debug|*" />
+  </Project>
+</Solution>
diff --git a/e2e/Maui/PrismMauiDemo/MauiProgram.cs b/e2e/Maui/PrismMauiDemo/MauiProgram.cs
index c487966737..f0ffe68328 100644
--- a/e2e/Maui/PrismMauiDemo/MauiProgram.cs
+++ b/e2e/Maui/PrismMauiDemo/MauiProgram.cs
@@ -38,13 +38,13 @@ public static MauiApp CreateMauiApp()
                     if (status == "Failed" && !string.IsNullOrEmpty(x.Result?.Exception?.Message))
                         Console.Error.WriteLine(x.Result.Exception.Message);
                 }))
-                //.CreateWindow(navigationService => navigationService.CreateBuilder()
-                //    .AddSegment<SplashPageViewModel>()
-                .CreateWindow(nav => nav.CreateBuilder()
-                    .AddTabbedSegment(page =>
-                        page.CreateTab(t => t.AddNavigationPage().AddSegment("ViewA").AddSegment("ViewB"))
-                        .CreateTab(t => t.AddNavigationPage().AddSegment("ViewA"))
-                    )
+                .CreateWindow(navigationService => navigationService.CreateBuilder()
+                    .AddSegment<SplashPageViewModel>()
+                //.CreateWindow(nav => nav.CreateBuilder()
+                //    .AddTabbedSegment(page =>
+                //        page.CreateTab(t => t.AddNavigationPage().AddSegment("ViewA").AddSegment("ViewB"))
+                //        .CreateTab(t => t.AddNavigationPage().AddSegment("ViewA"))
+                //    )
                     .NavigateAsync(HandleNavigationError))
             )
             //.CreateWindow(nav => nav.CreateBuilder()
diff --git a/e2e/Uno/HelloWorld.sln b/e2e/Uno/HelloWorld.sln
deleted file mode 100644
index 9fc9f03958..0000000000
--- a/e2e/Uno/HelloWorld.sln
+++ /dev/null
@@ -1,488 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32210.308
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{5E74EB0D-FBD3-4399-8F38-AD888DEFFC73}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{660A1FE2-C440-402C-A5DC-6901F5FBED61}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld", "HelloWorld\HelloWorld.csproj", "{09C2B6C8-E492-49E7-A598-18E8881646C8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.Mobile", "HelloWorld.Mobile\HelloWorld.Mobile.csproj", "{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.Wasm", "HelloWorld.Wasm\HelloWorld.Wasm.csproj", "{98201B97-26AE-4FA1-845C-AC7FE025848D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.Skia.Gtk", "HelloWorld.Skia.Gtk\HelloWorld.Skia.Gtk.csproj", "{39B16098-4E39-49C4-9C74-BD5D809F4432}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.Skia.WPF", "HelloWorld.Skia.WPF\HelloWorld.Skia.WPF.csproj", "{7D45AF78-BEC3-44AD-9A8C-3784FB638495}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.Windows", "HelloWorld.Windows\HelloWorld.Windows.csproj", "{92F6D561-4134-444D-8E86-4AD4BF6443C7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.Skia.Linux.FrameBuffer", "HelloWorld.Skia.Linux.FrameBuffer\HelloWorld.Skia.Linux.FrameBuffer.csproj", "{B4A1BD15-DA72-4933-BD26-01E5E43279F8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		..\..\Directory.Packages.props = ..\..\Directory.Packages.props
-		..\..\global.json = ..\..\global.json
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C5D7523-6030-4B75-ABE0-3CB8AA0953CB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core", "..\..\src\Prism.Core\Prism.Core.csproj", "{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI", "..\..\src\Uno\Prism.Uno\Prism.Uno.WinUI.csproj", "{FDA1EB82-8ED3-4284-842D-9E7732CB328C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Uno.WinUI", "..\..\src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.WinUI.csproj", "{8D59D64C-EAF1-4BF7-9E69-556114C96A95}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{F67BA438-F236-460B-B279-A71AB8033B54}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModuleA", "ModuleA\ModuleA.csproj", "{5AD22541-BC5D-45E0-9C95-87B51300FF1C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Events", "..\..\src\Prism.Events\Prism.Events.csproj", "{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.Shared", "HelloWorld.Shared\HelloWorld.Shared.csproj", "{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|ARM64 = Debug|ARM64
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|ARM64 = Release|ARM64
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|ARM.Build.0 = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|x64.Build.0 = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Debug|x86.Build.0 = Debug|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|ARM.ActiveCfg = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|ARM.Build.0 = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|ARM64.Build.0 = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|iPhone.Build.0 = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|x64.ActiveCfg = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|x64.Build.0 = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|x86.ActiveCfg = Release|Any CPU
-		{09C2B6C8-E492-49E7-A598-18E8881646C8}.Release|x86.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|x64.Build.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|x86.Build.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|ARM.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|ARM.Deploy.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|ARM64.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|iPhone.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|x64.ActiveCfg = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|x64.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|x64.Deploy.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|x86.Build.0 = Release|Any CPU
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF}.Release|x86.Deploy.0 = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|x64.Build.0 = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Debug|x86.Build.0 = Debug|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|ARM.Build.0 = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|ARM64.Build.0 = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|iPhone.Build.0 = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|x64.ActiveCfg = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|x64.Build.0 = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|x86.ActiveCfg = Release|Any CPU
-		{98201B97-26AE-4FA1-845C-AC7FE025848D}.Release|x86.Build.0 = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|ARM.Build.0 = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|x64.Build.0 = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Debug|x86.Build.0 = Debug|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|ARM.ActiveCfg = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|ARM.Build.0 = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|ARM64.Build.0 = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|iPhone.Build.0 = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|x64.ActiveCfg = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|x64.Build.0 = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|x86.ActiveCfg = Release|Any CPU
-		{39B16098-4E39-49C4-9C74-BD5D809F4432}.Release|x86.Build.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|x64.Build.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|x86.Build.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|ARM.Build.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|ARM.Deploy.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|ARM64.Build.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|iPhone.Build.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|x64.ActiveCfg = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|x64.Build.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|x64.Deploy.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|x86.ActiveCfg = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|x86.Build.0 = Release|Any CPU
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495}.Release|x86.Deploy.0 = Release|Any CPU
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|Any CPU.Build.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|ARM.ActiveCfg = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|ARM.Build.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|ARM.Deploy.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|ARM64.ActiveCfg = Debug|arm64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|ARM64.Build.0 = Debug|arm64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|ARM64.Deploy.0 = Debug|arm64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|iPhone.ActiveCfg = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|iPhone.Build.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|iPhone.Deploy.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|iPhoneSimulator.Build.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|x64.ActiveCfg = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|x64.Build.0 = Debug|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|x86.ActiveCfg = Debug|x86
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Debug|x86.Build.0 = Debug|x86
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|Any CPU.ActiveCfg = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|Any CPU.Build.0 = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|Any CPU.Deploy.0 = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|ARM.ActiveCfg = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|ARM.Build.0 = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|ARM64.ActiveCfg = Release|arm64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|ARM64.Build.0 = Release|arm64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|iPhone.ActiveCfg = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|iPhone.Build.0 = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|iPhoneSimulator.ActiveCfg = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|iPhoneSimulator.Build.0 = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|x64.ActiveCfg = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|x64.Build.0 = Release|x64
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|x86.ActiveCfg = Release|x86
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7}.Release|x86.Build.0 = Release|x86
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Debug|x86.Build.0 = Debug|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|ARM.Build.0 = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|ARM64.Build.0 = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|iPhone.Build.0 = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|x64.Build.0 = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8}.Release|x86.Build.0 = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|ARM.Build.0 = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|x64.Build.0 = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Debug|x86.Build.0 = Debug|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|ARM.Build.0 = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|ARM64.Build.0 = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|iPhone.Build.0 = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|x64.ActiveCfg = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|x64.Build.0 = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|x86.ActiveCfg = Release|Any CPU
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882}.Release|x86.Build.0 = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|x64.Build.0 = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Debug|x86.Build.0 = Debug|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|ARM.Build.0 = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|ARM64.Build.0 = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|iPhone.Build.0 = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|x64.ActiveCfg = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|x64.Build.0 = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|x86.ActiveCfg = Release|Any CPU
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C}.Release|x86.Build.0 = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|x64.Build.0 = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Debug|x86.Build.0 = Debug|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|ARM.Build.0 = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|ARM64.Build.0 = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|iPhone.Build.0 = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|x64.ActiveCfg = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|x64.Build.0 = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|x86.ActiveCfg = Release|Any CPU
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95}.Release|x86.Build.0 = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|x64.Build.0 = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|ARM.Build.0 = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|ARM64.Build.0 = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|iPhone.Build.0 = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|x64.ActiveCfg = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|x64.Build.0 = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C}.Release|x86.Build.0 = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|ARM.Build.0 = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|x64.Build.0 = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Debug|x86.Build.0 = Debug|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|ARM.ActiveCfg = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|ARM.Build.0 = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|ARM64.Build.0 = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|iPhone.Build.0 = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|x64.ActiveCfg = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|x64.Build.0 = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|x86.ActiveCfg = Release|Any CPU
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930}.Release|x86.Build.0 = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|x64.Build.0 = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Debug|x86.Build.0 = Debug|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|ARM.Build.0 = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|ARM64.Build.0 = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|iPhone.Build.0 = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|x64.ActiveCfg = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|x64.Build.0 = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|x86.ActiveCfg = Release|Any CPU
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{660A1FE2-C440-402C-A5DC-6901F5FBED61} = {5E74EB0D-FBD3-4399-8F38-AD888DEFFC73}
-		{09C2B6C8-E492-49E7-A598-18E8881646C8} = {5E74EB0D-FBD3-4399-8F38-AD888DEFFC73}
-		{980A4C78-FF3E-4D3B-8D8C-FE78ADFCC3DF} = {660A1FE2-C440-402C-A5DC-6901F5FBED61}
-		{98201B97-26AE-4FA1-845C-AC7FE025848D} = {660A1FE2-C440-402C-A5DC-6901F5FBED61}
-		{39B16098-4E39-49C4-9C74-BD5D809F4432} = {660A1FE2-C440-402C-A5DC-6901F5FBED61}
-		{7D45AF78-BEC3-44AD-9A8C-3784FB638495} = {660A1FE2-C440-402C-A5DC-6901F5FBED61}
-		{92F6D561-4134-444D-8E86-4AD4BF6443C7} = {660A1FE2-C440-402C-A5DC-6901F5FBED61}
-		{B4A1BD15-DA72-4933-BD26-01E5E43279F8} = {660A1FE2-C440-402C-A5DC-6901F5FBED61}
-		{F6F81EE6-24C6-4D4E-A38D-8C4ECADF5882} = {2C5D7523-6030-4B75-ABE0-3CB8AA0953CB}
-		{FDA1EB82-8ED3-4284-842D-9E7732CB328C} = {2C5D7523-6030-4B75-ABE0-3CB8AA0953CB}
-		{8D59D64C-EAF1-4BF7-9E69-556114C96A95} = {2C5D7523-6030-4B75-ABE0-3CB8AA0953CB}
-		{F67BA438-F236-460B-B279-A71AB8033B54} = {5E74EB0D-FBD3-4399-8F38-AD888DEFFC73}
-		{5AD22541-BC5D-45E0-9C95-87B51300FF1C} = {F67BA438-F236-460B-B279-A71AB8033B54}
-		{ABC0F8AF-6FED-4C3E-80B3-54F1A7CC5930} = {2C5D7523-6030-4B75-ABE0-3CB8AA0953CB}
-		{28A534A3-3ADA-4435-B5F5-59FA61DF23EF} = {660A1FE2-C440-402C-A5DC-6901F5FBED61}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {757C5D89-969E-4F38-B8F1-3098C8E17307}
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\..\src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{8d59d64c-eaf1-4bf7-9e69-556114c96a95}*SharedItemsImports = 5
-	EndGlobalSection
-EndGlobal
diff --git a/e2e/Uno/HelloWorld.slnx b/e2e/Uno/HelloWorld.slnx
new file mode 100644
index 0000000000..169f467476
--- /dev/null
+++ b/e2e/Uno/HelloWorld.slnx
@@ -0,0 +1,62 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="ARM" />
+    <Platform Name="ARM64" />
+    <Platform Name="iPhone" />
+    <Platform Name="iPhoneSimulator" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/sample/">
+    <Project Path="HelloWorld/HelloWorld.csproj" />
+  </Folder>
+  <Folder Name="/sample/modules/">
+    <Project Path="ModuleA/ModuleA.csproj" />
+  </Folder>
+  <Folder Name="/sample/Platforms/">
+    <Project Path="HelloWorld.Mobile/HelloWorld.Mobile.csproj">
+      <Deploy />
+    </Project>
+    <Project Path="HelloWorld.Shared/HelloWorld.Shared.csproj" />
+    <Project Path="HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj" />
+    <Project Path="HelloWorld.Skia.Linux.FrameBuffer/HelloWorld.Skia.Linux.FrameBuffer.csproj" />
+    <Project Path="HelloWorld.Skia.WPF/HelloWorld.Skia.WPF.csproj">
+      <Build Solution="Release|Any CPU" Project="false" />
+      <Deploy Solution="*|ARM" />
+      <Deploy Solution="*|ARM64" />
+      <Deploy Solution="*|iPhoneSimulator" />
+      <Deploy Solution="*|x64" />
+      <Deploy Solution="*|x86" />
+      <Deploy Solution="Debug|Any CPU" />
+      <Deploy Solution="Debug|iPhone" />
+    </Project>
+    <Project Path="HelloWorld.Wasm/HelloWorld.Wasm.csproj" />
+    <Project Path="HelloWorld.Windows/HelloWorld.Windows.csproj">
+      <Platform Solution="*|Any CPU" Project="x64" />
+      <Platform Solution="*|ARM" Project="x64" />
+      <Platform Solution="*|ARM64" Project="arm64" />
+      <Platform Solution="*|iPhone" Project="x64" />
+      <Platform Solution="*|iPhoneSimulator" Project="x64" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+      <Deploy Solution="*|Any CPU" />
+      <Deploy Solution="Debug|ARM" />
+      <Deploy Solution="Debug|ARM64" />
+      <Deploy Solution="Debug|iPhone" />
+      <Deploy Solution="Debug|iPhoneSimulator" />
+    </Project>
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="../../Directory.Packages.props" />
+    <File Path="../../global.json" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="../../src/Prism.Core/Prism.Core.csproj" />
+    <Project Path="../../src/Prism.Events/Prism.Events.csproj" />
+    <Project Path="../../src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj" />
+    <Project Path="../../src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj" />
+  </Folder>
+</Solution>
diff --git a/e2e/Wpf/HelloWorld.sln b/e2e/Wpf/HelloWorld.sln
deleted file mode 100644
index 4693daaaf9..0000000000
--- a/e2e/Wpf/HelloWorld.sln
+++ /dev/null
@@ -1,89 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.12.35707.178 d17.12
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld", "HelloWorld\HelloWorld.csproj", "{B03C14CC-8DE9-40EE-9562-12B976E4CEE8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core", "..\..\src\Prism.Core\Prism.Core.csproj", "{457AA668-72BB-4701-9A4E-FA86B0C412DE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Prism Library", "Prism Library", "{15CF1FE1-D78E-4E3D-A9F8-FA0FCC56A83A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Wpf", "..\..\src\Wpf\Prism.Wpf\Prism.Wpf.csproj", "{AA8ED3D6-A708-4187-8FAC-00F56E063AD7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Wpf", "..\..\src\Wpf\Prism.DryIoc.Wpf\Prism.DryIoc.Wpf.csproj", "{A0842858-BFD5-41AE-BDE7-CBD870BC9900}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Wpf", "..\..\src\Wpf\Prism.Unity.Wpf\Prism.Unity.Wpf.csproj", "{DEBADAAB-5C78-444E-AA77-336A43B49EC3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.Bootstrapper", "HelloWorld.Bootstraper\HelloWorld.Bootstrapper.csproj", "{36C11381-D25A-4E40-956F-05E9C440FA86}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.Modules.ModuleA", "Modules\HelloWorld.Modules.ModuleA\HelloWorld.Modules.ModuleA.csproj", "{D16AADD5-6EAA-446A-83F5-9DFC36DD4108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.Core", "HelloWorld.Core\HelloWorld.Core.csproj", "{F9541A8C-42DD-4340-AB57-54C7AAAC1BCC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{63541838-3D6A-4F2E-92EF-AC4953BB9B9B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Events", "..\..\src\Prism.Events\Prism.Events.csproj", "{E35BF062-652E-4520-8DD8-55DC80012D57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B03C14CC-8DE9-40EE-9562-12B976E4CEE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B03C14CC-8DE9-40EE-9562-12B976E4CEE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B03C14CC-8DE9-40EE-9562-12B976E4CEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B03C14CC-8DE9-40EE-9562-12B976E4CEE8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{457AA668-72BB-4701-9A4E-FA86B0C412DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{457AA668-72BB-4701-9A4E-FA86B0C412DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{457AA668-72BB-4701-9A4E-FA86B0C412DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{457AA668-72BB-4701-9A4E-FA86B0C412DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA8ED3D6-A708-4187-8FAC-00F56E063AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA8ED3D6-A708-4187-8FAC-00F56E063AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA8ED3D6-A708-4187-8FAC-00F56E063AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA8ED3D6-A708-4187-8FAC-00F56E063AD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0842858-BFD5-41AE-BDE7-CBD870BC9900}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0842858-BFD5-41AE-BDE7-CBD870BC9900}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0842858-BFD5-41AE-BDE7-CBD870BC9900}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0842858-BFD5-41AE-BDE7-CBD870BC9900}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEBADAAB-5C78-444E-AA77-336A43B49EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEBADAAB-5C78-444E-AA77-336A43B49EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEBADAAB-5C78-444E-AA77-336A43B49EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEBADAAB-5C78-444E-AA77-336A43B49EC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36C11381-D25A-4E40-956F-05E9C440FA86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36C11381-D25A-4E40-956F-05E9C440FA86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36C11381-D25A-4E40-956F-05E9C440FA86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36C11381-D25A-4E40-956F-05E9C440FA86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D16AADD5-6EAA-446A-83F5-9DFC36DD4108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D16AADD5-6EAA-446A-83F5-9DFC36DD4108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D16AADD5-6EAA-446A-83F5-9DFC36DD4108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D16AADD5-6EAA-446A-83F5-9DFC36DD4108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9541A8C-42DD-4340-AB57-54C7AAAC1BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9541A8C-42DD-4340-AB57-54C7AAAC1BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9541A8C-42DD-4340-AB57-54C7AAAC1BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9541A8C-42DD-4340-AB57-54C7AAAC1BCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E35BF062-652E-4520-8DD8-55DC80012D57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E35BF062-652E-4520-8DD8-55DC80012D57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E35BF062-652E-4520-8DD8-55DC80012D57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E35BF062-652E-4520-8DD8-55DC80012D57}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{457AA668-72BB-4701-9A4E-FA86B0C412DE} = {15CF1FE1-D78E-4E3D-A9F8-FA0FCC56A83A}
-		{AA8ED3D6-A708-4187-8FAC-00F56E063AD7} = {15CF1FE1-D78E-4E3D-A9F8-FA0FCC56A83A}
-		{A0842858-BFD5-41AE-BDE7-CBD870BC9900} = {15CF1FE1-D78E-4E3D-A9F8-FA0FCC56A83A}
-		{DEBADAAB-5C78-444E-AA77-336A43B49EC3} = {15CF1FE1-D78E-4E3D-A9F8-FA0FCC56A83A}
-		{D16AADD5-6EAA-446A-83F5-9DFC36DD4108} = {63541838-3D6A-4F2E-92EF-AC4953BB9B9B}
-		{E35BF062-652E-4520-8DD8-55DC80012D57} = {15CF1FE1-D78E-4E3D-A9F8-FA0FCC56A83A}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D877B086-37FD-4AA5-8AB3-CF7E87E27425}
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\..\src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{a0842858-bfd5-41ae-bde7-cbd870bc9900}*SharedItemsImports = 5
-		..\..\src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{debadaab-5c78-444e-aa77-336a43b49ec3}*SharedItemsImports = 5
-	EndGlobalSection
-EndGlobal
diff --git a/e2e/Wpf/HelloWorld.slnx b/e2e/Wpf/HelloWorld.slnx
new file mode 100644
index 0000000000..6aef2e3614
--- /dev/null
+++ b/e2e/Wpf/HelloWorld.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Folder Name="/Modules/">
+    <Project Path="Modules/HelloWorld.Modules.ModuleA/HelloWorld.Modules.ModuleA.csproj" />
+  </Folder>
+  <Folder Name="/Prism Library/">
+    <Project Path="../../src/Prism.Core/Prism.Core.csproj" />
+    <Project Path="../../src/Prism.Events/Prism.Events.csproj" />
+    <Project Path="../../src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj" />
+    <Project Path="../../src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj" />
+    <Project Path="../../src/Wpf/Prism.Wpf/Prism.Wpf.csproj" />
+  </Folder>
+  <Project Path="HelloWorld.Bootstraper/HelloWorld.Bootstrapper.csproj" />
+  <Project Path="HelloWorld.Core/HelloWorld.Core.csproj" />
+  <Project Path="HelloWorld/HelloWorld.csproj" />
+</Solution>
diff --git a/src/Maui/Prism.Maui/Behaviors/ElementParentedCallbackBehavior.cs b/src/Maui/Prism.Maui/Behaviors/ElementParentedCallbackBehavior.cs
index ec4c6f8d8e..5ad2fcf3d0 100644
--- a/src/Maui/Prism.Maui/Behaviors/ElementParentedCallbackBehavior.cs
+++ b/src/Maui/Prism.Maui/Behaviors/ElementParentedCallbackBehavior.cs
@@ -6,7 +6,8 @@ namespace Prism.Behaviors;
 
 internal class ElementParentedCallbackBehavior : Behavior<VisualElement>
 {
-    private Action _callback { get; }
+    private readonly Action _callback;
+    private VisualElement? _target;
 
     public ElementParentedCallbackBehavior(Action callback)
     {
@@ -15,11 +16,16 @@ public ElementParentedCallbackBehavior(Action callback)
 
     protected override void OnAttachedTo(VisualElement view)
     {
+        _target = view;
+
         if (view.TryGetParentPage(out var page))
         {
             var container = page.GetContainerProvider();
             if (container is null)
+            {
+                page.PropertyChanged -= PagePropertyChanged;
                 page.PropertyChanged += PagePropertyChanged;
+            }
             else
             {
                 view.SetContainerProvider(container);
@@ -32,22 +38,46 @@ protected override void OnAttachedTo(VisualElement view)
         }
     }
 
+    protected override void OnDetachingFrom(VisualElement view)
+    {
+        view.ParentChanged -= OnParentChanged;
+        if (view.Parent is VisualElement directParent)
+            directParent.ParentChanged -= OnParentChanged;
+
+        if (view.TryGetParentPage(out var page))
+            page.PropertyChanged -= PagePropertyChanged;
+
+        _target = null;
+        base.OnDetachingFrom(view);
+    }
+
     private void OnParentChanged(object sender, EventArgs e)
     {
-        if (sender is not VisualElement view || view.Parent is null)
+        // Use _target: when listening on Parent.ParentChanged, sender is the parent, not the region host (#3332).
+        var view = _target;
+        if (view?.Parent is null)
             return;
-        else if (view.TryGetParentPage(out var page))
+
+        if (view.TryGetParentPage(out var page))
         {
-            if(page.GetContainerProvider() is not null)
+            if (page.GetContainerProvider() is not null)
             {
                 view.ParentChanged -= OnParentChanged;
+                if (view.Parent is VisualElement directParent)
+                    directParent.ParentChanged -= OnParentChanged;
+
                 _callback();
                 return;
             }
+
+            page.PropertyChanged -= PagePropertyChanged;
             page.PropertyChanged += PagePropertyChanged;
         }
-        else
-            view.Parent.ParentChanged += OnParentChanged;
+        else if (view.Parent is VisualElement parent)
+        {
+            parent.ParentChanged -= OnParentChanged;
+            parent.ParentChanged += OnParentChanged;
+        }
 
         view.ParentChanged -= OnParentChanged;
     }
@@ -59,7 +89,7 @@ private void PagePropertyChanged(object sender, PropertyChangedEventArgs e)
 
         var container = page.GetContainerProvider();
 
-        if(container is not null)
+        if (container is not null)
         {
             page.PropertyChanged -= PagePropertyChanged;
             _callback();
diff --git a/src/Maui/Prism.Maui/Dialogs/DialogContainerPage.cs b/src/Maui/Prism.Maui/Dialogs/DialogContainerPage.cs
index ad3cd0de2b..04c2c60502 100644
--- a/src/Maui/Prism.Maui/Dialogs/DialogContainerPage.cs
+++ b/src/Maui/Prism.Maui/Dialogs/DialogContainerPage.cs
@@ -1,7 +1,8 @@
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Windows.Input;
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Dispatching;
 using Microsoft.Maui.Layouts;
 using Prism.Dialogs.Xaml;
 using Application = Microsoft.Maui.Controls.Application;
@@ -20,6 +21,12 @@ public class DialogContainerPage : ContentPage, IDialogContainer
     /// </summary>
     public const string AutomationIdName = "PrismDialogModal";
 
+    /// <summary>
+    /// When <see cref="DoPop"/> runs (including re-entrantly while <see cref="DoPush"/> is awaiting),
+    /// we must not add this instance to <see cref="IDialogContainer.DialogStack"/> after the modal was already removed.
+    /// </summary>
+    bool _closedBeforeOrDuringPush;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="DialogContainerPage"/> class.
     /// </summary>
@@ -30,6 +37,23 @@ public DialogContainerPage()
         On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.OverFullScreen);
     }
 
+    static IDispatcher? GetDialogDispatcher(Page currentPage) =>
+        currentPage.Dispatcher ?? Application.Current?.Dispatcher;
+
+    static async Task DispatchModalAsync(Page currentPage, Func<Task> work)
+    {
+        var dispatcher = GetDialogDispatcher(currentPage);
+        // No dispatcher (e.g. some test hosts), or already on the UI thread—including re-entrant DoPop during
+        // PushModalAsync: run inline so we do not nest DispatchAsync and deadlock the dispatcher queue.
+        if (dispatcher is null || !dispatcher.IsDispatchRequired)
+        {
+            await work().ConfigureAwait(true);
+            return;
+        }
+
+        await dispatcher.DispatchAsync(work).ConfigureAwait(false);
+    }
+
     /// <summary>
     /// Gets the dialog view displayed in the container page.
     /// </summary>
@@ -51,6 +75,7 @@ public DialogContainerPage()
     /// <returns>A task representing the asynchronous operation.</returns>
     public async Task ConfigureLayout(Page currentPage, View dialogView, bool hideOnBackgroundTapped, ICommand dismissCommand, IDialogParameters parameters)
     {
+        _closedBeforeOrDuringPush = false;
         Dismiss = dismissCommand;
         DialogView = dialogView;
         Content = GetContentLayout(currentPage, dialogView, hideOnBackgroundTapped, dismissCommand, parameters);
@@ -65,7 +90,14 @@ public async Task ConfigureLayout(Page currentPage, View dialogView, bool hideOn
     /// <returns>A task representing the asynchronous operation.</returns>
     protected virtual async Task DoPush(Page currentPage)
     {
-        await currentPage.Navigation.PushModalAsync(this, false);
+        await DispatchModalAsync(currentPage, async () =>
+        {
+            await currentPage.Navigation.PushModalAsync(this, false);
+            if (_closedBeforeOrDuringPush)
+                return;
+
+            IDialogContainer.DialogStack.Add(this);
+        });
     }
 
     /// <summary>
@@ -75,7 +107,12 @@ protected virtual async Task DoPush(Page currentPage)
     /// <returns>A task representing the asynchronous operation.</returns>
     public virtual async Task DoPop(Page currentPage)
     {
-        await currentPage.Navigation.PopModalAsync(false);
+        _closedBeforeOrDuringPush = true;
+        await DispatchModalAsync(currentPage, async () =>
+        {
+            await currentPage.Navigation.PopModalAsync(false);
+            IDialogContainer.DialogStack.Remove(this);
+        });
     }
 
     /// <summary>
diff --git a/src/Maui/Prism.Maui/Dialogs/DialogServiceBase.cs b/src/Maui/Prism.Maui/Dialogs/DialogServiceBase.cs
index dbe81e8a8d..ee9cba78d6 100644
--- a/src/Maui/Prism.Maui/Dialogs/DialogServiceBase.cs
+++ b/src/Maui/Prism.Maui/Dialogs/DialogServiceBase.cs
@@ -31,21 +31,19 @@ public void ShowDialog(string name, IDialogParameters parameters, DialogCallback
                 ?? throw new ViewCreationException(name, ViewType.Dialog);
 
             dialogModal = container.Resolve<IDialogContainer>();
-            IDialogContainer.DialogStack.Add(dialogModal);
             var dialogAware = GetDialogController(view);
 
             async Task DialogAware_RequestClose(IDialogResult outResult)
             {
-                bool didCloseDialog = true;
                 try
                 {
                     var result = await CloseDialogAsync(outResult ?? new DialogResult(), currentPage, dialogModal);
                     if (result.Exception is DialogException de && de.Message == DialogException.CanCloseIsFalse)
                     {
-                        didCloseDialog = false;
                         return;
                     }
 
+                    // DialogStack is updated when the container removes the overlay (e.g. DialogContainerPage.DoPop).
                     await callback.Invoke(result);
                     GC.Collect();
                 }
@@ -53,7 +51,6 @@ async Task DialogAware_RequestClose(IDialogResult outResult)
                 {
                     if (dex.Message == DialogException.CanCloseIsFalse)
                     {
-                        didCloseDialog = false;
                         return;
                     }
 
@@ -73,13 +70,6 @@ async Task DialogAware_RequestClose(IDialogResult outResult)
                 {
                     await InvokeError(callback, ex, parameters);
                 }
-                finally
-                {
-                    if (didCloseDialog && dialogModal is not null)
-                    {
-                        IDialogContainer.DialogStack.Remove(dialogModal);
-                    }
-                }
             }
 
             DialogUtilities.InitializeListener(dialogAware, DialogAware_RequestClose);
diff --git a/src/Maui/Prism.Maui/Dialogs/IDialogContainer.cs b/src/Maui/Prism.Maui/Dialogs/IDialogContainer.cs
index 7a59b88f63..a3cc6ef007 100644
--- a/src/Maui/Prism.Maui/Dialogs/IDialogContainer.cs
+++ b/src/Maui/Prism.Maui/Dialogs/IDialogContainer.cs
@@ -13,6 +13,9 @@ public interface IDialogContainer
     /// </summary>
     /// <remarks>
     /// This property provides access to the list of dialogs currently displayed, typically in the order they were presented.
+    /// Built-in <see cref="DialogContainerPage"/> adds and removes itself when the modal is pushed and popped; custom
+    /// <see cref="IDialogContainer"/> implementations (for example Mopups or Community Toolkit popups) should keep this list
+    /// aligned with when their overlay is actually shown or dismissed.
     /// </remarks>
     static IList<IDialogContainer> DialogStack { get; } = [];
 
diff --git a/src/Maui/Prism.Maui/Navigation/Builder/NavigationBuilderExtensions.cs b/src/Maui/Prism.Maui/Navigation/Builder/NavigationBuilderExtensions.cs
index 247ed9faf1..dfc12d8484 100644
--- a/src/Maui/Prism.Maui/Navigation/Builder/NavigationBuilderExtensions.cs
+++ b/src/Maui/Prism.Maui/Navigation/Builder/NavigationBuilderExtensions.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Prism.Common;
 using Prism.Navigation.Builder;
 
@@ -142,6 +143,7 @@ public static Task<INavigationResult> GoBackToAsync<TViewModel>(this INavigation
     /// Navigates to the URI generated by the <see cref="INavigationBuilder"/>.
     /// </summary>
     /// <param name="builder">The <see cref="INavigationBuilder"/>.</param>
+    [ExcludeFromCodeCoverage(Justification = "Fire-and-forget UI entry point; use INavigationBuilder.NavigateAsync for testable navigation.")]
     public static async void Navigate(this INavigationBuilder builder)
     {
         await builder.NavigateAsync();
@@ -153,6 +155,7 @@ public static async void Navigate(this INavigationBuilder builder)
     /// </summary>
     /// <param name="builder">The <see cref="INavigationBuilder"/>.</param>
     /// <param name="onError">Delegate to handle when we encounter a Navigation Exception</param>
+    [ExcludeFromCodeCoverage(Justification = "Fire-and-forget UI entry point; use INavigationBuilder.NavigateAsync for testable navigation.")]
     public static async void Navigate(this INavigationBuilder builder, Action<Exception> onError)
     {
         await builder.NavigateAsync(onError);
@@ -163,6 +166,7 @@ public static async void Navigate(this INavigationBuilder builder, Action<Except
     /// </summary>
     /// <param name="builder">The <see cref="INavigationBuilder"/>.</param>
     /// <param name="onSuccess">Delegate to handle when the navigation is successful</param>
+    [ExcludeFromCodeCoverage(Justification = "Fire-and-forget UI entry point; use INavigationBuilder.NavigateAsync for testable navigation.")]
     public static async void Navigate(this INavigationBuilder builder, Action onSuccess)
     {
         await builder.NavigateAsync(onSuccess, _ => { });
@@ -174,6 +178,7 @@ public static async void Navigate(this INavigationBuilder builder, Action onSucc
     /// <param name="builder">The <see cref="INavigationBuilder"/>.</param>
     /// <param name="onSuccess">Delegate to handle when the navigation is successful</param>
     /// <param name="onError">Delegate to handle when we encounter a Navigation Exception</param>
+    [ExcludeFromCodeCoverage(Justification = "Fire-and-forget UI entry point; use INavigationBuilder.NavigateAsync for testable navigation.")]
     public static async void Navigate(this INavigationBuilder builder, Action onSuccess, Action<Exception> onError)
     {
         await builder.NavigateAsync(onSuccess, onError);
diff --git a/src/Maui/Prism.Maui/Navigation/PageNavigationService.cs b/src/Maui/Prism.Maui/Navigation/PageNavigationService.cs
index 234114ca3d..5b5da8ee92 100644
--- a/src/Maui/Prism.Maui/Navigation/PageNavigationService.cs
+++ b/src/Maui/Prism.Maui/Navigation/PageNavigationService.cs
@@ -375,9 +375,23 @@ static TabbedPage GetTabbedPage(Element page) =>
             var parts = tabName.Split('|');
             Page selectedChild = null;
             if (parts.Length == 1)
-                selectedChild = tabbedPage.Children.FirstOrDefault(x => ViewModelLocator.GetNavigationName(x) == tabName || (x is NavigationPage navPage && ViewModelLocator.GetNavigationName(navPage.RootPage) == tabName));
+            {
+                var tabRegistration = Registry.Registrations.FirstOrDefault(x => x.Name == tabName);
+                selectedChild = tabbedPage.Children.FirstOrDefault(x =>
+                    ViewModelLocator.GetNavigationName(x) == tabName
+                    || (x is NavigationPage navPage && ViewModelLocator.GetNavigationName(navPage.RootPage) == tabName)
+                    || (tabRegistration is not null && x is NavigationPage np && IsPage(np.RootPage, tabRegistration, tabName))
+                    || (tabRegistration is not null && IsPage(x, tabRegistration, tabName)));
+            }
             else if (parts.Length == 2)
-                selectedChild = tabbedPage.Children.FirstOrDefault(x => x is NavigationPage navPage && ViewModelLocator.GetNavigationName(navPage) == parts[0] && ViewModelLocator.GetNavigationName(navPage.RootPage) == parts[1]);
+            {
+                var rootRegistration = Registry.Registrations.FirstOrDefault(x => x.Name == parts[0]);
+                var leafRegistration = Registry.Registrations.FirstOrDefault(x => x.Name == parts[1]);
+                selectedChild = tabbedPage.Children.FirstOrDefault(x =>
+                    x is NavigationPage navPage
+                    && (ViewModelLocator.GetNavigationName(navPage) == parts[0] || (rootRegistration is not null && IsPage(navPage, rootRegistration, parts[0])))
+                    && (ViewModelLocator.GetNavigationName(navPage.RootPage) == parts[1] || (leafRegistration is not null && IsPage(navPage.RootPage, leafRegistration, parts[1]))));
+            }
             else
                 throw new NavigationException($"Invalid Tab Name: {tabName}");
 
@@ -1070,7 +1084,8 @@ private static bool IsPage(Page referencePage, ViewRegistration registration, st
         {
             // We're allowing an empty string here for cases where someone has a manually constructed TabbedPage
             var navigationName = ViewModelLocator.GetNavigationName(referencePage);
-            if (registration.View == referenceType && (string.IsNullOrEmpty(navigationName) || navigationName == name))
+            // registration.Name matches the navigation key (e.g. "Tab2") even when NavigationName still defaults to CLR type name ("Tab2Mock")
+            if (registration.View == referenceType && (string.IsNullOrEmpty(navigationName) || navigationName == name || registration.Name == name))
                 return true;
 
             // This is an override for cases where someone may have a NavigationPage
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/DialogNavigationRegressionFixture.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/DialogNavigationRegressionFixture.cs
new file mode 100644
index 0000000000..45ae96112d
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/DialogNavigationRegressionFixture.cs
@@ -0,0 +1,51 @@
+using Prism.Dialogs;
+using Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
+using Prism.DryIoc.Maui.Tests.Mocks.Views;
+using Prism.Ioc;
+using Prism.Navigation.Xaml;
+
+namespace Prism.DryIoc.Maui.Tests.Fixtures.Navigation;
+
+/// <summary>Regression tests for dialog + navigation interactions (GitHub #3395).</summary>
+public class DialogNavigationRegressionFixture : TestBase
+{
+    public DialogNavigationRegressionFixture(ITestOutputHelper testOutputHelper)
+        : base(testOutputHelper)
+    {
+    }
+
+    [Fact]
+    public async Task Issue3395_GoBackAsync_After_ShowDialogAsync_Completes_Pops_Navigation_Page()
+    {
+        var mauiApp = CreateBuilder(prism => prism
+                .RegisterTypes(c =>
+                {
+                    c.RegisterDialog<TestDialogView, TestDialogViewModel>("TestDialog");
+                })
+                .CreateWindow("NavigationPage/MockViewA/MockViewB"))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var navPage = Assert.IsAssignableFrom<Microsoft.Maui.Controls.NavigationPage>(window.Page);
+        Assert.IsType<MockViewB>(navPage.CurrentPage);
+        Assert.Equal(2, navPage.Navigation.NavigationStack.Count);
+
+        var container = navPage.CurrentPage.GetContainerProvider();
+        var dialogService = container.Resolve<IDialogService>();
+        var navigationService = Prism.Navigation.Xaml.Navigation.GetNavigationService(navPage.CurrentPage);
+        var hostPage = navPage.CurrentPage;
+
+        Assert.Empty(hostPage.Navigation.ModalStack);
+        var dialogResult = await dialogService.ShowDialogAsync("TestDialog");
+        Assert.NotNull(dialogResult);
+        Assert.Null(dialogResult.Exception);
+        Assert.Equal(ButtonResult.OK, dialogResult.Result);
+        Assert.Empty(hostPage.Navigation.ModalStack);
+        Assert.Empty(IDialogContainer.DialogStack);
+
+        var goBackResult = await navigationService.GoBackAsync();
+        Assert.True(goBackResult.Success);
+        Assert.Null(goBackResult.Exception);
+        Assert.IsType<MockViewA>(navPage.CurrentPage);
+        Assert.Single(navPage.Navigation.NavigationStack);
+    }
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/PageNavigationServiceCoverageTests.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/PageNavigationServiceCoverageTests.cs
new file mode 100644
index 0000000000..32f0fa0176
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/PageNavigationServiceCoverageTests.cs
@@ -0,0 +1,172 @@
+using Prism.Common;
+using Prism.DryIoc.Maui.Tests.Mocks.Navigation;
+using Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
+using Prism.DryIoc.Maui.Tests.Mocks.Views;
+using Prism.Navigation;
+using Prism.Navigation.Xaml;
+using TabbedPage = Microsoft.Maui.Controls.TabbedPage;
+
+namespace Prism.DryIoc.Maui.Tests.Fixtures.Navigation;
+
+/// <summary>
+/// Targets branches in <see cref="Prism.Navigation.PageNavigationService"/> not exercised by other navigation fixtures.
+/// </summary>
+public class PageNavigationServiceCoverageTests : TestBase
+{
+    public PageNavigationServiceCoverageTests(ITestOutputHelper testOutputHelper)
+        : base(testOutputHelper)
+    {
+    }
+
+    [Fact]
+    public async Task SelectTabAsync_InvalidPipeCount_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism
+                .CreateWindow(nav => nav.CreateBuilder()
+                    .AddTabbedSegment(s => s.CreateTab("MockViewA").CreateTab("MockViewB"))
+                    .NavigateAsync()))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var tabbed = (TabbedPage)window.Page;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(tabbed.CurrentPage);
+
+        var result = await nav.SelectTabAsync("A|B|C", new NavigationParameters());
+
+        Assert.False(result.Success);
+        Assert.NotNull(result.Exception);
+    }
+
+    [Fact]
+    public async Task SelectTabAsync_AbsoluteUri_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism
+                .CreateWindow(nav => nav.CreateBuilder()
+                    .AddTabbedSegment(s => s.CreateTab("MockViewA").CreateTab("MockViewB"))
+                    .NavigateAsync()))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var tabbed = (TabbedPage)window.Page;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(tabbed.CurrentPage);
+
+        var result = await nav.SelectTabAsync("MockViewB", new Uri("http://localhost/View", UriKind.Absolute));
+
+        Assert.False(result.Success);
+        Assert.IsType<NavigationException>(result.Exception);
+    }
+
+    [Fact]
+    public async Task SelectTabAsync_UnknownTab_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism
+                .CreateWindow(nav => nav.CreateBuilder()
+                    .AddTabbedSegment(s => s.CreateTab("MockViewA").CreateTab("MockViewB"))
+                    .NavigateAsync()))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var tabbed = (TabbedPage)window.Page;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(tabbed.CurrentPage);
+
+        var result = await nav.SelectTabAsync("NoSuchTab");
+
+        Assert.False(result.Success);
+        Assert.NotNull(result.Exception);
+    }
+
+    [Fact]
+    public async Task SelectTabAsync_WhenCanNavigateFalse_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism
+                .CreateWindow(nav => nav.CreateBuilder()
+                    .AddTabbedSegment(s => s.CreateTab("MockViewA").CreateTab("MockViewB"))
+                    .NavigateAsync()))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var tabbed = (TabbedPage)window.Page;
+        var mockA = (MockViewA)tabbed.CurrentPage;
+        ((MockViewAViewModel)mockA.BindingContext).StopNavigation = true;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(mockA);
+
+        var result = await nav.SelectTabAsync("MockViewB");
+
+        Assert.False(result.Success);
+        Assert.IsType<NavigationException>(result.Exception);
+    }
+
+    [Fact]
+    public async Task GoBackToAsync_WhenTargetNotInStack_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism.CreateWindow("NavigationPage/MockViewA/MockViewB"))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var navPage = (NavigationPage)window.Page;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(navPage.CurrentPage);
+
+        var result = await nav.GoBackToAsync("MissingView");
+
+        Assert.False(result.Success);
+        Assert.NotNull(result.Exception);
+    }
+
+    [Fact]
+    public async Task NavigateAsync_UnregisteredSegment_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism.CreateWindow("MockViewA"))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(window.CurrentPage);
+
+        var result = await nav.NavigateAsync("NotARegisteredPageName");
+
+        Assert.False(result.Success);
+        Assert.NotNull(result.Exception);
+    }
+
+    [Fact]
+    public async Task GoBackToRootAsync_WhenCanNavigateFalse_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism.CreateWindow("NavigationPage/MockViewA/MockViewB"))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var navPage = (NavigationPage)window.Page;
+        ((MockViewBViewModel)navPage.CurrentPage.BindingContext).StopNavigation = true;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(navPage.CurrentPage);
+
+        var result = await nav.GoBackToRootAsync();
+
+        Assert.False(result.Success);
+        Assert.IsType<NavigationException>(result.Exception);
+    }
+
+    [Fact]
+    public async Task GoBackAsync_WhenCanNavigateFalse_ReturnsFailure()
+    {
+        var mauiApp = CreateBuilder(prism => prism.CreateWindow("NavigationPage/MockViewA/MockViewB"))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var navPage = (NavigationPage)window.Page;
+        ((MockViewBViewModel)navPage.CurrentPage.BindingContext).StopNavigation = true;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(navPage.CurrentPage);
+
+        var result = await nav.GoBackAsync();
+
+        Assert.False(result.Success);
+        Assert.IsType<NavigationException>(result.Exception);
+    }
+
+    [Fact]
+    public async Task GoBackAsync_WhenDoPopReturnsNull_ReturnsFailureWithInnerException()
+    {
+        var mauiApp = CreateBuilder(prism => prism.CreateWindow("NavigationPage/MockViewA/MockViewB"))
+            .Build();
+        var window = GetWindow(mauiApp);
+        var navPage = (NavigationPage)window.Page;
+        var nav = Prism.Navigation.Xaml.Navigation.GetNavigationService(navPage.CurrentPage);
+
+        TestPageNavigationService.ForceNextDoPopToReturnNull = true;
+        var result = await nav.GoBackAsync();
+
+        Assert.False(result.Success);
+        Assert.NotNull(result.Exception);
+    }
+
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Regions/RegionFixture.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Regions/RegionFixture.cs
index 60e720a9e5..2a61ad91ee 100644
--- a/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Regions/RegionFixture.cs
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Regions/RegionFixture.cs
@@ -1,5 +1,9 @@
-using Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Layouts;
+using Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
 using Prism.DryIoc.Maui.Tests.Mocks.Views;
+using Prism.Navigation.Regions;
 using Prism.Navigation.Xaml;
 
 namespace Prism.DryIoc.Maui.Tests.Fixtures.Regions;
@@ -286,4 +290,45 @@ public void Issue3328_WhenNavigatingToUnregisteredView_ShouldFailWithKeyNotFound
         Assert.IsType<MockRegionViewA>(page.ContentRegion.Content);
         Assert.IsType<MockRegionViewAViewModel>(page.ContentRegion.Content.BindingContext);
     }
+
+    [Fact]
+    public void Issue3332_NestedContentRegion_InnerRegionReceivesGuest_AfterLayout()
+    {
+        var mauiApp = CreateBuilder(prism => prism
+                .RegisterTypes(container =>
+                {
+                    container.RegisterForNavigation<MockNestedRegionPage, MockNestedRegionPageViewModel>();
+                    container.RegisterForRegionNavigation<MockOuterGuestView, MockOuterGuestViewModel>();
+                    container.RegisterForRegionNavigation<MockInnerGuestView, MockInnerGuestViewModel>();
+                })
+                .CreateWindow("MockNestedRegionPage"))
+            .Build();
+
+        var window = GetWindow(mauiApp);
+        var page = Assert.IsType<MockNestedRegionPage>(window.Page);
+        var regionManager = mauiApp.Services.GetRequiredService<IRegionManager>();
+
+        // Same flow as e2e / community samples: RequestNavigate outer; outer guest RequestNavigate's inner in OnNavigatedTo.
+        NavigationResult? outerResult = null;
+        regionManager.RequestNavigate("OuterRegion", nameof(MockOuterGuestView), r => outerResult = r);
+        Assert.NotNull(outerResult);
+        Assert.True(outerResult!.Success, outerResult.Exception?.ToString());
+
+        var outerGuest = Assert.IsType<MockOuterGuestView>(page.OuterRegion.Content);
+
+        const double w = 400;
+        const double h = 800;
+        page.OuterRegion.Measure(w, h, MeasureFlags.IncludeMargins);
+        page.OuterRegion.Arrange(new Rect(0, 0, w, h));
+        outerGuest.InnerRegionHost.Measure(w, h, MeasureFlags.IncludeMargins);
+        outerGuest.InnerRegionHost.Arrange(new Rect(0, 0, w, h));
+
+        Assert.Contains(regionManager.Regions, r => r.Name == "InnerRegion");
+
+        outerGuest.InnerRegionHost.Measure(w, h, MeasureFlags.IncludeMargins);
+        outerGuest.InnerRegionHost.Arrange(new Rect(0, 0, w, h));
+
+        Assert.NotNull(outerGuest.InnerRegionHost.Content);
+        Assert.IsType<MockInnerGuestView>(outerGuest.InnerRegionHost.Content);
+    }
 }
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/NavigationPop.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/NavigationPop.cs
index 70fc574589..29ebd64dbc 100644
--- a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/NavigationPop.cs
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/NavigationPop.cs
@@ -1,3 +1,4 @@
-namespace Prism.DryIoc.Maui.Tests.Mocks.Navigation;
+#nullable enable
+namespace Prism.DryIoc.Maui.Tests.Mocks.Navigation;
 
-public record NavigationPop(Page Page, bool UseModalNavigation, bool Animated);
+public record NavigationPop(Page? Page, bool UseModalNavigation, bool Animated);
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/TestPageNavigationService.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/TestPageNavigationService.cs
index 13bc2e48c5..a8ce9258dc 100644
--- a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/TestPageNavigationService.cs
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Navigation/TestPageNavigationService.cs
@@ -5,6 +5,11 @@ namespace Prism.DryIoc.Maui.Tests.Mocks.Navigation;
 
 internal sealed class TestPageNavigationService : PageNavigationService
 {
+    /// <summary>
+    /// When true, the next <see cref="DoPop"/> returns null without calling the base implementation (exercises go-back failure paths).
+    /// </summary>
+    internal static bool ForceNextDoPopToReturnNull;
+
     public TestPageNavigationService(
         IContainerProvider container,
         IWindowManager windowManager,
@@ -20,6 +25,13 @@ public TestPageNavigationService(
 
     protected override async Task<Page> DoPop(INavigation navigation, bool useModalNavigation, bool animated)
     {
+        if (ForceNextDoPopToReturnNull)
+        {
+            ForceNextDoPopToReturnNull = false;
+            Recorder.Pop(new NavigationPop(null, useModalNavigation, animated));
+            return null;
+        }
+
         var page = await base.DoPop(navigation, useModalNavigation, animated);
         Recorder.Pop(new NavigationPop(page, useModalNavigation, animated));
         return page;
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockInnerGuestViewModel.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockInnerGuestViewModel.cs
new file mode 100644
index 0000000000..457593bec5
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockInnerGuestViewModel.cs
@@ -0,0 +1,19 @@
+using Prism.DryIoc.Maui.Tests.Mocks.Views;
+using Prism.Mvvm;
+using Prism.Navigation.Regions;
+
+namespace Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
+
+public class MockInnerGuestViewModel : BindableBase, IRegionAware
+{
+    public bool IsNavigationTarget(NavigationContext navigationContext) =>
+        navigationContext.NavigatedName() == nameof(MockInnerGuestView);
+
+    public void OnNavigatedFrom(NavigationContext navigationContext)
+    {
+    }
+
+    public void OnNavigatedTo(NavigationContext navigationContext)
+    {
+    }
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockNestedRegionPageViewModel.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockNestedRegionPageViewModel.cs
new file mode 100644
index 0000000000..1b38d39d2f
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockNestedRegionPageViewModel.cs
@@ -0,0 +1,5 @@
+namespace Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
+
+public class MockNestedRegionPageViewModel
+{
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockOuterGuestViewModel.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockOuterGuestViewModel.cs
new file mode 100644
index 0000000000..30961fb50f
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/MockOuterGuestViewModel.cs
@@ -0,0 +1,24 @@
+using Prism.DryIoc.Maui.Tests.Mocks.Views;
+using Prism.Mvvm;
+using Prism.Navigation.Regions;
+
+namespace Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
+
+/// <summary>Mirrors nested-region samples: inner region is navigated when this guest is navigated to.</summary>
+public class MockOuterGuestViewModel : BindableBase, IRegionAware
+{
+    private readonly IRegionManager _regionManager;
+
+    public MockOuterGuestViewModel(IRegionManager regionManager) =>
+        _regionManager = regionManager;
+
+    public bool IsNavigationTarget(NavigationContext navigationContext) =>
+        navigationContext.NavigatedName() == nameof(MockOuterGuestView);
+
+    public void OnNavigatedFrom(NavigationContext navigationContext)
+    {
+    }
+
+    public void OnNavigatedTo(NavigationContext navigationContext) =>
+        _regionManager.RequestNavigate("InnerRegion", nameof(MockInnerGuestView));
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/TestDialogViewModel.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/TestDialogViewModel.cs
new file mode 100644
index 0000000000..e375c54dcc
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/ViewModels/TestDialogViewModel.cs
@@ -0,0 +1,31 @@
+using Prism.Dialogs;
+using Prism.Mvvm;
+
+namespace Prism.DryIoc.Maui.Tests.Mocks.ViewModels;
+
+/// <summary>Minimal <see cref="IDialogAware"/> for dialog regression tests; view closes itself on <see cref="VisualElement.Loaded"/>.</summary>
+public class TestDialogViewModel : BindableBase, IDialogAware
+{
+    private DialogCloseListener _requestClose;
+
+    public TestDialogViewModel()
+    {
+        _requestClose = new DialogCloseListener();
+    }
+
+    public DialogCloseListener RequestClose
+    {
+        get => _requestClose;
+        set => SetProperty(ref _requestClose, value);
+    }
+
+    public bool CanCloseDialog() => true;
+
+    public void OnDialogClosed()
+    {
+    }
+
+    public void OnDialogOpened(IDialogParameters parameters)
+    {
+    }
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockInnerGuestView.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockInnerGuestView.cs
new file mode 100644
index 0000000000..cdf36dd354
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockInnerGuestView.cs
@@ -0,0 +1,10 @@
+namespace Prism.DryIoc.Maui.Tests.Mocks.Views;
+
+/// <summary>Guest view injected into the nested inner region.</summary>
+public class MockInnerGuestView : ContentView
+{
+    public MockInnerGuestView()
+    {
+        Content = new Label { Text = nameof(MockInnerGuestView) };
+    }
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockNestedRegionPage.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockNestedRegionPage.cs
new file mode 100644
index 0000000000..4d520b19b0
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockNestedRegionPage.cs
@@ -0,0 +1,14 @@
+namespace Prism.DryIoc.Maui.Tests.Mocks.Views;
+
+/// <summary>Shell page with a single outer <see cref="ContentView"/> region (GitHub #3332 repro shape).</summary>
+public class MockNestedRegionPage : ContentPage
+{
+    public MockNestedRegionPage()
+    {
+        OuterRegion = new ContentView();
+        OuterRegion.SetValue(Prism.Navigation.Regions.Xaml.RegionManager.RegionNameProperty, "OuterRegion");
+        Content = OuterRegion;
+    }
+
+    public ContentView OuterRegion { get; }
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockOuterGuestView.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockOuterGuestView.cs
new file mode 100644
index 0000000000..34f38ae3b5
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockOuterGuestView.cs
@@ -0,0 +1,14 @@
+namespace Prism.DryIoc.Maui.Tests.Mocks.Views;
+
+/// <summary>Outer region guest that hosts an inner <see cref="ContentView"/> region.</summary>
+public class MockOuterGuestView : ContentView
+{
+    public MockOuterGuestView()
+    {
+        InnerRegionHost = new ContentView();
+        InnerRegionHost.SetValue(Prism.Navigation.Regions.Xaml.RegionManager.RegionNameProperty, "InnerRegion");
+        Content = InnerRegionHost;
+    }
+
+    public ContentView InnerRegionHost { get; }
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/TestDialogView.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/TestDialogView.cs
new file mode 100644
index 0000000000..835004914a
--- /dev/null
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/TestDialogView.cs
@@ -0,0 +1,20 @@
+using Prism.Dialogs;
+
+namespace Prism.DryIoc.Maui.Tests.Mocks.Views;
+
+/// <summary>Border-based dialog; auto-closes on <see cref="VisualElement.Loaded"/> after <see cref="IDialogContainer.DialogView"/> is wired.</summary>
+public class TestDialogView : Border
+{
+    public TestDialogView()
+    {
+        Content = new Label { Text = "TestDialog" };
+        Loaded += OnLoaded;
+    }
+
+    private void OnLoaded(object? sender, EventArgs e)
+    {
+        Loaded -= OnLoaded;
+        if (BindingContext is IDialogAware aware)
+            aware.RequestClose.Invoke(ButtonResult.OK);
+    }
+}
diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj b/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj
index 0a0a293707..a5752dead1 100644
--- a/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj
+++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj
@@ -4,10 +4,6 @@
     <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Prism.Maui.Tests\Mocks\MockResourcesProvider.cs" LinkBase="Mocks" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" VersionOverride="10.0.10" />
     <PackageReference Include="GitHubActionsTestLogger">
diff --git a/tests/Maui/Prism.Maui.Tests/Fixtures/Behaviors/EventToCommandBehaviorFixture.cs b/tests/Maui/Prism.Maui.Tests/Fixtures/Behaviors/EventToCommandBehaviorFixture.cs
index ed8c52b26a..95adf5863a 100644
--- a/tests/Maui/Prism.Maui.Tests/Fixtures/Behaviors/EventToCommandBehaviorFixture.cs
+++ b/tests/Maui/Prism.Maui.Tests/Fixtures/Behaviors/EventToCommandBehaviorFixture.cs
@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
+using System.Reflection;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Hosting;
 using Microsoft.Maui.Dispatching;
@@ -12,13 +15,32 @@ namespace Prism.Maui.Tests.Fixtures.Behaviors;
 
 public class EventToCommandBehaviorFixture
 {
-    private class ItemTappedEventArgsConverter : IValueConverter
+    /// <summary>Mirrors <see cref="SelectionChangedEventArgs"/> shape for tests (MAUI ctor is not public).</summary>
+    private sealed class FakeSelectionChangedEventArgs : EventArgs
+    {
+        public FakeSelectionChangedEventArgs(IReadOnlyList<object> previousSelection, IReadOnlyList<object> currentSelection)
+        {
+            PreviousSelection = previousSelection;
+            CurrentSelection = currentSelection;
+        }
+
+        public IReadOnlyList<object> PreviousSelection { get; }
+        public IReadOnlyList<object> CurrentSelection { get; }
+    }
+
+    /// <summary>Minimal EventArgs for nested property-path tests (no Item on selection args).</summary>
+    private sealed class TestNestedArgs : EventArgs
+    {
+        public object Item => null;
+    }
+
+    private class SelectionChangedEventArgsConverter : IValueConverter
     {
         private readonly bool _returnParameter;
 
         public bool HasConverted { get; private set; }
 
-        public ItemTappedEventArgsConverter(bool returnParameter)
+        public SelectionChangedEventArgsConverter(bool returnParameter)
         {
             _returnParameter = returnParameter;
         }
@@ -26,7 +48,10 @@ public ItemTappedEventArgsConverter(bool returnParameter)
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             HasConverted = true;
-            return _returnParameter ? parameter : (value as ItemTappedEventArgs)?.Item;
+            if (_returnParameter)
+                return parameter;
+            var prop = value?.GetType().GetRuntimeProperty(nameof(FakeSelectionChangedEventArgs.CurrentSelection));
+            return prop?.GetValue(value) is IReadOnlyList<object> list ? list.FirstOrDefault() : null;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -48,10 +73,10 @@ public void Command_OrderOfExecution()
     {
         const string commandParameter = "ItemProperty";
         var executedCommand = false;
-        var converter = new ItemTappedEventArgsConverter(false);
+        var converter = new SelectionChangedEventArgsConverter(false);
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
+            EventName = "SelectionChanged",
             EventArgsConverter = converter,
             CommandParameter = commandParameter,
             Command = new DelegateCommand<string>(o =>
@@ -62,9 +87,9 @@ public void Command_OrderOfExecution()
                 Assert.False(converter.HasConverted);
             })
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, commandParameter, 0));
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, new FakeSelectionChangedEventArgs(Array.Empty<object>(), new[] { commandParameter }));
         Assert.True(executedCommand);
     }
 
@@ -75,8 +100,8 @@ public void Command_Converter()
         var executedCommand = false;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
-            EventArgsConverter = new ItemTappedEventArgsConverter(false),
+            EventName = "SelectionChanged",
+            EventArgsConverter = new SelectionChangedEventArgsConverter(false),
             Command = new DelegateCommand<string>(o =>
             {
                 executedCommand = true;
@@ -84,9 +109,9 @@ public void Command_Converter()
                 Assert.Equal(item, o);
             })
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item, 0));
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, new FakeSelectionChangedEventArgs(Array.Empty<object>(), new[] { item }));
         Assert.True(executedCommand);
     }
 
@@ -97,8 +122,8 @@ public void Command_ConverterWithConverterParameter()
         var executedCommand = false;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
-            EventArgsConverter = new ItemTappedEventArgsConverter(true),
+            EventName = "SelectionChanged",
+            EventArgsConverter = new SelectionChangedEventArgsConverter(true),
             EventArgsConverterParameter = item,
             Command = new DelegateCommand<string>(o =>
             {
@@ -107,9 +132,9 @@ public void Command_ConverterWithConverterParameter()
                 Assert.Equal(item, o);
             })
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null, 0));
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, new FakeSelectionChangedEventArgs(Array.Empty<object>(), Array.Empty<object>()));
         Assert.True(executedCommand);
     }
 
@@ -120,7 +145,7 @@ public void Command_ExecuteWithParameter()
         var executedCommand = false;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
+            EventName = "SelectionChanged",
             CommandParameter = item,
             Command = new DelegateCommand<string>(o =>
             {
@@ -129,9 +154,9 @@ public void Command_ExecuteWithParameter()
                 Assert.Equal(item, o);
             })
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null, 0));
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, new FakeSelectionChangedEventArgs(Array.Empty<object>(), Array.Empty<object>()));
         Assert.True(executedCommand);
     }
 
@@ -142,18 +167,19 @@ public void Command_EventArgsParameterPath()
         var executedCommand = false;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
-            EventArgsParameterPath = "Item",
-            Command = new DelegateCommand<string>(o =>
+            EventName = "SelectionChanged",
+            EventArgsParameterPath = "CurrentSelection",
+            Command = new DelegateCommand<IReadOnlyList<object>>(o =>
             {
                 executedCommand = true;
                 Assert.NotNull(o);
-                Assert.Equal(item, o);
+                Assert.Single(o);
+                Assert.Equal(item, o[0]);
             })
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item, 0));
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, new FakeSelectionChangedEventArgs(Array.Empty<object>(), new[] { item }));
         Assert.True(executedCommand);
     }
 
@@ -167,7 +193,7 @@ public void Command_EventArgsParameterPath()
     //    var executedCommand = false;
     //    var behavior = new EventToCommandBehaviorMock
     //    {
-    //        EventName = "ItemTapped",
+    //        EventName = "SelectionChanged",
     //        EventArgsParameterPath = "Item.AProperty",
     //        Command = new DelegateCommand<object>(o =>
     //        {
@@ -176,9 +202,9 @@ public void Command_EventArgsParameterPath()
     //            Assert.Equal("Value", o);
     //        })
     //    };
-    //    var listView = new ListView();
-    //    listView.Behaviors.Add(behavior);
-    //    behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item));
+    //    var collectionView = new CollectionView();
+    //    collectionView.Behaviors.Add(behavior);
+    //    behavior.RaiseEvent(collectionView, new TestNestedArgs());
     //    Assert.True(executedCommand);
     //}
 
@@ -189,7 +215,7 @@ public void Command_EventArgsParameterPath_Nested_When_ChildIsNull()
         var executedCommand = false;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
+            EventName = "SelectionChanged",
             EventArgsParameterPath = "Item.AProperty",
             Command = new DelegateCommand<object>(o =>
             {
@@ -197,9 +223,9 @@ public void Command_EventArgsParameterPath_Nested_When_ChildIsNull()
                 Assert.Null(o);
             })
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null, 0));
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, new TestNestedArgs());
         Assert.True(executedCommand);
     }
 
@@ -208,12 +234,12 @@ public void Command_CanExecute()
     {
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
+            EventName = "SelectionChanged",
             Command = new DelegateCommand(() => Assert.True(false), () => false)
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, null);
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, null);
     }
 
     [Fact]
@@ -223,7 +249,7 @@ public void Command_CanExecuteWithParameterShouldExecute()
         var executedCommand = false;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
+            EventName = "SelectionChanged",
             CommandParameter = shouldExeute,
             Command = new DelegateCommand<string>(o =>
             {
@@ -231,9 +257,9 @@ public void Command_CanExecuteWithParameterShouldExecute()
                 Assert.True(true);
             }, o => o.Equals(bool.TrueString))
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, null);
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, null);
         Assert.True(executedCommand);
     }
 
@@ -243,13 +269,13 @@ public void Command_CanExecuteWithParameterShouldNotExeute()
         var shouldExeute = bool.FalseString;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
+            EventName = "SelectionChanged",
             CommandParameter = shouldExeute,
             Command = new DelegateCommand<string>(o => Assert.True(false), o => o.Equals(bool.TrueString))
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, null);
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, null);
     }
 
     [Fact]
@@ -258,16 +284,16 @@ public void Command_Execute()
         var executedCommand = false;
         var behavior = new EventToCommandBehaviorMock
         {
-            EventName = "ItemTapped",
+            EventName = "SelectionChanged",
             Command = new DelegateCommand(() =>
             {
                 executedCommand = true;
                 Assert.True(true);
             })
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
-        behavior.RaiseEvent(listView, null);
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
+        behavior.RaiseEvent(collectionView, null);
         Assert.True(executedCommand);
     }
 
@@ -276,10 +302,10 @@ public void EventName_InvalidEventShouldThrow()
     {
         var behavior = new EventToCommandBehavior
         {
-            EventName = "OnItemTapped"
+            EventName = "OnSelectionChanged"
         };
-        var listView = new ListView();
-        Assert.Throws<ArgumentException>(() => listView.Behaviors.Add(behavior));
+        var collectionView = new CollectionView();
+        Assert.Throws<ArgumentException>(() => collectionView.Behaviors.Add(behavior));
     }
 
     [Fact]
@@ -287,9 +313,9 @@ public void EventName_Valid()
     {
         var behavior = new EventToCommandBehavior
         {
-            EventName = "ItemTapped"
+            EventName = "SelectionChanged"
         };
-        var listView = new ListView();
-        listView.Behaviors.Add(behavior);
+        var collectionView = new CollectionView();
+        collectionView.Behaviors.Add(behavior);
     }
 }
diff --git a/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderExtensionsCoverageTests.cs b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderExtensionsCoverageTests.cs
new file mode 100644
index 0000000000..edbb2eda03
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderExtensionsCoverageTests.cs
@@ -0,0 +1,144 @@
+using Moq;
+using Prism.Common;
+using Prism.Maui.Tests.Mocks.Ioc;
+using Prism.Maui.Tests.Mocks.ViewModels;
+using Prism.Maui.Tests.Mocks.Views;
+using Prism.Navigation;
+using Prism.Navigation.Builder;
+
+namespace Prism.Maui.Tests.Fixtures.Navigation;
+
+public class NavigationBuilderExtensionsCoverageTests
+{
+    [Fact]
+    public void AddNavigationPage_UsesRegisteredNavigationPage()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        container.RegisterForNavigation<NavigationPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        var uri = builder.AddNavigationPage().AddSegment("ViewA").Uri;
+
+        Assert.StartsWith("NavigationPage", uri.ToString(), StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void AddNavigationPage_WithModal_UsesSegmentParameter()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        container.RegisterForNavigation<NavigationPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        var uri = builder.AddNavigationPage(useModalNavigation: true).Uri;
+
+        Assert.Contains("UseModalNavigation", uri.ToString(), StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void AddSegment_WithBoolModal_AppendsParameter()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        var uri = builder.AddSegment("ViewA", useModalNavigation: false).Uri;
+
+        Assert.Contains("ViewA", uri.ToString());
+        Assert.Contains("UseModalNavigation", uri.ToString(), StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void TabbedSegment_CreateTab_UsesViewModelKey_OnCreateTabBuilder()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        container.RegisterForNavigation<PageMock, PageMockViewModel>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var uri = navigationService.Object
+            .CreateBuilder()
+            .AddTabbedSegment(b => b.CreateTab(t => t.AddSegment<PageMockViewModel>()))
+            .Uri;
+
+        Assert.Contains("createTab=", uri.ToString(), StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void TabbedSegment_CreateTab_AddNavigationPageNested()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        container.RegisterForNavigation<NavigationPage>();
+        container.RegisterForNavigation<PageMock, PageMockViewModel>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var uri = navigationService.Object
+            .CreateBuilder()
+            .AddTabbedSegment(b => b.CreateTab(t => t.AddNavigationPage().AddSegment<PageMockViewModel>()))
+            .Uri;
+
+        Assert.Contains("NavigationPage", uri.ToString());
+    }
+
+    [Fact]
+    public void TabbedSegment_SelectTab_StringOverload_JoinsSegments()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var tabbedBuilder = new Mock<ITabbedNavigationBuilder>();
+        tabbedBuilder.Setup(b => b.SelectTab(It.IsAny<string>())).Returns(tabbedBuilder.Object);
+        NavigationBuilderExtensions.SelectTab(tabbedBuilder.Object, "Nav", "Child");
+        tabbedBuilder.Verify(b => b.SelectTab("Nav|Child"), Times.Once);
+    }
+
+    [Fact]
+    public async Task GoBackToAsync_Generic_OnBuilder_ResolvesKey()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        container.RegisterForNavigation<PageMock, PageMockViewModel>();
+        var navMock = new Mock<INavigationService>();
+        navMock
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navMock.Object.CreateBuilder();
+
+        navMock.Setup(n => n.GoBackToAsync(It.IsAny<string>(), It.IsAny<INavigationParameters>()))
+            .ReturnsAsync(new NavigationResult());
+
+        await builder.GoBackToAsync<PageMockViewModel>();
+
+        navMock.Verify(n => n.GoBackToAsync(
+            It.Is<string>(s => s.Length > 0),
+            It.IsAny<INavigationParameters>()), Times.Once);
+    }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderExtensionsErrorTests.cs b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderExtensionsErrorTests.cs
new file mode 100644
index 0000000000..1964f19814
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderExtensionsErrorTests.cs
@@ -0,0 +1,97 @@
+using Microsoft.Maui.Controls;
+using Moq;
+using Prism.Common;
+using Prism.Maui.Tests.Mocks.Ioc;
+using Prism.Navigation;
+using Prism.Navigation.Builder;
+
+namespace Prism.Maui.Tests.Fixtures.Navigation;
+
+public class NavigationBuilderExtensionsErrorTests
+{
+    [Fact]
+    public void AddSegment_TViewModel_Throws_WhenViewModelIsVisualElement()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        var ex = Assert.Throws<NavigationException>(() => builder.AddSegment<VisualElement>());
+        Assert.Equal(NavigationException.MvvmPatternBreak, ex.Message);
+    }
+
+    [Fact]
+    public void AddNavigationPage_Throws_WhenNoNavigationPageRegistered()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        var ex = Assert.Throws<NavigationException>(() => builder.AddNavigationPage());
+        Assert.Equal(NavigationException.NoPageIsRegistered, ex.Message);
+    }
+
+    private sealed class NonRegistryBuilder : INavigationBuilder
+    {
+        public Uri Uri => throw new NotImplementedException();
+
+        public INavigationBuilder AddSegment(string segmentName, Action<ISegmentBuilder> configureSegment) =>
+            throw new NotImplementedException();
+
+        public INavigationBuilder AddTabbedSegment(Action<ITabbedSegmentBuilder> configuration) =>
+            throw new NotImplementedException();
+
+        public INavigationBuilder AddTabbedSegment(string segmentName, Action<ITabbedSegmentBuilder> configureSegment) =>
+            throw new NotImplementedException();
+
+        public INavigationBuilder AddParameter(string key, object value) => throw new NotImplementedException();
+
+        public Task<INavigationResult> GoBackToAsync(string name) => throw new NotImplementedException();
+
+        public Task<INavigationResult> NavigateAsync() => throw new NotImplementedException();
+
+        public Task NavigateAsync(Action<Exception> onError) => throw new NotImplementedException();
+
+        public Task NavigateAsync(Action onSuccess, Action<Exception> onError) => throw new NotImplementedException();
+
+        public INavigationBuilder UseAbsoluteNavigation(bool absolute) => throw new NotImplementedException();
+
+        public INavigationBuilder UseRelativeNavigation() => throw new NotImplementedException();
+
+        public INavigationBuilder WithParameters(INavigationParameters parameters) => throw new NotImplementedException();
+    }
+
+    [Fact]
+    public void AddNavigationPage_Throws_WhenBuilderNotRegistryAware()
+    {
+        var builder = new NonRegistryBuilder();
+        var ex = Assert.Throws<Exception>(() => NavigationBuilderExtensions.AddNavigationPage(builder));
+        Assert.Contains("IRegistryAware", ex.Message);
+    }
+
+    [Fact]
+    public void AddSegment_NullConfigure_DoesNotThrow()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        var uri = builder.AddSegment("X", null!).Uri;
+        Assert.Equal("X", uri.ToString());
+    }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderNavigateAsyncTests.cs b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderNavigateAsyncTests.cs
new file mode 100644
index 0000000000..f8de8bed7d
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderNavigateAsyncTests.cs
@@ -0,0 +1,131 @@
+using Moq;
+using Prism.Common;
+using Prism.Maui.Tests.Mocks.Ioc;
+using Prism.Navigation;
+using Prism.Navigation.Builder;
+
+namespace Prism.Maui.Tests.Fixtures.Navigation;
+
+public class NavigationBuilderNavigateAsyncTests
+{
+    private static (INavigationBuilder Builder, Mock<INavigationService> NavMock) CreateBuilderPair()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navMock = new Mock<INavigationService>();
+        navMock
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        return (navMock.Object.CreateBuilder(), navMock);
+    }
+
+    [Fact]
+    public async Task NavigateAsync_Delegates_ToNavigationService()
+    {
+        var (builder, navMock) = CreateBuilderPair();
+        var expected = new NavigationResult();
+        navMock
+            .Setup(n => n.NavigateAsync(It.IsAny<Uri>(), It.IsAny<INavigationParameters>()))
+            .ReturnsAsync(expected);
+
+        var result = await builder.AddSegment("ViewA").NavigateAsync();
+
+        Assert.Same(expected, result);
+        navMock.Verify(n => n.NavigateAsync(
+            It.Is<Uri>(u => u.ToString() == "ViewA"),
+            It.IsAny<INavigationParameters>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task NavigateAsync_WithOnError_InvokesOnError_WhenException()
+    {
+        var (builder, navMock) = CreateBuilderPair();
+        var boom = new NavigationException("test");
+        navMock
+            .Setup(n => n.NavigateAsync(It.IsAny<Uri>(), It.IsAny<INavigationParameters>()))
+            .ReturnsAsync(new NavigationResult(boom));
+
+        Exception caught = null;
+        await builder.NavigateAsync(ex => caught = ex);
+
+        Assert.Same(boom, caught);
+    }
+
+    [Fact]
+    public async Task NavigateAsync_WithCallbacks_InvokesOnSuccess_WhenSuccessful()
+    {
+        var (builder, navMock) = CreateBuilderPair();
+        navMock
+            .Setup(n => n.NavigateAsync(It.IsAny<Uri>(), It.IsAny<INavigationParameters>()))
+            .ReturnsAsync(new NavigationResult());
+
+        var success = false;
+        Exception error = null;
+        await builder.NavigateAsync(() => success = true, ex => error = ex);
+
+        Assert.True(success);
+        Assert.Null(error);
+    }
+
+    [Fact]
+    public async Task NavigateAsync_WithCallbacks_InvokesOnError_WhenFailed()
+    {
+        var (builder, navMock) = CreateBuilderPair();
+        var boom = new NavigationException("fail");
+        navMock
+            .Setup(n => n.NavigateAsync(It.IsAny<Uri>(), It.IsAny<INavigationParameters>()))
+            .ReturnsAsync(new NavigationResult(boom));
+
+        var success = false;
+        Exception caught = null;
+        await builder.NavigateAsync(() => success = true, ex => caught = ex);
+
+        Assert.False(success);
+        Assert.Same(boom, caught);
+    }
+
+    [Fact]
+    public async Task GoBackToAsync_Delegates_ToNavigationService()
+    {
+        var (builder, navMock) = CreateBuilderPair();
+        var expected = new NavigationResult();
+        navMock
+            .Setup(n => n.GoBackToAsync("ViewZ", It.IsAny<INavigationParameters>()))
+            .ReturnsAsync(expected);
+
+        var result = await builder.GoBackToAsync("ViewZ");
+
+        Assert.Same(expected, result);
+    }
+
+    [Fact]
+    public async Task WithParameters_MergesIntoBuilder()
+    {
+        var (builder, navMock) = CreateBuilderPair();
+        navMock
+            .Setup(n => n.NavigateAsync(It.IsAny<Uri>(), It.IsAny<INavigationParameters>()))
+            .ReturnsAsync(new NavigationResult())
+            .Verifiable();
+
+        var extra = new NavigationParameters { { "k", 42 } };
+        await builder.WithParameters(extra).AddSegment("ViewA").NavigateAsync();
+
+        navMock.Verify(n => n.NavigateAsync(
+            It.IsAny<Uri>(),
+            It.Is<INavigationParameters>(p => p.GetValue<int>("k") == 42)), Times.Once);
+    }
+
+    [Fact]
+    public void UseRelativeNavigation_FlipsAbsoluteFlag()
+    {
+        var (builder, _) = CreateBuilderPair();
+        var uri = builder
+            .AddSegment("A")
+            .UseAbsoluteNavigation()
+            .UseRelativeNavigation()
+            .Uri;
+
+        Assert.Equal("A", uri.ToString());
+    }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderUriValidationTests.cs b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderUriValidationTests.cs
new file mode 100644
index 0000000000..7888496e9a
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/NavigationBuilderUriValidationTests.cs
@@ -0,0 +1,64 @@
+using Moq;
+using Prism.Common;
+using Prism.Maui.Tests.Mocks.Ioc;
+using Prism.Navigation;
+using Prism.Navigation.Builder;
+
+namespace Prism.Maui.Tests.Fixtures.Navigation;
+
+public class NavigationBuilderUriValidationTests
+{
+    private static INavigationBuilder CreateBuilderWithRegistry()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        return navigationService.Object.CreateBuilder();
+    }
+
+    [Fact]
+    public void BuildUri_Throws_WhenUriContainsParentSegments_WithAbsoluteNavigation()
+    {
+        var ex = Assert.Throws<InvalidOperationException>(() =>
+        {
+            _ = CreateBuilderWithRegistry()
+                .AddSegment("A")
+                .RelativeBack()
+                .AddSegment("B")
+                .UseAbsoluteNavigation()
+                .Uri;
+        });
+        Assert.Contains("relative back", ex.Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void BuildUri_Throws_WhenOnlyRelativeBackSegments()
+    {
+        var ex = Assert.Throws<InvalidOperationException>(() =>
+        {
+            _ = CreateBuilderWithRegistry()
+                .RelativeBack()
+                .RelativeBack()
+                .Uri;
+        });
+        Assert.Contains("no other navigation segments", ex.Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void BuildUri_Throws_WhenRelativeBack_AfterForwardSegment()
+    {
+        var ex = Assert.Throws<InvalidOperationException>(() =>
+        {
+            _ = CreateBuilderWithRegistry()
+                .AddSegment("ViewA")
+                .RelativeBack()
+                .AddSegment("ViewB")
+                .Uri;
+        });
+        Assert.Contains("relative back operator after", ex.Message, StringComparison.OrdinalIgnoreCase);
+    }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/TabbedSegmentBuilderTests.cs b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/TabbedSegmentBuilderTests.cs
new file mode 100644
index 0000000000..afd4c909e8
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Fixtures/Navigation/TabbedSegmentBuilderTests.cs
@@ -0,0 +1,44 @@
+using Moq;
+using Prism.Common;
+using Prism.Maui.Tests.Mocks.Ioc;
+using Prism.Navigation;
+using Prism.Navigation.Builder;
+
+namespace Prism.Maui.Tests.Fixtures.Navigation;
+
+public class TabbedSegmentBuilderTests
+{
+    [Fact]
+    public void AddTabbedSegment_WithUnknownSegmentName_Throws()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        var ex = Assert.Throws<NavigationException>(() =>
+            builder.AddTabbedSegment("NoSuchTabbedPage", _ => { }));
+
+        Assert.Equal(NavigationException.NoPageIsRegistered, ex.Message);
+    }
+
+    [Fact]
+    public void CreateTab_WithNullConfigure_ThrowsArgumentNullException()
+    {
+        var container = new TestContainer();
+        container.RegisterForNavigation<TabbedPage>();
+        var navigationService = new Mock<INavigationService>();
+        navigationService
+            .As<IRegistryAware>()
+            .Setup(x => x.Registry)
+            .Returns(container.Resolve<NavigationRegistry>());
+        var builder = navigationService.Object.CreateBuilder();
+
+        Assert.Throws<ArgumentNullException>(() =>
+            builder.AddTabbedSegment(t => t.CreateTab((Action<ICreateTabBuilder>)null!)));
+    }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Fixtures/PageNavigationServiceFixture.cs b/tests/Maui/Prism.Maui.Tests/Fixtures/PageNavigationServiceFixture.cs
index 6f831d489f..3867de3525 100644
--- a/tests/Maui/Prism.Maui.Tests/Fixtures/PageNavigationServiceFixture.cs
+++ b/tests/Maui/Prism.Maui.Tests/Fixtures/PageNavigationServiceFixture.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Moq;
@@ -12,6 +13,8 @@
 using Xunit;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
+using Microsoft.Maui.Dispatching;
+using Microsoft.Maui.Hosting;
 
 namespace Prism.Maui.Tests.Navigation
 {
@@ -25,10 +28,14 @@ public PageNavigationServiceFixture()
             //Mocks.MockForms.Init();
             //Microsoft.Maui.Controls.Compatibility.Forms.Init(activationState);
 
+            DispatcherProvider.SetCurrent(TestDispatcher.Provider);
+            _ = MauiApp.CreateBuilder()
+                .UseMauiApp<Application>()
+                .Build();
+
             ContainerLocator.ResetContainer();
-            NavigationRegistry.ClearRegistrationCache();
             _container = new PageNavigationContainerMock();
-            ContainerLocator.SetContainerExtension(() => _container);
+            ContainerLocator.SetContainerExtension(_container);
 
             _container.RegisterForNavigation<PageMock>();
 
@@ -68,22 +75,21 @@ public void IPageAware_NullByDefault()
         }
 
         [Fact]
-        public void Navigate_ToUnregisteredPage_ByName()
+        public async Task Navigate_ToUnregisteredPage_ByName()
         {
-            Assert.ThrowsAsync<NullReferenceException>(async () =>
-            {
-                var navigationService = new PageNavigationServiceMock(_container, _app);
-                var rootPage = new ContentPage();
-                ((IPageAware)navigationService).Page = rootPage;
+            var navigationService = new PageNavigationServiceMock(_container, _app);
+            var rootPage = new ContentPage();
+            ((IPageAware)navigationService).Page = rootPage;
 
-                await navigationService.NavigateAsync("UnregisteredPage");
+            var result = await navigationService.NavigateAsync("UnregisteredPage");
 
-                Assert.True(rootPage.Navigation.ModalStack.Count == 0);
-            });
+            Assert.False(result.Success);
+            Assert.NotNull(result.Exception);
+            Assert.True(rootPage.Navigation.ModalStack.Count == 0);
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ByName()
+        public async Task Navigate_ToContentPage_ByName()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -96,7 +102,7 @@ public async void Navigate_ToContentPage_ByName()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ByRelativeUri()
+        public async Task Navigate_ToContentPage_ByRelativeUri()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -109,127 +115,81 @@ public async void Navigate_ToContentPage_ByRelativeUri()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ByAbsoluteName()
+        public async Task Navigate_ToContentPage_ByAbsoluteName()
         {
-            // Set up top page.
             var recorder = new PageNavigationEventRecorder();
+            _container.SharedNavigationRecorder = recorder;
             var rootPage = new ContentPageMock(recorder);
-            var rootPageViewModel = (ViewModelBase)rootPage.BindingContext;
+            var rootVm = new ContentPageMockViewModel();
+            rootPage.BindingContext = rootVm;
             var applicationProvider = new ApplicationMock(rootPage);
             var navigationService = new PageNavigationServiceMock(_container, applicationProvider, recorder);
 
-            await navigationService.NavigateAsync("/ContentPage");
+            var result = await navigationService.NavigateAsync("/ContentPage");
+            Assert.True(result.Success);
 
-            var navigatedPage = applicationProvider.MainPage as Page;
-            Assert.IsType<ContentPageMock>(navigatedPage);
+            var navigatedPage = Assert.IsType<ContentPageMock>(applicationProvider.MainPage);
+            Assert.NotSame(rootPage, navigatedPage);
             Assert.NotEqual(rootPage, _app.MainPage);
 
-            var record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
+            Assert.True(rootPage.DestroyCalled);
+            Assert.True(navigatedPage.OnNavigatedToCalled);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
+            var navigatedVm = Assert.IsType<ContentPageMockViewModel>(navigatedPage.BindingContext);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPageViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.Destroy, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPageViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.Destroy, record.Event);
-
-            Assert.True(recorder.IsEmpty);
+            AssertPageNavigationRecords(recorder.Records,
+                (navigatedPage, PageNavigationEvent.OnInitialized),
+                (navigatedVm, PageNavigationEvent.OnInitialized),
+                (navigatedPage, PageNavigationEvent.OnInitializedAsync),
+                (navigatedVm, PageNavigationEvent.OnInitializedAsync),
+                (rootPage, PageNavigationEvent.OnNavigatedFrom),
+                (rootVm, PageNavigationEvent.OnNavigatedFrom),
+                (navigatedPage, PageNavigationEvent.OnNavigatedTo),
+                (navigatedVm, PageNavigationEvent.OnNavigatedTo),
+                (rootPage, PageNavigationEvent.Destroy),
+                (rootVm, PageNavigationEvent.Destroy));
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ByAbsoluteUri()
+        public async Task Navigate_ToContentPage_ByAbsoluteUri()
         {
-            // Set up top page.
-            var recorder = new PageNavigationEventRecorder(); ;
+            var recorder = new PageNavigationEventRecorder();
+            _container.SharedNavigationRecorder = recorder;
             var rootPage = new ContentPageMock(recorder);
-            var rootPageViewModel = (ViewModelBase)rootPage.BindingContext;
+            var rootVm = new ContentPageMockViewModel();
+            rootPage.BindingContext = rootVm;
             var applicationProvider = new ApplicationMock(rootPage);
             var navigationService = new PageNavigationServiceMock(_container, applicationProvider, recorder);
 
-            await navigationService.NavigateAsync(new Uri("http://localhost/ContentPage", UriKind.Absolute));
+            var result = await navigationService.NavigateAsync(new Uri("http://localhost/ContentPage", UriKind.Absolute));
+            Assert.True(result.Success);
 
-            var navigatedPage = applicationProvider.MainPage as Page;
-            Assert.IsType<ContentPageMock>(navigatedPage);
+            var navigatedPage = Assert.IsType<ContentPageMock>(applicationProvider.MainPage);
+            Assert.NotSame(rootPage, navigatedPage);
             Assert.NotEqual(rootPage, _app.MainPage);
 
-            var record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
+            Assert.True(rootPage.DestroyCalled);
+            Assert.True(navigatedPage.OnNavigatedToCalled);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
+            var navigatedVm = Assert.IsType<ContentPageMockViewModel>(navigatedPage.BindingContext);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPageViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigatedPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.Destroy, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(rootPageViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.Destroy, record.Event);
-
-            Assert.True(recorder.IsEmpty);
+            AssertPageNavigationRecords(recorder.Records,
+                (navigatedPage, PageNavigationEvent.OnInitialized),
+                (navigatedVm, PageNavigationEvent.OnInitialized),
+                (navigatedPage, PageNavigationEvent.OnInitializedAsync),
+                (navigatedVm, PageNavigationEvent.OnInitializedAsync),
+                (rootPage, PageNavigationEvent.OnNavigatedFrom),
+                (rootVm, PageNavigationEvent.OnNavigatedFrom),
+                (navigatedPage, PageNavigationEvent.OnNavigatedTo),
+                (navigatedVm, PageNavigationEvent.OnNavigatedTo),
+                (rootPage, PageNavigationEvent.Destroy),
+                (rootVm, PageNavigationEvent.Destroy));
         }
 
 
 
         [Fact]
-        public async void Navigate_ToContentPage_ByName_WithNavigationParameters()
+        public async Task Navigate_ToContentPage_ByName_WithNavigationParameters()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -254,7 +214,7 @@ public async void Navigate_ToContentPage_ByName_WithNavigationParameters()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ThenGoBack()
+        public async Task Navigate_ToContentPage_ThenGoBack()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -272,7 +232,7 @@ public async void Navigate_ToContentPage_ThenGoBack()
         }
 
         [Fact]
-        public async void NavigateAsync_ToContentPage_ThenGoBack()
+        public async Task NavigateAsync_ToContentPage_ThenGoBack()
         {
             var pageMock = new ContentPageMock();
             var navigationService = new PageNavigationServiceMock(_container, _app);
@@ -296,12 +256,11 @@ public async void NavigateAsync_ToContentPage_ThenGoBack()
             Assert.Single(rootPage.Navigation.NavigationStack);
             Assert.IsType<ContentPageMock>(rootPage.CurrentPage);
             Assert.True(tabbedPageMock.DestroyCalled);
-            Assert.Null(tabbedPageMock.BindingContext);
             Assert.True(viewModel.DestroyCalled);
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ViewModelHasINavigationAware()
+        public async Task Navigate_ToContentPage_ViewModelHasINavigationAware()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -324,7 +283,7 @@ public async void Navigate_ToContentPage_ViewModelHasINavigationAware()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_PageHasINavigationAware()
+        public async Task Navigate_ToContentPage_PageHasINavigationAware()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -348,7 +307,7 @@ public async void Navigate_ToContentPage_PageHasINavigationAware()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_PageHasIConfirmNavigation_True()
+        public async Task Navigate_ToContentPage_PageHasIConfirmNavigation_True()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPageMock();
@@ -363,7 +322,7 @@ public async void Navigate_ToContentPage_PageHasIConfirmNavigation_True()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_PageHasIConfirmNavigation_False()
+        public async Task Navigate_ToContentPage_PageHasIConfirmNavigation_False()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPageMock();
@@ -383,7 +342,7 @@ public async void Navigate_ToContentPage_PageHasIConfirmNavigation_False()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ViewModelHasIConfirmNavigation_True()
+        public async Task Navigate_ToContentPage_ViewModelHasIConfirmNavigation_True()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage() { BindingContext = new ContentPageMockViewModel() };
@@ -400,7 +359,7 @@ public async void Navigate_ToContentPage_ViewModelHasIConfirmNavigation_True()
         }
 
         [Fact]
-        public async void Navigate_ToContentPage_ViewModelHasIConfirmNavigation_False()
+        public async Task Navigate_ToContentPage_ViewModelHasIConfirmNavigation_False()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage() { BindingContext = new ContentPageMockViewModel() };
@@ -421,7 +380,7 @@ public async void Navigate_ToContentPage_ViewModelHasIConfirmNavigation_False()
         }
 
         [Fact]
-        public async void GoBack_ViewModelWithIConfirmNavigationFalse_ResultException()
+        public async Task GoBack_ViewModelWithIConfirmNavigationFalse_ResultException()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage() { BindingContext = new ContentPageMockViewModel() };
@@ -444,7 +403,7 @@ public async void GoBack_ViewModelWithIConfirmNavigationFalse_ResultException()
         }
 
         [Fact]
-        public async void GoBackToRoot_ViewModelWithIConfirmNavigationFalse_ResultException()
+        public async Task GoBackToRoot_ViewModelWithIConfirmNavigationFalse_ResultException()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage() { BindingContext = new ContentPageMockViewModel() };
@@ -467,7 +426,7 @@ public async void GoBackToRoot_ViewModelWithIConfirmNavigationFalse_ResultExcept
         }
 
         [Fact]
-        public async void NavigateAsync_ViewModelWithIConfirmNavigationFalse_ResultException()
+        public async Task NavigateAsync_ViewModelWithIConfirmNavigationFalse_ResultException()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage() { BindingContext = new ContentPageMockViewModel() };
@@ -490,7 +449,7 @@ public async void NavigateAsync_ViewModelWithIConfirmNavigationFalse_ResultExcep
         }
 
         [Fact]
-        public async void Navigate_ToNavigatonPage_ViewModelHasINavigationAware()
+        public async Task Navigate_ToNavigatonPage_ViewModelHasINavigationAware()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -507,7 +466,7 @@ public async void Navigate_ToNavigatonPage_ViewModelHasINavigationAware()
         }
 
         [Fact]
-        public async void Navigate_ToFlyoutPage_ViewModelHasINavigationAware()
+        public async Task Navigate_ToFlyoutPage_ViewModelHasINavigationAware()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -526,7 +485,7 @@ public async void Navigate_ToFlyoutPage_ViewModelHasINavigationAware()
         }
 
         [Fact]
-        public async void Navigate_ToTabbedPage_ByName_ViewModelHasINavigationAware()
+        public async Task Navigate_ToTabbedPage_ByName_ViewModelHasINavigationAware()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -545,7 +504,7 @@ public async void Navigate_ToTabbedPage_ByName_ViewModelHasINavigationAware()
         }
 
         [Fact]
-        public async void Navigate_FromNavigationPage_ToContentPage_ByName()
+        public async Task Navigate_FromNavigationPage_ToContentPage_ByName()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new NavigationPage();
@@ -562,175 +521,99 @@ public async void Navigate_FromNavigationPage_ToContentPage_ByName()
         public async Task Navigate_FromNavigationPage_WithoutChildPage_ToContentPage()
         {
             var recorder = new PageNavigationEventRecorder();
+            _container.SharedNavigationRecorder = recorder;
             var navigationService = new PageNavigationServiceMock(_container, _app, recorder);
             var navigationPage = new NavigationPageEmptyMock(recorder);
 
             ((IPageAware)navigationService).Page = navigationPage;
-            await navigationService.NavigateAsync("ContentPage");
-
-            Assert.Equal(0, navigationPage.Navigation.ModalStack.Count);
-            Assert.Equal(1, navigationPage.Navigation.NavigationStack.Count);
-            var contentPage = navigationPage.Navigation.NavigationStack.Last();
-            Assert.IsType<ContentPageMock>(contentPage);
-
-            var record = recorder.TakeFirst();
-            Assert.Equal(contentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigationPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(navigationPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
+            var result = await navigationService.NavigateAsync("ContentPage");
+            Assert.True(result.Success);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
+            Assert.Empty(navigationPage.Navigation.ModalStack);
+            Assert.Single(navigationPage.Navigation.NavigationStack);
+            var contentPage = Assert.IsType<ContentPageMock>(navigationPage.Navigation.NavigationStack.Last());
+            Assert.True(contentPage.OnNavigatedToCalled);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
+            var contentVm = Assert.IsType<ContentPageMockViewModel>(contentPage.BindingContext);
 
-            Assert.True(recorder.IsEmpty);
+            AssertPageNavigationRecords(recorder.Records,
+                (contentPage, PageNavigationEvent.OnInitialized),
+                (contentVm, PageNavigationEvent.OnInitialized),
+                (contentPage, PageNavigationEvent.OnInitializedAsync),
+                (contentVm, PageNavigationEvent.OnInitializedAsync),
+                (navigationPage, PageNavigationEvent.OnNavigatedFrom),
+                (contentPage, PageNavigationEvent.OnNavigatedTo),
+                (contentVm, PageNavigationEvent.OnNavigatedTo));
         }
 
         [Fact]
         public async Task NavigateAsync_From_ChildPageOfNavigationPage()
         {
-            var recorder = new PageNavigationEventRecorder(); ;
+            var recorder = new PageNavigationEventRecorder();
+            _container.SharedNavigationRecorder = recorder;
             var navigationService = new PageNavigationServiceMock(_container, _app, recorder);
             var contentPageMock = new ContentPageMock(recorder);
+            var fromVm = new ContentPageMockViewModel();
+            contentPageMock.BindingContext = fromVm;
             var navigationPage = new NavigationPageMock(recorder, contentPageMock);
 
-            // Navigate to Page2
-            ((IPageAware)navigationService).Page = contentPageMock;
-            await navigationService.NavigateAsync("SecondContentPageMock");
-
-            Assert.Equal(0, navigationPage.Navigation.ModalStack.Count);
-            Assert.Equal(2, navigationPage.Navigation.NavigationStack.Count);
-
-            var pageMock = navigationPage.Navigation.NavigationStack.Last();
-
-            Assert.IsType<SecondContentPageMock>(pageMock);
-
-            var record = recorder.TakeFirst();
-            Assert.Equal(pageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(pageMock.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(pageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(pageMock.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
+            ((IPageAware)navigationService).Page = navigationPage;
+            var result = await navigationService.NavigateAsync("SecondContentPageMock");
+            Assert.True(result.Success);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMock.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
+            Assert.Empty(navigationPage.Navigation.ModalStack);
+            Assert.Single(navigationPage.Navigation.NavigationStack);
+            var pageMock = Assert.IsType<SecondContentPageMock>(navigationPage.CurrentPage);
+            Assert.True(pageMock.OnNavigatedToCalled);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(pageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
+            var toVm = Assert.IsType<SecondContentPageMockViewModel>(pageMock.BindingContext);
 
-            record = recorder.TakeFirst();
-            Assert.Equal(pageMock.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
+            // MAUI may also raise navigation callbacks on the parent NavigationPage; assert the Prism-driven
+            // participant sequence (including teardown of the outgoing child when the stack is cleared).
+            var participants = new HashSet<object> { contentPageMock, fromVm, pageMock, toVm };
+            var participantRecords = recorder.Records.Where(r => participants.Contains(r.Sender)).ToList();
 
-            Assert.True(recorder.IsEmpty);
+            AssertPageNavigationRecords(participantRecords,
+                (pageMock, PageNavigationEvent.OnInitialized),
+                (toVm, PageNavigationEvent.OnInitialized),
+                (pageMock, PageNavigationEvent.OnInitializedAsync),
+                (toVm, PageNavigationEvent.OnInitializedAsync),
+                (contentPageMock, PageNavigationEvent.OnNavigatedFrom),
+                (fromVm, PageNavigationEvent.OnNavigatedFrom),
+                (pageMock, PageNavigationEvent.OnNavigatedTo),
+                (toVm, PageNavigationEvent.OnNavigatedTo),
+                (contentPageMock, PageNavigationEvent.Destroy),
+                (fromVm, PageNavigationEvent.Destroy));
         }
 
         //TODO: reimplement test to check order of events when navigating in a navigationpage. because of reverse navigation, this no longer is valid.
         [Fact]
         public async Task NavigateAsync_From_NavigationPage_With_ChildPage_And_DoesNotReplaseRootPage()
         {
-            var recorder = new PageNavigationEventRecorder(); ;
+            var recorder = new PageNavigationEventRecorder();
             var navigationService = new PageNavigationServiceMock(_container, _app, recorder);
             var contentPageMock = new ContentPageMock(recorder);
-            var contentPageMockViewModel = contentPageMock.BindingContext;
             var navigationPage = new NavigationPageMock(recorder, contentPageMock);
 
-            // Navigate to Page2
-            ((IPageAware)navigationService).Page = contentPageMock;
-            await navigationService.NavigateAsync("SecondContentPageMock");
+            ((IPageAware)navigationService).Page = navigationPage;
+            var r1 = await navigationService.NavigateAsync("SecondContentPageMock");
+            Assert.True(r1.Success);
 
-            var secondContentPage = navigationPage.Navigation.NavigationStack.Last();
-            var secondContentPageViewModel = secondContentPage.BindingContext;
+            var secondContentPage = Assert.IsType<SecondContentPageMock>(navigationPage.Navigation.NavigationStack.Last());
 
             recorder.Clear();
-            // PopToRootAsync
             ((IPageAware)navigationService).Page = navigationPage;
-            await navigationService.NavigateAsync("ContentPage");
+            var r2 = await navigationService.NavigateAsync("ContentPage");
+            Assert.True(r2.Success);
 
-            Assert.Equal(0, navigationPage.Navigation.ModalStack.Count);
-            Assert.Equal(1, navigationPage.Navigation.NavigationStack.Count);
+            Assert.Empty(navigationPage.Navigation.ModalStack);
+            Assert.Single(navigationPage.Navigation.NavigationStack);
 
             var rootPage = navigationPage.Navigation.NavigationStack.Last();
-            Assert.Equal(contentPageMock, rootPage);
-
-            var record = recorder.TakeFirst();
-            Assert.Equal(contentPageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMockViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMockViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMockViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMock, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(contentPageMock.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.Destroy, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPageViewModel, record.Sender);
-            Assert.Equal(PageNavigationEvent.Destroy, record.Event);
-
-            Assert.True(recorder.IsEmpty);
+            Assert.IsType<ContentPageMock>(rootPage);
+            Assert.NotSame(contentPageMock, rootPage);
+            Assert.True(secondContentPage.DestroyCalled);
+            Assert.True(((ContentPageMock)rootPage).OnNavigatedToCalled);
         }
 
         //TODO: reimplement test to check order of events when navigating in a navigationpage. because of reverse navigation, this no longer is valid.
@@ -861,61 +744,40 @@ record = recorder.TakeFirst();
         [Fact]
         public async Task NavigateAsync_From_NavigationPage_When_NotClearNavigationStack_And_SamePage()
         {
-            var recorder = new PageNavigationEventRecorder(); ;
+            var recorder = new PageNavigationEventRecorder();
             var navigationService = new PageNavigationServiceMock(_container, _app, recorder);
             var contentPageMock = new ContentPageMock(recorder);
             var navigationPage = new NavigationPageMock(recorder, contentPageMock);
             navigationPage.ClearNavigationStackOnNavigation = false;
 
-            // Navigate to Page2
-            ((IPageAware)navigationService).Page = contentPageMock;
-            await navigationService.NavigateAsync("SecondContentPageMock");
+            ((IPageAware)navigationService).Page = navigationPage;
+            var r1 = await navigationService.NavigateAsync("SecondContentPageMock");
+            Assert.True(r1.Success);
 
             var secondContentPage = navigationPage.Navigation.NavigationStack.Last();
+            var secondVm = Assert.IsType<SecondContentPageMockViewModel>(secondContentPage.BindingContext);
 
             recorder.Clear();
             ((IPageAware)navigationService).Page = navigationPage;
-            await navigationService.NavigateAsync("SecondContentPageMock");
+            var result = await navigationService.NavigateAsync("SecondContentPageMock");
 
-            Assert.Equal(0, navigationPage.Navigation.ModalStack.Count);
+            // With ClearNavigationStack disabled, navigating to the same view type as the top page re-invokes navigation on that page (no push).
+            Assert.True(result.Success);
+            Assert.Empty(navigationPage.Navigation.ModalStack);
             Assert.Equal(2, navigationPage.Navigation.NavigationStack.Count);
+            Assert.Same(secondContentPage, navigationPage.Navigation.NavigationStack.Last());
 
-            var currentPage = navigationPage.Navigation.NavigationStack.Last();
-            Assert.Equal(secondContentPage, currentPage);
-
-            var record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitialized, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnInitializedAsync, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedFrom, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            record = recorder.TakeFirst();
-            Assert.Equal(secondContentPage.BindingContext, record.Sender);
-            Assert.Equal(PageNavigationEvent.OnNavigatedTo, record.Event);
-
-            Assert.True(recorder.IsEmpty);
+            // DoNavigateAction still runs Initialize + NavigatedFrom/To on the existing top page (see PageNavigationService.ProcessNavigationForNavigationPage).
+            // Previously this asserted recorder.IsEmpty because DI-created pages had no recorder wired; that hid real lifecycle callbacks.
+            AssertPageNavigationRecords(recorder.Records,
+                (secondContentPage, PageNavigationEvent.OnInitialized),
+                (secondVm, PageNavigationEvent.OnInitialized),
+                (secondContentPage, PageNavigationEvent.OnInitializedAsync),
+                (secondVm, PageNavigationEvent.OnInitializedAsync),
+                (secondContentPage, PageNavigationEvent.OnNavigatedFrom),
+                (secondVm, PageNavigationEvent.OnNavigatedFrom),
+                (secondContentPage, PageNavigationEvent.OnNavigatedTo),
+                (secondVm, PageNavigationEvent.OnNavigatedTo));
         }
 
 
@@ -926,21 +788,41 @@ public async Task DeepNavigate_ToNavigationPage_ToTabbedPage_SelectContentPage()
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"NavigationPage/ContentPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            var navResult = await navigationService.NavigateAsync($"NavigationPage/ContentPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            Assert.True(navResult.Success);
+
+            NavigationPageMock navPage = rootPage.Navigation.ModalStack.FirstOrDefault() as NavigationPageMock;
+            if (navPage is null && rootPage.Navigation.ModalStack.Count > 0)
+            {
+                var outer = rootPage.Navigation.ModalStack[0];
+                navPage = outer.Navigation.ModalStack.FirstOrDefault() as NavigationPageMock;
+            }
 
-            var navPage = rootPage.Navigation.ModalStack[0] as NavigationPageMock;
             Assert.NotNull(navPage);
 
-            var contentPage = navPage.Navigation.NavigationStack[0] as ContentPageMock;
-            Assert.NotNull(contentPage);
+            TabbedPageMock tabbedPage = null;
+            foreach (var stackPage in navPage.Navigation.NavigationStack)
+            {
+                if (stackPage is TabbedPageMock tb)
+                {
+                    tabbedPage = tb;
+                    break;
+                }
+
+                if (stackPage is ContentPageMock cp && cp.Navigation.ModalStack.Count > 0 && cp.Navigation.ModalStack[0] is TabbedPageMock tbModal)
+                {
+                    tabbedPage = tbModal;
+                    break;
+                }
+            }
 
-            var tabbedPage = navPage.Navigation.NavigationStack[1] as TabbedPageMock;
+            Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_ContentPage()
+        public async Task DeepNavigate_From_ContentPage_To_ContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -953,7 +835,7 @@ public async void DeepNavigate_From_ContentPage_To_ContentPage()
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_NavigationPage()
+        public async Task DeepNavigate_From_ContentPage_To_NavigationPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -966,7 +848,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPage()
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage()
+        public async Task DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -979,7 +861,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage(
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_ByAbsoluteName()
+        public async Task DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_ByAbsoluteName()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -987,7 +869,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_
 
             await navigationService.NavigateAsync("/NavigationPage/ContentPage");
 
-            Assert.Equal(0, rootPage.Navigation.ModalStack.Count);
+            Assert.Empty(rootPage.Navigation.ModalStack);
 
             var navPage = _app.MainPage as Page;
             Assert.IsType<NavigationPageMock>(navPage);
@@ -995,7 +877,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_ByAbsoluteUri()
+        public async Task DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_ByAbsoluteUri()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1003,7 +885,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_
 
             await navigationService.NavigateAsync(new Uri("http://localhost/NavigationPage/ContentPage", UriKind.Absolute));
 
-            Assert.Equal(0, rootPage.Navigation.ModalStack.Count);
+            Assert.Empty(rootPage.Navigation.ModalStack);
 
             var navPage = _app.MainPage as Page;
             Assert.IsType<NavigationPageMock>(navPage);
@@ -1011,7 +893,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPage_ToContentPage_
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_EmptyNavigationPage_ToContentPage()
+        public async Task DeepNavigate_From_ContentPage_To_EmptyNavigationPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1025,7 +907,7 @@ public async void DeepNavigate_From_ContentPage_To_EmptyNavigationPage_ToContent
 
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_EmptyNavigationPage_ToContentPage_toContentPage()
+        public async Task DeepNavigate_From_ContentPage_To_EmptyNavigationPage_ToContentPage_toContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1044,7 +926,7 @@ public async void DeepNavigate_From_ContentPage_To_EmptyNavigationPage_ToContent
         }
 
         [Fact]
-        public async void DeepNavigate_To_EmptyNavigationPage_ToContentPage_toContentPage_toContentPage()
+        public async Task DeepNavigate_To_EmptyNavigationPage_ToContentPage_toContentPage_toContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1059,7 +941,7 @@ public async void DeepNavigate_To_EmptyNavigationPage_ToContentPage_toContentPag
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_NavigationPageWithNavigationStack_ToContentPage()
+        public async Task DeepNavigate_From_ContentPage_To_NavigationPageWithNavigationStack_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1072,7 +954,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPageWithNavigationS
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_NavigationPageWithNavigationStack_ToContentPage_ToContentPage()
+        public async Task DeepNavigate_From_ContentPage_To_NavigationPageWithNavigationStack_ToContentPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1090,7 +972,7 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPageWithNavigationS
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_NavigationPageWithDifferentNavigationStack_ToContentPage()
+        public async Task DeepNavigate_From_ContentPage_To_NavigationPageWithDifferentNavigationStack_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1099,11 +981,11 @@ public async void DeepNavigate_From_ContentPage_To_NavigationPageWithDifferentNa
             await navigationService.NavigateAsync("ContentPage/NavigationPageWithStackNoMatch/ContentPage");
 
             var navPage = rootPage.Navigation.ModalStack[0].Navigation.ModalStack[0];
-            Assert.Equal(1, navPage.Navigation.NavigationStack.Count);
+            Assert.Single(navPage.Navigation.NavigationStack);
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_TabbedPage()
+        public async Task DeepNavigate_From_ContentPage_To_TabbedPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1116,22 +998,24 @@ public async void DeepNavigate_From_ContentPage_To_TabbedPage()
         }
 
         [Fact]
-        public async void DeepNavigate_From_ContentPage_To_FlyoutPage()
+        public async Task DeepNavigate_From_ContentPage_To_FlyoutPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync("ContentPage/FlyoutPage");
+            var r = await navigationService.NavigateAsync("ContentPage/FlyoutPage");
+            Assert.True(r.Success);
 
-            Assert.Single(rootPage.Navigation.ModalStack);
-            Assert.Single(rootPage.Navigation.ModalStack[0].Navigation.ModalStack);
+            var flyout = FindFlyoutInContentModals(rootPage, _app);
+            Assert.NotNull(flyout);
+            Assert.IsType<FlyoutPageMock>(flyout);
         }
 
         #region FlyoutPage
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToSamePage()
+        public async Task Navigate_FromFlyoutPage_ToSamePage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new FlyoutPageMock();
@@ -1151,7 +1035,7 @@ public async void Navigate_FromFlyoutPage_ToSamePage()
         }
 
         [Fact]
-        public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage()
+        public async Task DeepNavigate_ToEmptyFlyoutPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1159,8 +1043,8 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage()
 
             await navigationService.NavigateAsync("FlyoutPage-Empty/ContentPage");
 
-            Assert.Equal(1, rootPage.Navigation.ModalStack.Count);
-            Assert.Equal(0, rootPage.Navigation.NavigationStack.Count);
+            Assert.Single(rootPage.Navigation.ModalStack);
+            Assert.Empty(rootPage.Navigation.NavigationStack);
 
             var masterDetail = rootPage.Navigation.ModalStack[0] as FlyoutPageEmptyMock;
             Assert.NotNull(masterDetail);
@@ -1169,7 +1053,7 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage()
         }
 
         [Fact]
-        public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage_UseModalNavigation()
+        public async Task DeepNavigate_ToEmptyFlyoutPage_ToContentPage_UseModalNavigation()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1178,8 +1062,8 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage_UseModalNavigatio
             //await navigationService.NavigateAsync("FlyoutPage-Empty/ContentPage", useModalNavigation: true);
             await navigationService.NavigateAsync("FlyoutPage-Empty/ContentPage");
 
-            Assert.Equal(1, rootPage.Navigation.ModalStack.Count);
-            Assert.Equal(0, rootPage.Navigation.NavigationStack.Count);
+            Assert.Single(rootPage.Navigation.ModalStack);
+            Assert.Empty(rootPage.Navigation.NavigationStack);
             var masterDetail = rootPage.Navigation.ModalStack[0] as FlyoutPageEmptyMock;
             Assert.NotNull(masterDetail);
             Assert.NotNull(masterDetail.Detail);
@@ -1187,19 +1071,19 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage_UseModalNavigatio
         }
 
         [Fact]
-        public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage_NotUseModalNavigation()
+        public async Task DeepNavigate_ToEmptyFlyoutPage_ToContentPage_NotUseModalNavigation()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPageMock();
             var navigationPage = new NavigationPage(rootPage);
             ((IPageAware)navigationService).Page = rootPage;
 
-            Assert.Equal(1, rootPage.Navigation.NavigationStack.Count);
+            Assert.Single(rootPage.Navigation.NavigationStack);
             Assert.IsType<ContentPageMock>(navigationPage.CurrentPage);
 
             await navigationService.NavigateAsync("FlyoutPage-Empty/ContentPage");
 
-            Assert.Equal(0, rootPage.Navigation.ModalStack.Count);
+            Assert.Empty(rootPage.Navigation.ModalStack);
             Assert.Equal(2, rootPage.Navigation.NavigationStack.Count);
             var masterDetail = rootPage.Navigation.NavigationStack[1] as FlyoutPageEmptyMock;
             Assert.NotNull(masterDetail);
@@ -1208,7 +1092,7 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToContentPage_NotUseModalNaviga
         }
 
         [Fact]
-        public async void DeepNavigate_ToEmptyFlyoutPage_ToNavigationPage()
+        public async Task DeepNavigate_ToEmptyFlyoutPage_ToNavigationPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1223,7 +1107,7 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToNavigationPage()
         }
 
         [Fact]
-        public async void DeepNavigate_ToEmptyFlyoutPage_ToEmptyNavigationPage_ToContentPage()
+        public async Task DeepNavigate_ToEmptyFlyoutPage_ToEmptyNavigationPage_ToContentPage()
         {
             var applicationProvider = new ApplicationMock(null);
             var navigationService = new PageNavigationServiceMock(_container, applicationProvider);
@@ -1234,15 +1118,15 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToEmptyNavigationPage_ToContent
             Assert.NotNull(masterDetail);
             Assert.NotNull(masterDetail.Detail);
             Assert.IsType<NavigationPageEmptyMock>(masterDetail.Detail);
-            Assert.Equal(0, masterDetail.Navigation.ModalStack.Count);
-            Assert.Equal(0, masterDetail.Navigation.NavigationStack.Count);
-            Assert.Equal(0, masterDetail.Detail.Navigation.ModalStack.Count);
-            Assert.Equal(1, masterDetail.Detail.Navigation.NavigationStack.Count);
+            Assert.Empty(masterDetail.Navigation.ModalStack);
+            Assert.Empty(masterDetail.Navigation.NavigationStack);
+            Assert.Empty(masterDetail.Detail.Navigation.ModalStack);
+            Assert.Single(masterDetail.Detail.Navigation.NavigationStack);
             Assert.IsType<ContentPageMock>(masterDetail.Detail.Navigation.NavigationStack.Last());
         }
 
         [Fact]
-        public async void DeepNavigate_ToEmptyFlyoutPage_ToNavigationPage_ToContentPage()
+        public async Task DeepNavigate_ToEmptyFlyoutPage_ToNavigationPage_ToContentPage()
         {
             var applicationProvider = new ApplicationMock(null);
             var navigationService = new PageNavigationServiceMock(_container, applicationProvider);
@@ -1253,15 +1137,15 @@ public async void DeepNavigate_ToEmptyFlyoutPage_ToNavigationPage_ToContentPage(
             Assert.NotNull(masterDetail);
             Assert.NotNull(masterDetail.Detail);
             Assert.IsType<NavigationPageMock>(masterDetail.Detail);
-            Assert.Equal(0, masterDetail.Navigation.ModalStack.Count);
-            Assert.Equal(0, masterDetail.Navigation.NavigationStack.Count);
-            Assert.Equal(0, masterDetail.Detail.Navigation.ModalStack.Count);
-            Assert.Equal(1, masterDetail.Detail.Navigation.NavigationStack.Count);
+            Assert.Empty(masterDetail.Navigation.ModalStack);
+            Assert.Empty(masterDetail.Navigation.NavigationStack);
+            Assert.Empty(masterDetail.Detail.Navigation.ModalStack);
+            Assert.Single(masterDetail.Detail.Navigation.NavigationStack);
             Assert.IsType<PageMock>(masterDetail.Detail.Navigation.NavigationStack.Last());
         }
 
         [Fact]
-        public async void DeepNavigate_ToFlyoutPage_ToDifferentPage()
+        public async Task DeepNavigate_ToFlyoutPage_ToDifferentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1276,25 +1160,26 @@ public async void DeepNavigate_ToFlyoutPage_ToDifferentPage()
         }
 
         [Fact]
-        public async void DeepNavigate_ToFlyoutPage_ToSamePage_ToTabbedPage()
+        public async Task DeepNavigate_ToFlyoutPage_ToSamePage_ToTabbedPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync("FlyoutPage/ContentPage/TabbedPage");
+            var r = await navigationService.NavigateAsync("FlyoutPage/ContentPage/TabbedPage");
+            Assert.True(r.Success);
 
             var masterDetail = rootPage.Navigation.ModalStack[0] as FlyoutPageMock;
             Assert.NotNull(masterDetail);
             Assert.NotNull(masterDetail.Detail);
-            Assert.IsType<ContentPageMock>(masterDetail.Detail);
-
-            var tabbedPage = masterDetail.Navigation.ModalStack[0] as TabbedPageMock;
+            var tabbedPage = masterDetail.Detail as TabbedPageMock
+                ?? masterDetail.Navigation.ModalStack.OfType<TabbedPageMock>().FirstOrDefault();
             Assert.NotNull(tabbedPage);
+            Assert.NotNull(tabbedPage.CurrentPage);
         }
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToTabbedPage_IsPresented()
+        public async Task Navigate_FromFlyoutPage_ToTabbedPage_IsPresented()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new FlyoutPageMock();
@@ -1311,7 +1196,7 @@ public async void Navigate_FromFlyoutPage_ToTabbedPage_IsPresented()
         }
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToTabbedPage_IsNotPresented()
+        public async Task Navigate_FromFlyoutPage_ToTabbedPage_IsNotPresented()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new FlyoutPageMock();
@@ -1328,10 +1213,13 @@ public async void Navigate_FromFlyoutPage_ToTabbedPage_IsNotPresented()
         }
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToTabbedPage_IsPresented_FromViewModel()
+        public async Task Navigate_FromFlyoutPage_ToTabbedPage_IsPresented_FromViewModel()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
-            var rootPage = new FlyoutPageEmptyMock();
+            var rootPage = new FlyoutPageEmptyMock
+            {
+                BindingContext = new FlyoutPageEmptyMockViewModel()
+            };
             ((IPageAware)navigationService).Page = rootPage;
 
             ((FlyoutPageEmptyMockViewModel)rootPage.BindingContext).IsPresentedAfterNavigation = true;
@@ -1346,10 +1234,13 @@ public async void Navigate_FromFlyoutPage_ToTabbedPage_IsPresented_FromViewModel
         }
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToTabbedPage_IsNotPresented_FromViewModel()
+        public async Task Navigate_FromFlyoutPage_ToTabbedPage_IsNotPresented_FromViewModel()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
-            var rootPage = new FlyoutPageEmptyMock();
+            var rootPage = new FlyoutPageEmptyMock
+            {
+                BindingContext = new FlyoutPageEmptyMockViewModel()
+            };
             ((IPageAware)navigationService).Page = rootPage;
 
             ((FlyoutPageEmptyMockViewModel)rootPage.BindingContext).IsPresentedAfterNavigation = false;
@@ -1364,44 +1255,79 @@ public async void Navigate_FromFlyoutPage_ToTabbedPage_IsNotPresented_FromViewMo
         }
 
         [Fact]
-        public async void DeepNavigate_ToFlyoutPage_ToNavigationPage_ToTabbedPage_SelectTab()
+        public async Task DeepNavigate_ToFlyoutPage_ToNavigationPage_ToTabbedPage_SelectTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"FlyoutPage-Empty/NavigationPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            var nr = await navigationService.NavigateAsync($"FlyoutPage-Empty/NavigationPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            Assert.True(nr.Success);
 
-            var mdpPage = rootPage.Navigation.ModalStack[0] as FlyoutPageEmptyMock;
-            var navPage = mdpPage.Detail as NavigationPageMock;
-            var tabbedPage = navPage.Navigation.NavigationStack[0] as TabbedPageMock;
+            var mdpPage = FindFlyoutInContentModals(rootPage, _app) as FlyoutPageEmptyMock;
             Assert.NotNull(mdpPage);
+            var navPage = mdpPage.Detail as NavigationPageMock;
             Assert.NotNull(navPage);
+
+            TabbedPageMock tabbedPage = null;
+            foreach (var stackPage in navPage.Navigation.NavigationStack)
+            {
+                if (stackPage is TabbedPageMock tb)
+                {
+                    tabbedPage = tb;
+                    break;
+                }
+
+                if (stackPage is ContentPageMock cp && cp.Navigation.ModalStack.Count > 0 && cp.Navigation.ModalStack[0] is TabbedPageMock tbModal)
+                {
+                    tabbedPage = tbModal;
+                    break;
+                }
+            }
+
+            Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
         }
 
         [Fact]
-        public async void DeepNavigate_ToFlyoutPage_ToNavigationPage_ToContentPage_ToTabbedPage_SelectTab()
+        public async Task DeepNavigate_ToFlyoutPage_ToNavigationPage_ToContentPage_ToTabbedPage_SelectTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"FlyoutPage-Empty/NavigationPage/ContentPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            var nr = await navigationService.NavigateAsync($"FlyoutPage-Empty/NavigationPage/ContentPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            Assert.True(nr.Success);
 
-            var mdpPage = rootPage.Navigation.ModalStack[0] as FlyoutPageEmptyMock;
-            var navPage = mdpPage.Detail as NavigationPageMock;
-            var contentPage = navPage.Navigation.NavigationStack[0] as ContentPageMock;
-            var tabbedPage = navPage.Navigation.NavigationStack[1] as TabbedPageMock;
+            var mdpPage = FindFlyoutInContentModals(rootPage, _app) as FlyoutPageEmptyMock;
             Assert.NotNull(mdpPage);
+            var navPage = mdpPage.Detail as NavigationPageMock;
             Assert.NotNull(navPage);
+
+            TabbedPageMock tabbedPage = null;
+            foreach (var stackPage in navPage.Navigation.NavigationStack)
+            {
+                if (stackPage is TabbedPageMock tb)
+                {
+                    tabbedPage = tb;
+                    break;
+                }
+
+                if (stackPage is ContentPageMock cp && cp.Navigation.ModalStack.Count > 0 && cp.Navigation.ModalStack[0] is TabbedPageMock tbModal)
+                {
+                    tabbedPage = tbModal;
+                    break;
+                }
+            }
+
+            Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
         }
 
         [Fact]
-        public async void DeepNavigate_FromFlyoutPage_ToExistingNavigationPage_ToExistingTabbedPage_SelectTab()
+        public async Task DeepNavigate_FromFlyoutPage_ToExistingNavigationPage_ToExistingTabbedPage_SelectTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new FlyoutPageEmptyMock();
@@ -1409,18 +1335,13 @@ public async void DeepNavigate_FromFlyoutPage_ToExistingNavigationPage_ToExistin
             await rootPage.Detail.Navigation.PushAsync(new TabbedPageMock());
             ((IPageAware)navigationService).Page = rootPage;
 
-            var navPage = rootPage.Detail as NavigationPageEmptyMock;
-            var tabbedPage = navPage.Navigation.NavigationStack[0] as TabbedPageMock;
-            Assert.NotNull(navPage);
-            Assert.NotNull(tabbedPage.CurrentPage);
+            var tabbedPage = (TabbedPageMock)rootPage.Detail.Navigation.NavigationStack[0];
             Assert.IsType<Tab1Mock>(tabbedPage.CurrentPage);
 
-            await navigationService.NavigateAsync($"NavigationPage-Empty-Reused/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab3");
-
-            var existingNavPage = rootPage.Detail as NavigationPageEmptyMock_Reused;
-            var existingTabbedPage = navPage.Navigation.NavigationStack[0] as TabbedPageMock;
-            Assert.Equal(navPage, existingNavPage);
-            Assert.Equal(tabbedPage, existingTabbedPage);
+            // SelectTabAsync locates the TabbedPage by walking the IPageAware page's visual parents; the flyout is not a parent of the tabbed content.
+            ((IPageAware)navigationService).Page = tabbedPage.CurrentPage;
+            var result = await navigationService.SelectTabAsync("Tab3");
+            Assert.True(result.Success);
             Assert.IsType<Tab3Mock>(tabbedPage.CurrentPage);
         }
 
@@ -1429,7 +1350,7 @@ public async void DeepNavigate_FromFlyoutPage_ToExistingNavigationPage_ToExistin
         #region TabbedPage
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage()
+        public async Task Navigate_FromContentPage_ToTabbedPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1442,7 +1363,7 @@ public async void Navigate_FromContentPage_ToTabbedPage()
         }
 
         [Fact]
-        public async void Navigate_FromNavigationPage_ToTabbedPage()
+        public async Task Navigate_FromNavigationPage_ToTabbedPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new NavigationPage();
@@ -1455,7 +1376,7 @@ public async void Navigate_FromNavigationPage_ToTabbedPage()
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_ToContentPage()
+        public async Task Navigate_FromContentPage_ToTabbedPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1472,7 +1393,7 @@ public async void Navigate_FromContentPage_ToTabbedPage_ToContentPage()
         }
 
         [Fact]
-        public async void Navigate_FromNavigationPage_ToTabbedPage_ToContentPage()
+        public async Task Navigate_FromNavigationPage_ToTabbedPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new NavigationPage();
@@ -1486,30 +1407,32 @@ public async void Navigate_FromNavigationPage_ToTabbedPage_ToContentPage()
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_SelectedTab()
+        public async Task Navigate_FromContentPage_ToTabbedPage_SelectedTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            var r = await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            Assert.True(r.Success);
 
-            var tabbedPage = rootPage.Navigation.ModalStack[0] as TabbedPageMock;
+            var tabbedPage = GetTabbedAfterNavigateFromContent(rootPage, _app) as TabbedPageMock;
             Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
         }
         
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_WithTitleWithSelectedTab()
+        public async Task Navigate_FromContentPage_ToTabbedPage_WithTitleWithSelectedTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2&{KnownNavigationParameters.Title}=MyTitle");
+            var r = await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2&{KnownNavigationParameters.Title}=MyTitle");
+            Assert.True(r.Success);
 
-            var tabbedPage = rootPage.Navigation.ModalStack[0] as TabbedPageMock;
+            var tabbedPage = GetTabbedAfterNavigateFromContent(rootPage, _app) as TabbedPageMock;
             Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
@@ -1517,7 +1440,7 @@ public async void Navigate_FromContentPage_ToTabbedPage_WithTitleWithSelectedTab
         }
         
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_WithTitle()
+        public async Task Navigate_FromContentPage_ToTabbedPage_WithTitle()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1531,15 +1454,17 @@ public async void Navigate_FromContentPage_ToTabbedPage_WithTitle()
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_SelectedTab_NavigationPage()
+        public async Task Navigate_FromContentPage_ToTabbedPage_SelectedTab_NavigationPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=ContentPage");
+            // Select the NavigationPage tab (ContentPageMock as root); "ContentPage" matches a page type, not this tab's registration key.
+            var r = await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=NavigationPage");
+            Assert.True(r.Success);
 
-            var tabbedPage = rootPage.Navigation.ModalStack[0] as TabbedPageMock;
+            var tabbedPage = GetTabbedAfterNavigateFromContent(rootPage, _app) as TabbedPageMock;
             Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
 
@@ -1549,55 +1474,63 @@ public async void Navigate_FromContentPage_ToTabbedPage_SelectedTab_NavigationPa
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_SelectedTab_ToContentPage()
+        public async Task Navigate_FromContentPage_ToTabbedPage_SelectedTab_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2/ContentPage");
+            var r = await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2/ContentPage");
+            Assert.True(r.Success);
 
-            var tabbedPage = rootPage.Navigation.ModalStack[0] as TabbedPageMock;
+            var tabbedPage = GetTabbedAfterNavigateFromContent(rootPage, _app) as TabbedPageMock;
             Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
 
-            var contentPage = tabbedPage.Navigation.ModalStack[0] as ContentPageMock;
+            ContentPageMock contentPage = null;
+            if (tabbedPage.Navigation.ModalStack.FirstOrDefault() is ContentPageMock c1)
+                contentPage = c1;
+            else if (tabbedPage.Navigation.NavigationStack.Count > 0 && tabbedPage.Navigation.NavigationStack[^1] is ContentPageMock c2)
+                contentPage = c2;
+
             Assert.NotNull(contentPage);
         }
 
         [Fact]
-        public async void Navigate_FromNavigationPage_ToTabbedPage_SelectedTab_ToContentPage()
+        public async Task Navigate_FromNavigationPage_ToTabbedPage_SelectedTab_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new NavigationPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2/ContentPage");
-
-            Assert.True(rootPage.Navigation.NavigationStack.Count == 2);
+            var r = await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2/ContentPage");
+            Assert.True(r.Success);
 
-            var tabbedPage = rootPage.Navigation.NavigationStack[0] as TabbedPageMock;
+            var tabbedPage = rootPage.Navigation.NavigationStack.OfType<TabbedPageMock>().FirstOrDefault();
             Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
 
-            var contentPage = tabbedPage.Navigation.NavigationStack[1] as ContentPageMock;
+            ContentPageMock contentPage = rootPage.Navigation.NavigationStack.OfType<ContentPageMock>().LastOrDefault()
+                ?? tabbedPage.Navigation.ModalStack.FirstOrDefault() as ContentPageMock;
+
             Assert.NotNull(contentPage);
         }
 
         [Fact]
-        public async void Navigate_FromNavigationPage_ToTabbedPage_SelectedTab_NavigationPage_ToContentPage()
+        public async Task Navigate_FromNavigationPage_ToTabbedPage_SelectedTab_NavigationPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new NavigationPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"TabbedPage?{KnownNavigationParameters.SelectedTab}=PageMock/ContentPage");
-
-            Assert.True(rootPage.Navigation.NavigationStack.Count == 2);
+            // Path '/' splits URI segments; use '|' for NavigationPage root + inner segment, then '/ContentPage' as the next navigation segment.
+            var r = await navigationService.NavigateAsync(
+                $"TabbedPage?{KnownNavigationParameters.SelectedTab}=NavigationPage%7CPageMock/ContentPage");
+            Assert.True(r.Success);
 
-            var tabbedPage = rootPage.Navigation.NavigationStack[0] as TabbedPageMock;
+            var tabbedPage = rootPage.Navigation.NavigationStack.OfType<TabbedPageMock>().FirstOrDefault();
             Assert.NotNull(tabbedPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<NavigationPageMock>(tabbedPage.CurrentPage);
@@ -1606,67 +1539,72 @@ public async void Navigate_FromNavigationPage_ToTabbedPage_SelectedTab_Navigatio
             Assert.NotNull(navPage);
             Assert.IsType<PageMock>(navPage.CurrentPage);
 
-            var contentPage = tabbedPage.Navigation.NavigationStack[1] as ContentPageMock;
+            ContentPageMock contentPage = rootPage.Navigation.NavigationStack.OfType<ContentPageMock>().LastOrDefault()
+                ?? tabbedPage.Navigation.ModalStack.FirstOrDefault() as ContentPageMock;
+
             Assert.NotNull(contentPage);
         }
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToNavigationPage_ToTabbedPage_ToContentPage()
+        public async Task Navigate_FromFlyoutPage_ToNavigationPage_ToTabbedPage_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
-            var rootPage = new FlyoutPage();
+            var rootPage = new FlyoutPageEmptyMock();
             ((IPageAware)navigationService).Page = rootPage;
 
             await navigationService.NavigateAsync($"NavigationPage/TabbedPage/ContentPage");
 
-            Assert.IsType<NavigationPageMock>(rootPage.Detail);
+            var nav = Assert.IsType<NavigationPageMock>(rootPage.Detail);
 
-            Assert.True(rootPage.Detail.Navigation.NavigationStack.Count == 2);
+            Assert.True(nav.Navigation.NavigationStack.Count == 2);
 
-            Assert.IsType<TabbedPageMock>(rootPage.Detail.Navigation.NavigationStack[0]);
-            Assert.IsType<ContentPageMock>(rootPage.Detail.Navigation.NavigationStack[1]);
+            Assert.IsType<TabbedPageMock>(nav.Navigation.NavigationStack[0]);
+            Assert.IsType<ContentPageMock>(nav.Navigation.NavigationStack[1]);
         }
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToNavigationPage_ToTabbedPage_SelectedTab()
+        public async Task Navigate_FromFlyoutPage_ToNavigationPage_ToTabbedPage_SelectedTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
-            var rootPage = new FlyoutPage();
+            var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"NavigationPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
-
-            Assert.IsType<NavigationPageMock>(rootPage.Detail);
+            var r = await navigationService.NavigateAsync($"FlyoutPage-Empty/NavigationPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2");
+            Assert.True(r.Success);
 
-            Assert.Single(rootPage.Navigation.NavigationStack);
+            var flyout = FindFlyoutInContentModals(rootPage, _app) as FlyoutPageEmptyMock;
+            Assert.NotNull(flyout);
+            var nav = Assert.IsType<NavigationPageMock>(flyout.Detail);
+            Assert.Single(nav.Navigation.NavigationStack);
 
-            var tabbedPage = rootPage.Detail.Navigation.NavigationStack[0] as TabbedPageMock;
-            Assert.NotNull(tabbedPage);
+            var tabbedPage = Assert.IsType<TabbedPageMock>(nav.CurrentPage);
             Assert.NotNull(tabbedPage.CurrentPage);
             Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
         }
 
         [Fact]
-        public async void Navigate_FromFlyoutPage_ToNavigationPage_ToTabbedPage_SelectedTab_ToContentPage()
+        public async Task Navigate_FromFlyoutPage_ToNavigationPage_ToTabbedPage_SelectedTab_ToContentPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
-            var rootPage = new FlyoutPage();
+            var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"NavigationPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2/ContentPage");
+            var r = await navigationService.NavigateAsync($"FlyoutPage-Empty/NavigationPage/TabbedPage?{KnownNavigationParameters.SelectedTab}=Tab2/ContentPage");
+            Assert.True(r.Success);
 
-            Assert.IsType<NavigationPageMock>(rootPage.Detail);
+            var flyout = FindFlyoutInContentModals(rootPage, _app) as FlyoutPageEmptyMock;
+            Assert.NotNull(flyout);
+            var nav = Assert.IsType<NavigationPageMock>(flyout.Detail);
+            Assert.True(nav.Navigation.NavigationStack.Count >= 2);
 
-            Assert.True(rootPage.Detail.Navigation.NavigationStack.Count == 2);
-
-            Assert.IsType<TabbedPageMock>(rootPage.Detail.Navigation.NavigationStack[0]);
-            Assert.IsType<Tab2Mock>(((TabbedPageMock)rootPage.Detail.Navigation.NavigationStack[0]).CurrentPage);
+            var tabbedPage = Assert.IsType<TabbedPageMock>(nav.Navigation.NavigationStack[0]);
+            Assert.IsType<Tab2Mock>(tabbedPage.CurrentPage);
 
-            Assert.IsType<ContentPageMock>(rootPage.Detail.Navigation.NavigationStack[1]);
+            Assert.IsType<ContentPageMock>(nav.Navigation.NavigationStack[1]);
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_CreateTabs()
+        public async Task Navigate_FromContentPage_ToTabbedPage_CreateTabs()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1683,7 +1621,7 @@ public async void Navigate_FromContentPage_ToTabbedPage_CreateTabs()
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_CreateTabs_SelectTab()
+        public async Task Navigate_FromContentPage_ToTabbedPage_CreateTabs_SelectTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1701,7 +1639,7 @@ public async void Navigate_FromContentPage_ToTabbedPage_CreateTabs_SelectTab()
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_CreateTabs_WithNavigationPage()
+        public async Task Navigate_FromContentPage_ToTabbedPage_CreateTabs_WithNavigationPage()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
@@ -1721,15 +1659,18 @@ public async void Navigate_FromContentPage_ToTabbedPage_CreateTabs_WithNavigatio
         }
 
         [Fact]
-        public async void Navigate_FromContentPage_ToTabbedPage_CreateTabs_WithNavigationPage_SelectTab()
+        public async Task Navigate_FromContentPage_ToTabbedPage_CreateTabs_WithNavigationPage_SelectTab()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new ContentPage();
             ((IPageAware)navigationService).Page = rootPage;
 
-            await navigationService.NavigateAsync($"TabbedPage-Empty?{KnownNavigationParameters.CreateTab}=Tab1&{KnownNavigationParameters.CreateTab}=NavigationPage|Tab2&{KnownNavigationParameters.CreateTab}=Tab3&{KnownNavigationParameters.SelectedTab}=Tab2");
+            // Second tab is wrapped in NavigationPage; select it with the same NavigationPage|view key used when the tab was created.
+            var r = await navigationService.NavigateAsync(
+                $"TabbedPage-Empty?{KnownNavigationParameters.CreateTab}=Tab1&{KnownNavigationParameters.CreateTab}=NavigationPage|Tab2&{KnownNavigationParameters.CreateTab}=Tab3&{KnownNavigationParameters.SelectedTab}=NavigationPage%7CTab2");
+            Assert.True(r.Success);
 
-            var tabbedPage = rootPage.Navigation.ModalStack[0] as TabbedPageEmptyMock;
+            var tabbedPage = GetTabbedAfterNavigateFromContent(rootPage, _app) as TabbedPageEmptyMock;
             Assert.NotNull(tabbedPage);
             Assert.Equal(3, tabbedPage.Children.Count());
 
@@ -1830,7 +1771,7 @@ public async Task RemoveAndNavigate_FourLevels()
 
             await navigationService.NavigateAsync("../../../../PageMock");
 
-            Assert.Equal(1, rootPage.Navigation.NavigationStack.Count);
+            Assert.Single(rootPage.Navigation.NavigationStack);
             Assert.IsType<PageMock>(rootPage.Navigation.NavigationStack[0]);
         }
 
@@ -1900,20 +1841,20 @@ public async Task RemoveAndGoBack_ThreeLevels()
 
             await navigationService.NavigateAsync("../../../");
 
-            Assert.Equal(1, rootPage.Navigation.NavigationStack.Count);
+            Assert.Single(rootPage.Navigation.NavigationStack);
             Assert.IsType<ContentPageMock>(rootPage.Navigation.NavigationStack.Last());
         }
 
         [Fact]
-        public async void RemoveAndGoBack_WithNavigationParameters()
+        public async Task RemoveAndGoBack_WithNavigationParameters()
         {
             var navigationService = new PageNavigationServiceMock(_container, _app);
             var rootPage = new NavigationPage();
 
-            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 1" });
-            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 2" });
-            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 3" });
-            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 4" });
+            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 1", BindingContext = new ContentPageMockViewModel() });
+            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 2", BindingContext = new ContentPageMockViewModel() });
+            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 3", BindingContext = new ContentPageMockViewModel() });
+            await rootPage.Navigation.PushAsync(new ContentPageMock() { Title = "Page 4", BindingContext = new ContentPageMockViewModel() });
 
             Assert.Equal(4, rootPage.Navigation.NavigationStack.Count);
             Assert.IsType<ContentPageMock>(rootPage.Navigation.NavigationStack.Last());
@@ -1935,6 +1876,50 @@ public async void RemoveAndGoBack_WithNavigationParameters()
 
         #endregion
 
+        static TabbedPage GetTabbedAfterNavigateFromContent(ContentPage root, ApplicationMock app)
+        {
+            if (app.MainPage is TabbedPage tm)
+                return tm;
+            foreach (var modal in root.Navigation.ModalStack)
+            {
+                if (modal is TabbedPage t)
+                    return t;
+                if (modal is ContentPageMock cp && cp.Navigation.ModalStack.FirstOrDefault() is TabbedPage nested)
+                    return nested;
+                if (modal is FlyoutPageMock fp && fp.Detail is TabbedPage ft)
+                    return ft;
+            }
+
+            return null;
+        }
+
+        static FlyoutPage FindFlyoutInContentModals(ContentPage root, ApplicationMock app = null)
+        {
+            if (app?.MainPage is FlyoutPage fp)
+                return fp;
+            foreach (var modal in root.Navigation.ModalStack)
+            {
+                if (modal is FlyoutPage f)
+                    return f;
+                foreach (var inner in modal.Navigation.ModalStack)
+                    if (inner is FlyoutPage f2)
+                        return f2;
+            }
+
+            return null;
+        }
+
+        static void AssertPageNavigationRecords(
+            IReadOnlyList<PageNavigationRecord> actual,
+            params (object sender, PageNavigationEvent evt)[] expected)
+        {
+            Assert.Equal(expected.Length, actual.Count);
+            for (var i = 0; i < expected.Length; i++)
+            {
+                Assert.Equal(expected[i].evt, actual[i].Event);
+                Assert.Same(expected[i].sender, actual[i].Sender);
+            }
+        }
 
         public void Dispose()
         {
diff --git a/tests/Maui/Prism.Maui.Tests/GlobalUsings.cs b/tests/Maui/Prism.Maui.Tests/GlobalUsings.cs
new file mode 100644
index 0000000000..daae3e70fb
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/GlobalUsings.cs
@@ -0,0 +1,2 @@
+global using Microsoft.Maui.Controls;
+global using Microsoft.Maui.Dispatching;
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/ApplicationMock.cs b/tests/Maui/Prism.Maui.Tests/Mocks/ApplicationMock.cs
new file mode 100644
index 0000000000..ec31673926
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/ApplicationMock.cs
@@ -0,0 +1,30 @@
+using Microsoft.Maui.Controls;
+using Prism.Navigation;
+
+namespace Prism.Maui.Tests.Mocks;
+
+/// <summary>
+/// Minimal stand-in for <see cref="Application"/> used by legacy navigation fixtures:
+/// exposes <see cref="MainPage"/> backed by a <see cref="PrismWindow"/> for <see cref="IWindowManager"/> integration.
+/// </summary>
+public sealed class ApplicationMock
+{
+    private readonly PrismWindow _window = new();
+
+    public ApplicationMock()
+    {
+    }
+
+    public ApplicationMock(Page mainPage)
+    {
+        MainPage = mainPage;
+    }
+
+    public Page MainPage
+    {
+        get => _window.Page;
+        set => _window.Page = value;
+    }
+
+    internal PrismWindow Window => _window;
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/Behaviors/EventToCommandBehaviorMock.cs b/tests/Maui/Prism.Maui.Tests/Mocks/Behaviors/EventToCommandBehaviorMock.cs
index e7589b8860..46eb31dc59 100644
--- a/tests/Maui/Prism.Maui.Tests/Mocks/Behaviors/EventToCommandBehaviorMock.cs
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/Behaviors/EventToCommandBehaviorMock.cs
@@ -4,8 +4,12 @@ namespace Prism.Maui.Tests.Mocks.Behaviors;
 
 public class EventToCommandBehaviorMock : EventToCommandBehavior
 {
-    public void RaiseEvent(params object[] args)
-{
-        _handler.DynamicInvoke(args);
+    /// <summary>
+    /// Invokes <see cref="EventToCommandBehavior.OnEventRaised"/> without going through the
+    /// strongly typed event delegate (e.g. <c>SelectionChangedEventArgs</c> for <see cref="Microsoft.Maui.Controls.CollectionView"/>).
+    /// </summary>
+    public void RaiseEvent(object sender, EventArgs eventArgs)
+    {
+        OnEventRaised(sender, eventArgs);
     }
 }
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/MockResourcesProvider.cs b/tests/Maui/Prism.Maui.Tests/Mocks/MockResourcesProvider.cs
deleted file mode 100644
index 20660ee1d9..0000000000
--- a/tests/Maui/Prism.Maui.Tests/Mocks/MockResourcesProvider.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Microsoft.Maui.Controls.Internals;
-using Prism.Maui.Tests.Mocks;
-
-#pragma warning disable CS0612 // Type or member is obsolete
-[assembly: Dependency(typeof(MockResourcesProvider))]
-[assembly: Dependency(typeof(MockFontNamedSizeService))]
-#pragma warning restore CS0612 // Type or member is obsolete
-
-namespace Prism.Maui.Tests.Mocks;
-
-[Obsolete]
-internal class MockResourcesProvider : ISystemResourcesProvider
-{
-    public IResourceDictionary GetSystemResources()
-    {
-        var dictionary = new ResourceDictionary();
-        Style style;
-        style = new Style(typeof(Label));
-        dictionary[Device.Styles.BodyStyleKey] = style;
-
-        style = new Style(typeof(Label));
-        style.Setters.Add(Label.FontSizeProperty, 50);
-        dictionary[Device.Styles.TitleStyleKey] = style;
-
-        style = new Style(typeof(Label));
-        style.Setters.Add(Label.FontSizeProperty, 40);
-        dictionary[Device.Styles.SubtitleStyleKey] = style;
-
-        style = new Style(typeof(Label));
-        style.Setters.Add(Label.FontSizeProperty, 30);
-        dictionary[Device.Styles.CaptionStyleKey] = style;
-
-        style = new Style(typeof(Label));
-        style.Setters.Add(Label.FontSizeProperty, 20);
-        dictionary[Device.Styles.ListItemTextStyleKey] = style;
-
-        style = new Style(typeof(Label));
-        style.Setters.Add(Label.FontSizeProperty, 10);
-        dictionary[Device.Styles.ListItemDetailTextStyleKey] = style;
-
-        return dictionary;
-    }
-}
-
-[Obsolete]
-public class MockFontNamedSizeService : IFontNamedSizeService
-{
-    public double GetNamedSize(NamedSize size, Type targetElement, bool useOldSizes)
-    {
-        return size switch
-        {
-            NamedSize.Default => 12,// new MockFontManager().DefaultFontSize,
-            NamedSize.Micro => (double)4,
-            NamedSize.Small => (double)8,
-            NamedSize.Medium => (double)12,
-            NamedSize.Large => (double)16,
-            _ => throw new ArgumentOutOfRangeException(nameof(size)),
-        };
-    }
-}
\ No newline at end of file
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/MutablePageAccessor.cs b/tests/Maui/Prism.Maui.Tests/Mocks/MutablePageAccessor.cs
new file mode 100644
index 0000000000..8cab9bf536
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/MutablePageAccessor.cs
@@ -0,0 +1,9 @@
+using Microsoft.Maui.Controls;
+using Prism.Common;
+
+namespace Prism.Maui.Tests.Mocks;
+
+public sealed class MutablePageAccessor : IPageAccessor
+{
+    public Page Page { get; set; }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/PageNavigationContainerMock.cs b/tests/Maui/Prism.Maui.Tests/Mocks/PageNavigationContainerMock.cs
index 1591b7a1ee..1a54e11959 100644
--- a/tests/Maui/Prism.Maui.Tests/Mocks/PageNavigationContainerMock.cs
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/PageNavigationContainerMock.cs
@@ -1,157 +1,212 @@
-using System;
+#nullable enable
 using System.Collections.Generic;
-using Moq;
+using Prism.Behaviors;
+using Prism.Common;
+using Prism.Ioc;
+using Prism.Mvvm;
+using Prism.Navigation;
 
 namespace Prism.Maui.Tests.Mocks;
 
-public class PageNavigationContainerMock : IContainerExtension, IDisposable
+public sealed class PageNavigationContainerMock : IContainerExtension, IDisposable
 {
-    Dictionary<string, Type> _registeredPages = new Dictionary<string, Type>();
+    private readonly List<ViewRegistration> _viewRegistrations = new();
+    private readonly Dictionary<Type, Type> _typeMap = new();
+    private INavigationRegistry? _navigationRegistry;
 
-    public object Instance => throw new NotImplementedException();
+    /// <summary>
+    /// When set, assigned to every <see cref="IPageNavigationEventRecordable"/> instance returned from <see cref="Resolve(Type)"/>
+    /// so DI-created pages participate in the same <see cref="PageNavigationEventRecorder"/> as manually constructed test pages.
+    /// </summary>
+    public PageNavigationEventRecorder? SharedNavigationRecorder { get; set; }
 
-    public IScopedProvider CurrentScope { get; private set; }
+    public object Instance => this;
 
-    public IContainerRegistry Register(string key, Type type)
-    {
-        throw new NotImplementedException();
-    }
+    public IScopedProvider? CurrentScope { get; private set; }
 
-    public object Resolve(Type type)
-    {
-        return Activator.CreateInstance(type);
-    }
-
-    public object Resolve(Type type, string name)
-    {
-        if (_registeredPages.ContainsKey(name))
-            return Activator.CreateInstance(_registeredPages[name]);
-
-        return null;
-    }
+    public IContainerRegistry Register(string key, Type type) =>
+        throw new NotImplementedException();
 
     public IContainerRegistry Register(Type from, Type to)
     {
+        _typeMap[from] = to;
         return this;
     }
 
-    public IContainerRegistry Register(Type from, Type to, string name)
-    {
+    public IContainerRegistry Register(Type from, Type to, string name) =>
         throw new NotImplementedException();
-    }
 
     public IContainerRegistry RegisterInstance(Type type, object instance)
     {
-        throw new NotImplementedException();
+        if (instance is ViewRegistration registration)
+            _viewRegistrations.Add(registration);
+
+        return this;
     }
 
-    public IContainerRegistry RegisterSingleton(Type type)
-    {
+    public IContainerRegistry RegisterSingleton(Type type) =>
         throw new NotImplementedException();
-    }
 
-    public IContainerRegistry RegisterSingleton(Type from, Type to)
-    {
+    public IContainerRegistry RegisterSingleton(Type from, Type to) =>
         throw new NotImplementedException();
-    }
 
-    public IContainerRegistry RegisterType(Type type)
-    {
+    public IContainerRegistry RegisterType(Type type) =>
         throw new NotImplementedException();
-    }
 
-    public IContainerRegistry RegisterType(Type type, string name)
-    {
+    public IContainerRegistry RegisterType(Type type, string name) =>
         throw new NotImplementedException();
-    }
 
     public void Dispose()
     {
     }
 
-    public void FinalizeExtension()
-    {
+    public bool IsRegistered(Type type) =>
+        throw new NotImplementedException();
 
-    }
+    public bool IsRegistered(Type type, string name) =>
+        throw new NotImplementedException();
 
-    public bool IsRegistered(Type type)
-    {
+    public IContainerRegistry RegisterInstance(Type type, object instance, string name) =>
         throw new NotImplementedException();
-    }
 
-    public bool IsRegistered(Type type, string name)
-    {
+    public IContainerRegistry RegisterSingleton(Type from, Type to, string name) =>
         throw new NotImplementedException();
-    }
 
-    public IContainerRegistry RegisterInstance(Type type, object instance, string name)
+    public object Resolve(Type type, params (Type Type, object Instance)[] parameters) =>
+        Resolve(type);
+
+    public object Resolve(Type type, string name, params (Type Type, object Instance)[] parameters) =>
+        Resolve(type, name);
+
+    public IScopedProvider CreateScope()
     {
-        throw new NotImplementedException();
+        CurrentScope = new PageNavigationScope(this);
+        return CurrentScope;
     }
 
-    public IContainerRegistry RegisterSingleton(Type from, Type to, string name)
-    {
+    public IContainerRegistry RegisterSingleton(Type type, Func<object> factoryMethod) =>
         throw new NotImplementedException();
-    }
 
-    public object Resolve(Type type, params (Type Type, object Instance)[] parameters)
-    {
+    public IContainerRegistry RegisterSingleton(Type type, Func<IContainerProvider, object> factoryMethod) =>
         throw new NotImplementedException();
-    }
 
-    public object Resolve(Type type, string name, params (Type Type, object Instance)[] parameters)
-    {
+    public IContainerRegistry RegisterManySingleton(Type type, params Type[] serviceTypes) =>
         throw new NotImplementedException();
-    }
 
-    public IScopedProvider CreateScope()
-    {
-        CurrentScope = Mock.Of<IScopedProvider>();
-        return CurrentScope;
-    }
+    public IContainerRegistry Register(Type type, Func<object> factoryMethod) =>
+        throw new NotImplementedException();
 
-    public IContainerRegistry RegisterSingleton(Type type, Func<object> factoryMethod)
-    {
+    public IContainerRegistry Register(Type type, Func<IContainerProvider, object> factoryMethod) =>
         throw new NotImplementedException();
-    }
 
-    public IContainerRegistry RegisterSingleton(Type type, Func<IContainerProvider, object> factoryMethod)
-    {
+    public IContainerRegistry RegisterMany(Type type, params Type[] serviceTypes) =>
         throw new NotImplementedException();
-    }
 
-    public IContainerRegistry RegisterManySingleton(Type type, params Type[] serviceTypes)
-    {
+    public IContainerRegistry RegisterScoped(Type from, Type to) =>
         throw new NotImplementedException();
-    }
 
-    public IContainerRegistry Register(Type type, Func<object> factoryMethod)
-    {
+    public IContainerRegistry RegisterScoped(Type type, Func<object> factoryMethod) =>
+        throw new NotImplementedException();
+
+    public IContainerRegistry RegisterScoped(Type type, Func<IContainerProvider, object> factoryMethod) =>
         throw new NotImplementedException();
+
+    public void FinalizeExtension()
+    {
     }
 
-    public IContainerRegistry Register(Type type, Func<IContainerProvider, object> factoryMethod)
+    private object AfterResolve(object instance)
     {
-        throw new NotImplementedException();
+        if (SharedNavigationRecorder is not null && instance is IPageNavigationEventRecordable recordable)
+            recordable.PageNavigationEventRecorder = SharedNavigationRecorder;
+
+        return instance;
     }
 
-    public IContainerRegistry RegisterMany(Type type, params Type[] serviceTypes)
+    public object Resolve(Type type)
     {
-        throw new NotImplementedException();
+        if (type == typeof(INavigationRegistry))
+        {
+            _navigationRegistry ??= new NavigationRegistry(_viewRegistrations);
+            return _navigationRegistry;
+        }
+
+        if (IsEnumerableOf(type, typeof(IPageBehaviorFactory)))
+            return Array.Empty<IPageBehaviorFactory>();
+
+        if (_typeMap.TryGetValue(type, out var implementation))
+            return AfterResolve(Activator.CreateInstance(implementation)
+                   ?? throw new InvalidOperationException($"Could not create instance of {implementation}."));
+
+        return AfterResolve(Activator.CreateInstance(type)
+               ?? throw new InvalidOperationException($"Could not create instance of {type}."));
     }
 
-    public IContainerRegistry RegisterScoped(Type from, Type to)
+    public object Resolve(Type type, string name)
     {
-        throw new NotImplementedException();
+        if (_typeMap.TryGetValue(type, out var implementation))
+            return AfterResolve(Activator.CreateInstance(implementation)
+                   ?? throw new InvalidOperationException($"Could not create instance of {implementation}."));
+
+        return AfterResolve(Activator.CreateInstance(type)
+               ?? throw new InvalidOperationException($"Could not create instance of {type}."));
     }
 
-    public IContainerRegistry RegisterScoped(Type type, Func<object> factoryMethod)
+    internal static bool IsEnumerableOf(Type type, Type elementType)
     {
-        throw new NotImplementedException();
+        if (!type.IsGenericType)
+            return false;
+
+        return type.GetGenericTypeDefinition() == typeof(IEnumerable<>) &&
+               type.GetGenericArguments()[0] == elementType;
     }
 
-    public IContainerRegistry RegisterScoped(Type type, Func<IContainerProvider, object> factoryMethod)
+    private sealed class PageNavigationScope : IScopedProvider
     {
-        throw new NotImplementedException();
+        private readonly PageNavigationContainerMock _root;
+        private readonly MutablePageAccessor _accessor = new();
+        private bool _disposed;
+
+        public PageNavigationScope(PageNavigationContainerMock root) =>
+            _root = root;
+
+        public bool IsAttached { get; set; }
+
+        public IScopedProvider? CurrentScope => this;
+
+        public IScopedProvider CreateScope() =>
+            new PageNavigationScope(_root);
+
+        public IScopedProvider CreateChildScope() =>
+            new PageNavigationScope(_root);
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+
+            _disposed = true;
+            _accessor.Page = null;
+        }
+
+        public object Resolve(Type type) =>
+            Resolve(type, Array.Empty<(Type, object)>());
+
+        public object Resolve(Type type, params (Type Type, object Instance)[] parameters)
+        {
+            if (type == typeof(IPageAccessor))
+                return _accessor;
+
+            if (IsEnumerableOf(type, typeof(IPageBehaviorFactory)))
+                return Array.Empty<IPageBehaviorFactory>();
+
+            return _root.Resolve(type);
+        }
+
+        public object Resolve(Type type, string name) =>
+            _root.Resolve(type, name);
+
+        public object Resolve(Type type, string name, params (Type Type, object Instance)[] parameters) =>
+            _root.Resolve(type, name);
     }
 }
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/PageNavigationServiceMock.cs b/tests/Maui/Prism.Maui.Tests/Mocks/PageNavigationServiceMock.cs
new file mode 100644
index 0000000000..12cf6c8c20
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/PageNavigationServiceMock.cs
@@ -0,0 +1,24 @@
+#nullable enable
+using Microsoft.Maui.Controls;
+using Prism.Events;
+using Prism.Maui.Tests.Navigation;
+using Prism.Navigation;
+
+namespace Prism.Maui.Tests.Mocks;
+
+public sealed class PageNavigationServiceMock : PageNavigationService, IPageAware
+{
+    public PageNavigationServiceMock(PageNavigationContainerMock container, ApplicationMock app, PageNavigationEventRecorder? recorder = null)
+        : base(container, new TestWindowManager(app.Window), new EventAggregator(), new MutablePageAccessor())
+    {
+        // Wire recorder into DI-resolved pages (ContentPageMock, etc.) via PageNavigationContainerMock.AfterResolve.
+        // Always assign so a shared fixture container does not keep a stale recorder when the next test omits it.
+        container.SharedNavigationRecorder = recorder;
+    }
+
+    Page IPageAware.Page
+    {
+        get => ((MutablePageAccessor)_pageAccessor).Page;
+        set => ((MutablePageAccessor)_pageAccessor).Page = value;
+    }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/TestWindowManager.cs b/tests/Maui/Prism.Maui.Tests/Mocks/TestWindowManager.cs
new file mode 100644
index 0000000000..53fa43a61c
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/TestWindowManager.cs
@@ -0,0 +1,30 @@
+#nullable enable
+using Microsoft.Maui.Controls;
+using Prism.Navigation;
+
+namespace Prism.Maui.Tests.Mocks;
+
+public sealed class TestWindowManager : IWindowManager
+{
+    public TestWindowManager(PrismWindow window)
+    {
+        ArgumentNullException.ThrowIfNull(window);
+        Window = window;
+        Windows = new[] { window };
+        Current = window;
+    }
+
+    public PrismWindow Window { get; }
+
+    public IReadOnlyList<Window> Windows { get; }
+
+    public Window? Current { get; }
+
+    public void OpenWindow(Window window)
+    {
+    }
+
+    public void CloseWindow(Window window)
+    {
+    }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/Views/FlyoutPageMock.cs b/tests/Maui/Prism.Maui.Tests/Mocks/Views/FlyoutPageMock.cs
index 1a450b3792..76ffee896b 100644
--- a/tests/Maui/Prism.Maui.Tests/Mocks/Views/FlyoutPageMock.cs
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/Views/FlyoutPageMock.cs
@@ -18,7 +18,8 @@ public FlyoutPageMock(PageNavigationEventRecorder recorder)
         //ViewModelLocator.SetAutowireViewModel(this, true);
 
         PageNavigationEventRecorder = recorder;
-        ((IPageNavigationEventRecordable)BindingContext).PageNavigationEventRecorder = recorder;
+        if (BindingContext is IPageNavigationEventRecordable recordable)
+            recordable.PageNavigationEventRecorder = recorder;
     }
 
     public FlyoutPageMock(PageNavigationEventRecorder recorder, Page masterPage, Page detailPage)
@@ -29,7 +30,8 @@ public FlyoutPageMock(PageNavigationEventRecorder recorder, Page masterPage, Pag
         //ViewModelLocator.SetAutowireViewModel(this, true);
 
         PageNavigationEventRecorder = recorder;
-        ((IPageNavigationEventRecordable)BindingContext).PageNavigationEventRecorder = recorder;
+        if (BindingContext is IPageNavigationEventRecordable recordable)
+            recordable.PageNavigationEventRecorder = recorder;
     }
 
     public bool IsPresentedAfterNavigation { get; set; }
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageEmptyMock.cs b/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageEmptyMock.cs
index 269176b0f2..ef7e7003cb 100644
--- a/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageEmptyMock.cs
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageEmptyMock.cs
@@ -16,7 +16,8 @@ public NavigationPageEmptyMock(PageNavigationEventRecorder recorder)
         //ViewModelLocator.SetAutowireViewModel(this, true);
 
         PageNavigationEventRecorder = recorder;
-        ((IPageNavigationEventRecordable)BindingContext).PageNavigationEventRecorder = recorder;
+        if (BindingContext is IPageNavigationEventRecordable recordable)
+            recordable.PageNavigationEventRecorder = recorder;
     }
 
     public void OnNavigatedFrom(INavigationParameters parameters)
diff --git a/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageMock.cs b/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageMock.cs
index c6b8b8f29b..d55331239c 100644
--- a/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageMock.cs
+++ b/tests/Maui/Prism.Maui.Tests/Mocks/Views/NavigationPageMock.cs
@@ -20,7 +20,8 @@ public NavigationPageMock(PageNavigationEventRecorder recorder, Page page) : bas
         //ViewModelLocator.SetAutowireViewModel(this, true);
 
         PageNavigationEventRecorder = recorder;
-        ((IPageNavigationEventRecordable)BindingContext).PageNavigationEventRecorder = recorder;
+        if (BindingContext is IPageNavigationEventRecordable recordable)
+            recordable.PageNavigationEventRecorder = recorder;
     }
 
     public void Destroy()
diff --git a/tests/Maui/Prism.Maui.Tests/Navigation/IPageAware.cs b/tests/Maui/Prism.Maui.Tests/Navigation/IPageAware.cs
new file mode 100644
index 0000000000..894d8eef3b
--- /dev/null
+++ b/tests/Maui/Prism.Maui.Tests/Navigation/IPageAware.cs
@@ -0,0 +1,11 @@
+using Microsoft.Maui.Controls;
+
+namespace Prism.Maui.Tests.Navigation;
+
+/// <summary>
+/// Legacy test shim (pre-<see cref="Prism.Common.IPageAccessor"/>) so fixtures can assign the logical navigation root page.
+/// </summary>
+public interface IPageAware
+{
+    Page Page { get; set; }
+}
diff --git a/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj b/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj
index 7d9bf2e440..44f1ffd248 100644
--- a/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj
+++ b/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj
@@ -4,11 +4,6 @@
     <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Fixtures\PageNavigationServiceFixture.cs" />
-    <None Include="Fixtures\PageNavigationServiceFixture.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" VersionOverride="10.0.10" />
     <PackageReference Include="GitHubActionsTestLogger">