From 03b785b5fd665743b99abf6359719d3ee9fae2e9 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Tue, 6 Jun 2023 21:59:44 +0300
Subject: [PATCH 1/2] build: Run GenerateMixins before BeforeCompile

---
 src/Uno.UI/MixinGeneration.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Uno.UI/MixinGeneration.targets b/src/Uno.UI/MixinGeneration.targets
index 9834e8c06609..5b4f2d485a4d 100644
--- a/src/Uno.UI/MixinGeneration.targets
+++ b/src/Uno.UI/MixinGeneration.targets
@@ -67,13 +67,13 @@
 	</ItemGroup>
 
 	<!--
-	DispatchToInnerBuilds is used for direct builds, CoreCompile is for
+	DispatchToInnerBuilds is used for direct builds, BeforeCompile is for
 	project dependency induced builds.
 	-->
 	<Target Name="GenerateMixins"
 		  Inputs="@(MixinInput)"
 		  Outputs="@(MixinOutput)"
-		  BeforeTargets="DispatchToInnerBuilds;Build;CoreCompile"
+		  BeforeTargets="DispatchToInnerBuilds;Build;BeforeCompile"
 		  Condition="'$(DesignTimeBuild)' != 'true'">
 
 		<PropertyGroup>

From 1232d0ca3809c56e37546d57b046fe1a1266cb53 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Tue, 6 Jun 2023 23:36:53 +0300
Subject: [PATCH 2/2] chore: Adjust

---
 src/Uno.UI/MixinGeneration.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Uno.UI/MixinGeneration.targets b/src/Uno.UI/MixinGeneration.targets
index 5b4f2d485a4d..b1a53254a425 100644
--- a/src/Uno.UI/MixinGeneration.targets
+++ b/src/Uno.UI/MixinGeneration.targets
@@ -67,13 +67,13 @@
 	</ItemGroup>
 
 	<!--
-	DispatchToInnerBuilds is used for direct builds, BeforeCompile is for
+	DispatchToInnerBuilds is used for direct builds, CoreCompile is for
 	project dependency induced builds.
 	-->
 	<Target Name="GenerateMixins"
 		  Inputs="@(MixinInput)"
 		  Outputs="@(MixinOutput)"
-		  BeforeTargets="DispatchToInnerBuilds;Build;BeforeCompile"
+		  BeforeTargets="DispatchToInnerBuilds;Build;CoreCompile;_GenerateCompileDependencyCache"
 		  Condition="'$(DesignTimeBuild)' != 'true'">
 
 		<PropertyGroup>