From fbf7664570570e4482a24ce14d430aa69d48fa09 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sun, 14 Aug 2022 09:18:47 -0700
Subject: [PATCH] 6.0.400 update

---
 README.md                                       | 17 ++++++++++-------
 global.json                                     |  4 +---
 .../Navigation/PageNavigationService.cs         |  5 +----
 version.json                                    |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 74145ec..c19fd37 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,8 @@ MauiApp.CreateBuilder()
 
 // Prism.Maui
 MauiApp.CreateBuilder()
-    .UsePrismApp<App>(prism => {
+    .UseMauiApp<App>()
+    .UsePrism(prism => {
         // Register Services and setup initial Navigation
     });
 ```
@@ -28,7 +29,8 @@ Some of the methods available on the `PrismAppBuilder` are going to seem a bit f
 
 ```cs
 MauiApp.CreateBuilder()
-    .UsePrismApp<App>(prism =>
+    .UseMauiApp<App>()
+    .UsePrism(prism =>
         prism.RegisterServices(container => {
             container.Register<ISomeService, SomeImplementation>();
             container.RegisterForNavigation<ViewA, ViewAViewModel>();
@@ -46,7 +48,8 @@ You will find that this includes useful extensions that consider that you are wi
 
 ```cs
 MauiApp.CreateBuilder()
-    .UsePrismApp<App>(prism =>
+    .UseMauiApp<App>()
+    .UsePrism(prism =>
         prism.OnInitialized(container => {
             var foo = container.Resolve<IFoo>();
             // Do some initializations here
@@ -58,7 +61,8 @@ The `PrismAppBuilder` additionally provides some new things to make your life ea
 
 ```cs
 MauiApp.CreateBuilder()
-    .UsePrismApp<App>(prism =>
+    .UseMauiApp<App>()
+    .UsePrism(prism =>
         prism.OnAppStart(async navigationService =>
         {
             var result = await navigationService.NavigateAsync("MainPage/NavigationPage/ViewA");
@@ -76,7 +80,8 @@ To help make it even easier we have added some special extensions to the `PrismA
 
 ```cs
 MauiApp.CreateBuilder()
-    .UsePrismApp<App>(prism =>
+    .UseMauiApp<App>()
+    .UsePrism(prism =>
         prism.ConfigureServices(services => {
             services.AddSingleton<IFoo, Foo>();
             services.RegisterForNavigation<ViewA, ViewAViewModel>();
@@ -122,6 +127,4 @@ navigationService.CreateBuilder()
     .Navigate();
 ```
 
-## NOTE
 
-Prism.Maui is currently a Beta. Any preview build is largely meant to solicit additional developer feedback. APIs will likely change and break prior to being merged into the Prism repo and released as a fully official build.
diff --git a/global.json b/global.json
index 44d5120..d769cd3 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.302",
-    "rollForward": "latestPatch",
-    "allowPrerelease": true
+    "version": "6.0.400"
   }
 }
\ No newline at end of file
diff --git a/src/Prism.Maui/Navigation/PageNavigationService.cs b/src/Prism.Maui/Navigation/PageNavigationService.cs
index 69be320..481e93b 100644
--- a/src/Prism.Maui/Navigation/PageNavigationService.cs
+++ b/src/Prism.Maui/Navigation/PageNavigationService.cs
@@ -1037,12 +1037,9 @@ protected virtual async Task DoPush(Page currentPage, Page page, bool? useModalN
                 }
                 else
                 {
-#if !ANDROID
+#if !ANDROID && !WINDOWS
                     // BUG: https://github.com/dotnet/maui/issues/7275
                     Window.Page = page;
-#if WINDOWS
-                    page.ForceLayout();
-#endif
 #else
                     // HACK: This is the only way CURRENTLY to ensure that the UI resets for Absolute Navigation
                     var newWindow = new PrismWindow
diff --git a/version.json b/version.json
index 33fbba8..877c55d 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "8.1-beta",
+  "version": "8.1-pre",
   "assemblyVersion": {
     "precision": "revision"
   },