From e894826cb4243ff5bd27f8b99bd3df4ebed9141e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 6 Nov 2024 15:11:14 -0800
Subject: [PATCH] Run 'AddImplicitDefineConstants' on 'BeforeCompile'

---
 .../targets/Microsoft.NET.Sdk.BeforeCommon.targets    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
index 6f5100260835..71706dbc7843 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
@@ -251,11 +251,18 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
   </Target>
 
-  <!-- Add implicitly defined preprocessor symbols to DefineConstants -->
+  <!--
+    Add implicitly defined preprocessor symbols to DefineConstants. Note: this is intentionally using 'BeforeCompile' as
+    trigger to ensure that it runs before the XamlPreCompile targets. This targets creates the intermediate XAML project
+    that is used by some XAML-based UI frameworks (eg. UWP XAML, WinUI 3). If it runs before AddImplicitDefineConstants,
+    and the code has any '#ifdefs' on constants generated by this target (eg. 'NET9_0_OR_GREATER'), the intermediate XAML
+    project will end up selecting the other code paths instead, which can cause all kinds of build failures or other
+    problems. For additional context, see: https://github.com/dotnet/sdk/issues/43908.
+  -->
   <Target Name="AddImplicitDefineConstants"
           Condition=" '$(DisableImplicitFrameworkDefines)' != 'true' "
           DependsOnTargets="GenerateTargetPlatformDefineConstants;GenerateNETCompatibleDefineConstants;GeneratePlatformCompatibleDefineConstants;_DisableDiagnosticTracing"
-          BeforeTargets="CoreCompile" >
+          BeforeTargets="BeforeCompile" >
     <PropertyGroup>
       <DefineConstants Condition=" '@(_ImplicitDefineConstant)' != '' " >$(DefineConstants);@(_ImplicitDefineConstant)</DefineConstants>
       <FinalDefineConstants Condition=" '@(_ImplicitDefineConstant)' != '' and '$(Language)' == 'VB' " >$(FinalDefineConstants),@(_ImplicitDefineConstant->'%(Identity)=-1', ',')</FinalDefineConstants>