Merge pull request #112 from CommunityToolkit/fix/build-errors

Fixed build errors when building Wasm with WinUI 3
CommunityToolkit · Jul 25, 2023 · f841534 · f841534
2 parents 5b51ba3 + 2776517
commit f841534
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CommunityToolkit.App.Shared/App.xaml.cs b/CommunityToolkit.App.Shared/App.xaml.cs
@@ -35,7 +35,7 @@ public App()
     /// <param name="e">Details about the launch request and process.</param>
     protected override void OnLaunched(LaunchActivatedEventArgs e)
     {
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
         currentWindow = new Window();
         currentWindow.Title = "Toolkit Labs Gallery";
         currentWindow.AppWindow.SetIcon("Assets/Icon.ico");

diff --git a/CommunityToolkit.App.Shared/Controls/TitleBar/NativeMethods.cs b/CommunityToolkit.App.Shared/Controls/TitleBar/NativeMethods.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
 using System.Runtime.InteropServices;
 using WinRT.Interop;
 using Microsoft.UI;

diff --git a/CommunityToolkit.App.Shared/Controls/TitleBar/TitleBar.WASDK.cs b/CommunityToolkit.App.Shared/Controls/TitleBar/TitleBar.WASDK.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 

diff --git a/CommunityToolkit.App.Shared/Controls/TitleBar/TitleBar.cs b/CommunityToolkit.App.Shared/Controls/TitleBar/TitleBar.cs
@@ -109,7 +109,7 @@ private void TitleBar_SizeChanged(object sender, SizeChangedEventArgs e)
             VisualStateManager.GoToState(this, WideState, true);
         }
 
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
         SetDragRegionForCustomTitleBar();
 #endif
     }
@@ -129,7 +129,7 @@ private void Configure()
 #if WINDOWS_UWP && !HAS_UNO
         SetUWPTitleBar();
 #endif
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
     SetWASDKTitleBar();
 #endif
     }
@@ -139,7 +139,7 @@ public void Reset()
 #if WINDOWS_UWP && !HAS_UNO
         ResetUWPTitleBar();
 #endif
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
         ResetWASDKTitleBar();
 #endif
     }
@@ -185,7 +185,7 @@ private void Update()
             VisualStateManager.GoToState(this, FooterCollapsedState, true);
         }
 
-#if WINAPPSDK
+#if WINDOWS_WINAPPSDK
         SetDragRegionForCustomTitleBar();
 #endif
     }