Merge pull request unoplatform#16161 from Youssef1313/has-uno-winui

build: Don't include HAS_UNO_WINUI for Windows builds
jeromelaban · Apr 26, 2024 · ea348a1 · ea348a1
2 parents df5929a + d4c0585
commit ea348a1
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 34 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -34,7 +34,6 @@
 		<Deterministic>true</Deterministic>
 
 		<UNO_UWP_BUILD>false</UNO_UWP_BUILD>
-		<DefineConstants Condition="'$(UNO_UWP_BUILD)'!='true'">$(DefineConstants);HAS_UNO_WINUI</DefineConstants>
 
 		<!-- Resizetizer codegen is not supported in UWP -->
 		<UnoResizetizerDisableWindowIconExtensions Condition="'$(UNO_UWP_BUILD)'=='true'">true</UnoResizetizerDisableWindowIconExtensions>

diff --git a/src/SamplesApp/SamplesApp.Shared/App.xaml.cs b/src/SamplesApp/SamplesApp.Shared/App.xaml.cs
@@ -32,7 +32,7 @@
 using Uno.Logging;
 #endif
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using LaunchActivatedEventArgs = Microsoft/* UWP don't rename */.UI.Xaml.LaunchActivatedEventArgs;
 #else
 using LaunchActivatedEventArgs = Windows.ApplicationModel.Activation.LaunchActivatedEventArgs;
@@ -120,7 +120,7 @@ override void OnLaunched(LaunchActivatedEventArgs e)
 			LaunchiOSWatchDog();
 #endif
 			var activationKind =
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 				e.UWPLaunchActivatedEventArgs.Kind
 #else
 				e.Kind
@@ -306,7 +306,7 @@ private void ActivateMainWindow()
 
 		public event EventHandler? MainWindowActivated;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 		protected override void OnWindowCreated(global::Microsoft.UI.Xaml.WindowCreatedEventArgs args)
 		{
 			if (Current is null)

diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.cs b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.cs
@@ -274,7 +274,7 @@ void Setter()
 				stopButton.IsEnabled = _cts != null && !_cts.IsCancellationRequested || !isRunning;
 				RunningStateForUITest = runningState.Text = isRunning ? "Running" : "Finished";
 				runStatus.Text = message;
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 				if (Private.Infrastructure.TestServices.WindowHelper.CurrentTestWindow is Microsoft.UI.Xaml.Window window)
 				{
 					window.Title = message;

diff --git a/...ests.Shared/Windows_UI_Composition/InteractionTrackerAndExpressionAnimationSample.xaml.cs b/...ests.Shared/Windows_UI_Composition/InteractionTrackerAndExpressionAnimationSample.xaml.cs
@@ -18,7 +18,7 @@
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using PointerDeviceType = Microsoft.UI.Input.PointerDeviceType;
 #else
 using PointerDeviceType = Windows.Devices.Input.PointerDeviceType;

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Core/WindowActivationTests.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Core/WindowActivationTests.xaml.cs
@@ -147,7 +147,7 @@ private void CoreWindowActivated(CoreWindow sender, Windows.UI.Core.WindowActiva
 		}
 
 		private void WindowActivated(object sender,
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 			Microsoft/* UWP don't rename */.UI.Xaml.WindowActivatedEventArgs e
 #else
 			Windows.UI.Core.WindowActivatedEventArgs e

diff --git a/...plesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/ManipulationEvents.xaml.cs b/...plesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/ManipulationEvents.xaml.cs
@@ -6,7 +6,7 @@
 using Microsoft.UI.Xaml.Media;
 using Uno.UI.Samples.Controls;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Input;
 #else
 using Windows.Devices.Input;

diff --git a/...lesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/Manipulation_Basics.xaml.cs b/...lesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/Manipulation_Basics.xaml.cs
@@ -6,7 +6,7 @@
 using Microsoft.UI.Xaml.Input;
 using Uno.UI.Samples.Controls;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Input;
 #else
 using Windows.Devices.Input;

diff --git a/...esApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/Manipulation_Inertia.xaml.cs b/...esApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/Manipulation_Inertia.xaml.cs
@@ -7,7 +7,7 @@
 using Microsoft.UI.Xaml.Media;
 using Uno.UI.Samples.Controls;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Input;
 #else
 using Windows.Devices.Input;

diff --git a/...ts.Shared/Windows_UI_Input/GestureRecognizerTests/Manipulation_WhenInScrollViewer.xaml.cs b/...ts.Shared/Windows_UI_Input/GestureRecognizerTests/Manipulation_WhenInScrollViewer.xaml.cs
@@ -14,7 +14,7 @@
 using Microsoft.UI.Xaml.Navigation;
 using Uno.UI.Samples.Controls;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Input;
 #else
 using Windows.Devices.Input;

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml.cs
@@ -15,7 +15,7 @@
 using Microsoft.UI.Xaml.Documents;
 using Uno.Extensions;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Input;
 #else
 using Windows.Devices.Input;

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Input/SetProtectedCursor.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Input/SetProtectedCursor.xaml.cs
@@ -1,5 +1,5 @@
 using Microsoft/* UWP don't rename */.UI.Xaml;
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 #endif
 using Uno.UI.Samples.Controls;

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_Basics.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_Basics.xaml.cs
@@ -6,7 +6,7 @@
 using Microsoft.UI.Xaml.Input;
 using Uno.UI.Samples.Controls;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Input;
 #else
 using Windows.Devices.Input;

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_Nested.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_Nested.xaml.cs
@@ -5,7 +5,7 @@
 using Microsoft.UI.Xaml.Input;
 using Uno.UI.Samples.Controls;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Input;
 #else
 using Windows.Devices.Input;

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Input/XamlUICommandTests.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Input/XamlUICommandTests.xaml.cs
@@ -6,7 +6,7 @@
 using Windows.Foundation;
 using Microsoft.UI.Xaml.Input;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft.UI.Xaml.Controls;
 #endif
 

diff --git a/src/Uno.CrossTargetting.targets b/src/Uno.CrossTargetting.targets
@@ -100,14 +100,15 @@
 
 	<PropertyGroup Condition=" '$(TargetFramework)' != 'uap10.0.19041' and '$(TargetFramework)'!='net7.0-windows10.0.19041.0' and '$(TargetPlatformIdentifier)' != 'UAP'">
 		<DefineConstants>$(DefineConstants);HAS_UNO</DefineConstants>
+		<DefineConstants Condition="'$(UNO_UWP_BUILD)'!='true'">$(DefineConstants);HAS_UNO_WINUI</DefineConstants>
 
 		<!-- Hint the VS's XAML parser -->
 		<!-- https://github.com/unoplatform/uno/issues/15517 -->
     	<DefaultXamlRuntime Condition="'$(DefaultXamlRuntime)'==''">WinUI</DefaultXamlRuntime>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.19041.0'">
-		<DefineConstants>$(DefineConstants);HAS_INPUT_INJECTOR</DefineConstants>
+		<DefineConstants>$(DefineConstants);HAS_INPUT_INJECTOR;WINDOWS_WINUI</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.19041' ">

diff --git a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_LayoutPanel.cs b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_LayoutPanel.cs
@@ -7,8 +7,8 @@
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 using Private.Infrastructure;
 
-#if !HAS_UNO_WINUI
-using Microsoft.UI.Xaml.Controls;
+#if HAS_UNO && !HAS_UNO_WINUI
+using Windows.UI.Xaml.Controls;
 #endif
 
 namespace Uno.UI.RuntimeTests.Tests.Microsoft_UI_Xaml_Controls;

diff --git a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_PipsPager.cs b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_PipsPager.cs
@@ -8,8 +8,8 @@
 using Private.Infrastructure;
 using Uno.UI.RuntimeTests.Helpers;
 
-#if !HAS_UNO_WINUI
-using Microsoft.UI.Xaml.Controls;
+#if HAS_UNO && !HAS_UNO_WINUI
+using Windows.UI.Xaml.Controls;
 #endif
 
 namespace Uno.UI.RuntimeTests.Tests.Microsoft_UI_Xaml_Controls;

diff --git a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_RatingControl.cs b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_RatingControl.cs
@@ -7,7 +7,7 @@
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 using RatingControl = Microsoft/* UWP don't rename */.UI.Xaml.Controls.RatingControl;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Windows.UI.Xaml.Controls;
 #endif
 

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Composition/Given_InteractionTracker.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Composition/Given_InteractionTracker.cs
@@ -11,7 +11,7 @@
 using Uno.UI.RuntimeTests.Helpers;
 using Windows.UI.Input.Preview.Injection;
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using PointerDeviceType = Microsoft.UI.Input.PointerDeviceType;
 #else
 using PointerDeviceType = Windows.Devices.Input.PointerDeviceType;

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_FrameworkElement_LayoutSlot.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_FrameworkElement_LayoutSlot.cs
@@ -5,7 +5,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 #endif
 

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_CalendarView.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_CalendarView.cs
@@ -13,7 +13,7 @@
 using SamplesApp.UITests;
 using Windows.Foundation;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 #endif
 

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_MenuFlyout.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_MenuFlyout.cs
@@ -25,7 +25,7 @@
 using Microsoft.UI.Xaml.Shapes;
 using static Private.Infrastructure.TestServices;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 #endif
 

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_NavigationView.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_NavigationView.cs
@@ -20,7 +20,7 @@
 using Uno.UI;
 #endif
 
-#if HAS_UNO_WINUI
+#if HAS_UNO_WINUI || WINAPPSDK
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Controls;
@@ -45,7 +45,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls
 	[RunsOnUIThread]
 	public partial class Given_NavigationView
 	{
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 		[TestMethod]
 		[RunsOnUIThread]
 #if __MACOS__
@@ -161,7 +161,7 @@ async Task<Rect> Select(int group, int item)
 
 	}
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 	public partial class MyNavigationView : NavigationView
 	{
 		public NavigationViewList MenuItemsHost { get; private set; }

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TreeView.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TreeView.cs
@@ -18,7 +18,7 @@
 using Uno.UI;
 using MUXControlsTestApp.Utilities;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 #endif
 

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_WebView.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_WebView.cs
@@ -7,7 +7,7 @@
 
 
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 #endif
 #if HAS_UNO

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Repeater/Given_ItemsRepeater.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Repeater/Given_ItemsRepeater.cs
@@ -19,7 +19,7 @@
 using Uno.Extensions;
 using Uno.UI.RuntimeTests.Helpers;
 
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Windows.UI.Xaml.Controls;
 #endif
 

diff --git a/...ests/Tests/Windows_UI_Xaml_Controls/Repeater/UniformGridLayout/Given_UniformGridLayout.cs b/...ests/Tests/Windows_UI_Xaml_Controls/Repeater/UniformGridLayout/Given_UniformGridLayout.cs
@@ -7,7 +7,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using FluentAssertions;
-#if !HAS_UNO_WINUI
+#if HAS_UNO && !HAS_UNO_WINUI
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 #endif
 using Private.Infrastructure;

diff --git a/src/Uno.UI/Extensions/PrettyPrint.cs b/src/Uno.UI/Extensions/PrettyPrint.cs
@@ -9,7 +9,7 @@
 using Windows.Foundation;
 using Windows.UI;
 
-#if HAS_UNO_WINUI || WINAPPSDK
+#if HAS_UNO_WINUI || WINAPPSDK || WINUI
 using Colors = Microsoft.UI.Colors;
 #else
 using Colors = Windows.UI.Colors;