Merge pull request TNG#166 from gbtb/perf_improvement_for_AddTypesToN…

…amespace Passing only new types to AddTypesToNamespace load task
Royer-Chang · Aug 3, 2022 · 2ac6487 · 2ac6487
2 parents c26edb4 + 84d1413
commit 2ac6487
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ArchUnitNET/Loader/ArchBuilder.cs b/ArchUnitNET/Loader/ArchBuilder.cs
@@ -73,6 +73,7 @@ public void LoadTypesForModule(ModuleDefinition module, string namespaceFilter)
                 types.AddRange(nestedTypes);
             }
 
+            var currentTypes = new List<IType>(types.Count);
             types.Where(typeDefinition => RegexUtils.MatchNamespaces(namespaceFilter,
                     typeDefinition.Namespace) && typeDefinition.CustomAttributes.All(att =>
                     att.AttributeType.FullName != "Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode"))
@@ -81,6 +82,7 @@ public void LoadTypesForModule(ModuleDefinition module, string namespaceFilter)
                     var type = _typeFactory.GetOrCreateTypeFromTypeReference(typeDefinition);
                     if (!_architectureTypes.Contains(type) && !type.IsCompilerGenerated)
                     {
+                        currentTypes.Add(type);
                         _architectureTypes.Add(type);
                     }
                 });
@@ -90,7 +92,7 @@ public void LoadTypesForModule(ModuleDefinition module, string namespaceFilter)
                 .ForEach(ns =>
                 {
                     _loadTaskRegistry.Add(typeof(AddTypesToNamespace),
-                        new AddTypesToNamespace(ns, _architectureTypes));
+                        new AddTypesToNamespace(ns, currentTypes));
                 });
         }
 

diff --git a/ArchUnitNETTests/Loader/ArchLoaderTests.cs b/ArchUnitNETTests/Loader/ArchLoaderTests.cs
@@ -25,7 +25,7 @@ public void LoadAssemblies()
             Assert.NotEmpty(ArchUnitNETTestAssemblyArchitectureWithDependencies.Assemblies);
         }
 
-        [Fact(Skip = "This takes very long.")]
+        [Fact]
         public void LoadAssembliesIncludingRecursiveDependencies()
         {
             var archUnitNetTestArchitectureWithRecursiveDependencies =