chore: Adjust assemblies order

unoplatform · Nov 29, 2024 · 1e70065 · 1e70065
1 parent 8da3e71
commit 1e70065
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/....SourceGenerators.Tests/DependencyObjectGeneratorTests/Given_DependencyObjectGenerator.cs b/....SourceGenerators.Tests/DependencyObjectGeneratorTests/Given_DependencyObjectGenerator.cs
@@ -37,12 +37,14 @@ private static MetadataReference[] BuildUnoReferences(bool isAndroid)
 				Path.Combine("Uno.UI.netcoremobile", Configuration, $"{TFMCurrent}-android"),
 			]
 			: [
-				Path.Combine("Uno.UI.Skia", Configuration, TFMPrevious),
-				Path.Combine("Uno.UI.Reference", Configuration, TFMPrevious),
+				// On CI the test assemblies set must be first, as it contains all
+				// dependent assemblies, which the other platforms don't (see DisablePrivateProjectReference).
 				Path.Combine("Uno.UI.Tests", Configuration, TFMPrevious),
-				Path.Combine("Uno.UI.Skia", Configuration, TFMCurrent),
-				Path.Combine("Uno.UI.Reference", Configuration, TFMCurrent),
+				Path.Combine("Uno.UI.Reference", Configuration, TFMPrevious),
+				Path.Combine("Uno.UI.Skia", Configuration, TFMPrevious),
 				Path.Combine("Uno.UI.Tests", Configuration, TFMCurrent),
+				Path.Combine("Uno.UI.Reference", Configuration, TFMCurrent),
+				Path.Combine("Uno.UI.Skia", Configuration, TFMCurrent),
 			];
 
 		var unoUIBase = Path.Combine(

diff --git a/...rceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs b/...rceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs
@@ -371,12 +371,14 @@ private static PortableExecutableReference[] BuildUnoReferences()
 #endif
 
 		var availableTargets = new[] {
+			// On CI the test assemblies set must be first, as it contains all
+			// dependent assemblies, which the other platforms don't (see DisablePrivateProjectReference).
+			Path.Combine("Uno.UI.Tests", configuration, "net8.0"),
 			Path.Combine("Uno.UI.Skia", configuration, "net8.0"),
 			Path.Combine("Uno.UI.Reference", configuration, "net8.0"),
-			Path.Combine("Uno.UI.Tests", configuration, "net8.0"),
+			Path.Combine("Uno.UI.Tests", configuration, "net9.0"),
 			Path.Combine("Uno.UI.Skia", configuration, "net9.0"),
 			Path.Combine("Uno.UI.Reference", configuration, "net9.0"),
-			Path.Combine("Uno.UI.Tests", configuration, "net9.0"),
 		};
 
 		var unoUIBase = Path.Combine(

diff --git a/...eGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs b/...eGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs
@@ -312,6 +312,8 @@ private static MetadataReference[] BuildUnoReferences()
 #endif
 
 				var availableTargets = new[] {
+					// On CI the test assemblies set must be first, as it contains all
+					// dependent assemblies, which the other platforms don't (see DisablePrivateProjectReference).
 					Path.Combine("Uno.UI.Tests", configuration, "net8.0"),
 					Path.Combine("Uno.UI.Skia", configuration, "net8.0"),
 					Path.Combine("Uno.UI.Reference", configuration, "net8.0"),