Fix possible nullref assignments on Wasdk

CommunityToolkit · Jun 3, 2024 · 35189bd · 35189bd
1 parent 81ebdb1
commit 35189bd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CommunityToolkit.App.Shared/App.xaml.cs b/CommunityToolkit.App.Shared/App.xaml.cs
@@ -12,10 +12,10 @@ namespace CommunityToolkit.App.Shared;
 public sealed partial class App : Application
 {
     // MacOS and iOS don't know the correct type without a full namespace declaration, confusing it with NSWindow and UIWindow.
-    // Using static will not work.
-#if WINAPPSDK
-    public static Microsoft.UI.Xaml.Window currentWindow = Microsoft.UI.Xaml.Window.Current;
-#else
+    // 'using static' will not work.
+#if WINUI3
+    public static Microsoft.UI.Xaml.Window? currentWindow = Microsoft.UI.Xaml.Window.Current;
+#elif WINUI2
     private static Windows.UI.Xaml.Window? currentWindow = Windows.UI.Xaml.Window.Current;
 #endif
 

diff --git a/CommunityToolkit.App.Shared/Pages/Shell.xaml.cs b/CommunityToolkit.App.Shared/Pages/Shell.xaml.cs
@@ -20,7 +20,7 @@ public sealed partial class Shell : Page
     public Shell()
     {
         this.InitializeComponent();
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
         appTitleBar.Window = App.currentWindow;
 #else
         BackdropMaterial.SetApplyToRootOrPageBackground(this, true);

diff --git a/CommunityToolkit.App.Shared/Pages/TabbedPage.xaml.cs b/CommunityToolkit.App.Shared/Pages/TabbedPage.xaml.cs
@@ -34,7 +34,7 @@ public sealed partial class TabbedPage : Page
     public TabbedPage()
     {
         this.InitializeComponent();
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
         appTitleBar.Window = App.currentWindow;
 #else
         BackdropMaterial.SetApplyToRootOrPageBackground(this, true);