Fix attribute loading for cases where the base class is not available

alexanderlinne · alexanderlinne · commit d063dd61c0d7 · 2025-09-26T11:47:53.000+02:00
Signed-off-by: Alexander Linne &lt;alexander.linne@tngtech.com&gt;
diff --git a/ArchUnit.sln b/ArchUnit.sln
@@ -46,7 +46,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.TUnitTests", "A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InterfaceAssembly", "TestAssemblies\InterfaceAssembly\InterfaceAssembly.csproj", "{076E223C-32D3-4672-8B00-925CDBC1383E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilteredDirectoryAssemblyAttributeAssembly", "TestAssemblies\FilteredDirectoryAssemblyAttributeAssembly\FilteredDirectoryAssemblyAttributeAssembly.csproj", "{AA695589-8CCC-4474-9A7F-01A6376C375A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilteredDirectoryUnavailableTypesAssembly", "TestAssemblies\FilteredDirectoryUnavailableTypesAssembly\FilteredDirectoryUnavailableTypesAssembly.csproj", "{AA695589-8CCC-4474-9A7F-01A6376C375A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ArchUnitNET/Loader/MonoCecilAttributeExtensions.cs b/ArchUnitNET/Loader/MonoCecilAttributeExtensions.cs
@@ -21,9 +21,9 @@ TypeFactory typeFactory
                 attributeTypeReference
             );
             var attribute = attributeType.Type as Attribute;
-            if (attributeType.Type is UnavailableType unavailableType)
+            if (attribute == null && (attributeType.Type is UnavailableType || attributeType.Type is Class))
             {
-                attribute = new Attribute(unavailableType, null, null);
+                attribute = new Attribute(attributeType.Type, null, null);
             }
             if (attribute == null)
             {
diff --git a/ArchUnitNETTests/Loader/ArchLoaderTests.cs b/ArchUnitNETTests/Loader/ArchLoaderTests.cs
@@ -149,7 +149,7 @@ public void UnavailableTypeTest()
                     System.IO.SearchOption.AllDirectories
                 )
                 .Build();
-            Assert.Single(architecture.Types);
+            Assert.Equal(3, architecture.Types.Count());
             var loggerType = architecture.ReferencedTypes.WhereFullNameIs("Serilog.ILogger");
             Assert.NotNull(loggerType);
             Assert.True(loggerType is UnavailableType);
diff --git a/TestAssemblies/FilteredDirectoryAssemblyAttributeAssembly/AssemblyAttribute.cs b/TestAssemblies/FilteredDirectoryAssemblyAttributeAssembly/AssemblyAttribute.cs
diff --git a/TestAssemblies/FilteredDirectoryLoaderTestAssembly/Class1.cs b/TestAssemblies/FilteredDirectoryLoaderTestAssembly/Class1.cs
@@ -1,6 +1,7 @@
+using FilteredDirectoryUnavailableTypesAssembly;
 using Serilog;
 
-[assembly: FilteredDirectoryAssemblyAttributeAssembly.AssemblyAttribute]
+[assembly: Assembly]
 
 namespace FilteredDirectoryLoaderTestAssembly;
 
@@ -13,3 +14,8 @@ public Class1()
         this.logger = new LoggerConfiguration().CreateLogger();
     }
 }
+
+public class DerivedAttribute : BaseAttribute { }
+
+[Derived]
+public class ClassWithDerivedAttribute { }
diff --git a/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj b/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\FilteredDirectoryAssemblyAttributeAssembly\FilteredDirectoryAssemblyAttributeAssembly.csproj">
+    <ProjectReference Include="..\FilteredDirectoryUnavailableTypesAssembly\FilteredDirectoryUnavailableTypesAssembly.csproj">
       <!-- Do not copy the referenced assembly to the output directory -->
       <!-- in order to test handling of unavailable types as attribute assemblies -->
       <Private>False</Private>
diff --git a/TestAssemblies/FilteredDirectoryUnavailableTypesAssembly/FilteredDirectoryUnavailableTypesAssembly.csproj b/TestAssemblies/FilteredDirectoryUnavailableTypesAssembly/FilteredDirectoryUnavailableTypesAssembly.csproj
@@ -4,5 +4,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
+    <RootNamespace>FilteredDirectoryUnavailableTypesAssembly</RootNamespace>
   </PropertyGroup>
 </Project>
diff --git a/TestAssemblies/FilteredDirectoryUnavailableTypesAssembly/UnavailableTypes.cs b/TestAssemblies/FilteredDirectoryUnavailableTypesAssembly/UnavailableTypes.cs
@@ -0,0 +1,7 @@
+﻿namespace FilteredDirectoryUnavailableTypesAssembly;
+
+[AttributeUsage(AttributeTargets.Assembly)]
+public class AssemblyAttribute : Attribute { }
+
+[AttributeUsage(AttributeTargets.All)]
+public class BaseAttribute : Attribute { }

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ TypeFactory typeFactory`
`21`	`21`	`attributeTypeReference`
`22`	`22`	`);`
`23`	`23`	`var attribute = attributeType.Type as Attribute;`
`24`		`- if (attributeType.Type is UnavailableType unavailableType)`
	`24`	`+ if (attribute == null && (attributeType.Type is UnavailableType \|\| attributeType.Type is Class))`
`25`	`25`	`{`
`26`		`- attribute = new Attribute(unavailableType, null, null);`
	`26`	`+ attribute = new Attribute(attributeType.Type, null, null);`
`27`	`27`	`}`
`28`	`28`	`if (attribute == null)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public void UnavailableTypeTest()`
`149`	`149`	`System.IO.SearchOption.AllDirectories`
`150`	`150`	`)`
`151`	`151`	`.Build();`
`152`		`- Assert.Single(architecture.Types);`
	`152`	`+ Assert.Equal(3, architecture.Types.Count());`
`153`	`153`	`var loggerType = architecture.ReferencedTypes.WhereFullNameIs("Serilog.ILogger");`
`154`	`154`	`Assert.NotNull(loggerType);`
`155`	`155`	`Assert.True(loggerType is UnavailableType);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
	`1`	`+using FilteredDirectoryUnavailableTypesAssembly;`
`1`	`2`	`using Serilog;`
`2`	`3`
`3`		`-[assembly: FilteredDirectoryAssemblyAttributeAssembly.AssemblyAttribute]`
	`4`	`+[assembly: Assembly]`
`4`	`5`
`5`	`6`	`namespace FilteredDirectoryLoaderTestAssembly;`
`6`	`7`
`@@ -13,3 +14,8 @@ public Class1()`
`13`	`14`	`this.logger = new LoggerConfiguration().CreateLogger();`
`14`	`15`	`}`
`15`	`16`	`}`
	`17`	`+`
	`18`	`+public class DerivedAttribute : BaseAttribute { }`
	`19`	`+`
	`20`	`+[Derived]`
	`21`	`+public class ClassWithDerivedAttribute { }`