From 26c67720202287220a98e380cc7648ba2d567113 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Tue, 10 Jan 2023 10:45:42 +0200
Subject: [PATCH] fix(uap): Fix generators should not run under uap builds

---
 .../Helpers/PlatformHelper.cs                    |  9 +--------
 .../Content/Uno.UI.SourceGenerators.props        | 16 +++++++---------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/SourceGenerators/SourceGeneratorHelpers/Helpers/PlatformHelper.cs b/src/SourceGenerators/SourceGeneratorHelpers/Helpers/PlatformHelper.cs
index 0fced12d4476..33dfa82ed56c 100644
--- a/src/SourceGenerators/SourceGeneratorHelpers/Helpers/PlatformHelper.cs
+++ b/src/SourceGenerators/SourceGeneratorHelpers/Helpers/PlatformHelper.cs
@@ -15,23 +15,16 @@ public class PlatformHelper
 	{
 		public static bool IsValidPlatform(GeneratorExecutionContext context)
 		{
-			var evaluatedValue = context.GetMSBuildPropertyValue("TargetPlatformIdentifier");
-			var windowsAppSDKWinUI = context.GetMSBuildPropertyValue("WindowsAppSDKWinUI");
 			var projectTypeGuids = context.GetMSBuildPropertyValue("ProjectTypeGuidsProperty");
 
-			var isUAP = evaluatedValue?.Equals("UAP", StringComparison.OrdinalIgnoreCase) ?? false;
-
 			// Those two checks are now required since VS 16.9 which enables source generators by default
 			// and the uno targets files are not present for uap targets.
 			var isWindowsRuntimeApplicationOutput = context.Compilation.Options.OutputKind == OutputKind.WindowsRuntimeApplication;
 			var isWindowsRuntimeMetadataOutput = context.Compilation.Options.OutputKind == OutputKind.WindowsRuntimeMetadata;
 
-			var isWinAppSDK = windowsAppSDKWinUI?.Equals("True", StringComparison.OrdinalIgnoreCase) ?? false;
 			var isNetCoreDesktop = projectTypeGuids?.Equals("{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", StringComparison.OrdinalIgnoreCase) ?? false;
 
-			return !isUAP
-				&& !isWinAppSDK
-				&& !isNetCoreDesktop
+			return !isNetCoreDesktop
 				&& !isWindowsRuntimeMetadataOutput
 				&& !isWindowsRuntimeApplicationOutput;
 		}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
index 4d0fe0705677..3742f1eab118 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
@@ -69,7 +69,6 @@
 
   <ItemGroup Condition="'$(WindowsAppSDKWinUI)'!='true'">
 		<CompilerVisibleProperty Include="XamlSourceGeneratorTracingFolder" />
-		<CompilerVisibleProperty Include="TargetPlatformIdentifier" />
 		<CompilerVisibleProperty Include="TargetFramework" />
 		<CompilerVisibleProperty Include="ProjectTypeGuidsProperty" />
 		<CompilerVisibleProperty Include="MSBuildProjectFullPath" />
@@ -186,7 +185,7 @@
 		<ExcludeXamlNamespaces Condition="'$(XamarinProjectType)'=='skia'" Include="macos" />
 		<ExcludeXamlNamespaces Condition="'$(XamarinProjectType)'=='skia'" Include="not_skia" />
 
-		<!-- 
+		<!--
 			Those namespaces are to be *included* from the code generation,
 			regardless of their presence in the Ignorable section of a Xaml file.
 			-->
@@ -363,9 +362,9 @@
 	</ItemGroup>
 
 	<Target Name="_IncludeXamlFiles" BeforeTargets="_UnoSourceGenerator" DependsOnTargets="_FillSourceGeneratorItemGroups">
-		<!-- 
-		This group is created as part of a target to ensure the 
-		capture of target-defined Pages 
+		<!--
+		This group is created as part of a target to ensure the
+		capture of target-defined Pages
 		-->
 		<ItemGroup>
 			<SourceGeneratorInput Include="@(Page);@(ApplicationDefinition);@(UnoPage);@(UnoApplicationDefinition)" />
@@ -451,10 +450,9 @@
 			   Text="Uno.UI is using Uno.SourceGenerators" />
 	</Target>
 
-	<Target Name="_RemoveRoslynUnoSourceGeneration" BeforeTargets="CoreCompile" Condition="'$(UnoUIUseRoslynSourceGenerators)'=='false' or '$(WindowsAppSDKWinUI)'=='true'">
-		<!---
-	If the users explicitly disables Roslyn source generation, remove the analyzer item which is automatically added by Nuget.
-	-->
+	<Target Name="_RemoveRoslynUnoSourceGeneration" BeforeTargets="CoreCompile" Condition="'$(UnoUIUseRoslynSourceGenerators)'=='false' or '$(WindowsAppSDKWinUI)'=='true' or $(TargetFramework.StartsWith('uap10.0'))">
+		<!--- If the users explicitly disables Roslyn source generation, remove the analyzer item which is automatically added by NuGet. -->
+		<!-- Additionally, if this is a Windows build, remove the analyzer item for the generators. -->
 		<ItemGroup>
 			<_AnalyzerToRemove Include="@(Analyzer)" Condition="'%(FileName)'=='Uno.UI.SourceGenerators'" />
 			<Analyzer Remove="@(_AnalyzerToRemove)"/>