Inverted IsAssignableFrom and use unbound generic for Attribute<T>

xunit · Jul 18, 2024 · 729501d · 729501d
1 parent ebfc86e
commit 729501d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/xunit.analyzers/X1000/EnsureFixturesHaveASource.cs b/src/xunit.analyzers/X1000/EnsureFixturesHaveASource.cs
@@ -21,7 +21,7 @@ public override void AnalyzeCompilation(
 		Guard.ArgumentNotNull(xunitContext);
 
 		var collectionAttributeType = xunitContext.Core.CollectionAttributeType;
-		var collectionAttributeOfTType = xunitContext.V3Core?.CollectionAttributeOfTType;
+		var collectionAttributeOfTType = xunitContext.V3Core?.CollectionAttributeOfTType?.ConstructUnboundGenericType();
 		var collectionDefinitionAttributeType = xunitContext.Core.CollectionDefinitionAttributeType;
 
 		context.RegisterSymbolAction(context =>
@@ -51,7 +51,7 @@ public override void AnalyzeCompilation(
 				collectionDefinition =
 					type
 						.GetAttributes()
-						.FirstOrDefault(a => a.AttributeClass.IsAssignableFrom(collectionAttributeType))
+						.FirstOrDefault(a => collectionAttributeType.IsAssignableFrom(a.AttributeClass))
 						?.ConstructorArguments
 						.FirstOrDefault()
 						.Value;
@@ -61,7 +61,7 @@ public override void AnalyzeCompilation(
 					collectionDefinition =
 						type
 							.GetAttributes()
-							.FirstOrDefault(a => a.AttributeClass.IsAssignableFrom(collectionAttributeOfTType))
+							.FirstOrDefault(a => collectionAttributeOfTType.IsAssignableFrom(a.AttributeClass))
 							?.AttributeClass
 							?.TypeArguments
 							.FirstOrDefault();