diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/DependencyObjectGeneratorTests/Given_DependencyObjectGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/DependencyObjectGeneratorTests/Given_DependencyObjectGenerator.cs index ebe95e68987c..ffd9579a49b2 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/DependencyObjectGeneratorTests/Given_DependencyObjectGenerator.cs +++ b/src/SourceGenerators/Uno.UI.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/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs index 7041f7af0ab3..8bfc8a53b083 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs +++ b/src/SourceGenerators/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/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs index 9cf56f3b2366..4443fcc8c5cd 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs +++ b/src/SourceGenerators/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"),