fix fortesting to add assembyloadcontext

RocketSurgeonsGuild · Apr 16, 2024 · 7ade770 · 7ade770
1 parent 4399594
commit 7ade770
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Conventions.Abstractions/ConventionContextBuilder.cs b/src/Conventions.Abstractions/ConventionContextBuilder.cs
@@ -6,6 +6,7 @@
 using PropertiesDictionary = System.Collections.Generic.Dictionary<object, object?>;
 #endif
 using System.Reflection;
+using System.Runtime.Loader;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -70,6 +71,7 @@ public ConventionContextBuilder EnableConventionAttributes()
     /// <returns></returns>
     public ConventionContextBuilder WithConventionsFrom(IConventionFactory conventionFactory)
     {
+        this.AddIfMissing(AssemblyLoadContext.Default);
         _conventionProviderFactory = conventionFactory;
         return this;
     }
@@ -379,4 +381,4 @@ public ConventionContextBuilder IncludeConvention(Assembly assembly, params Asse
         _includeAssemblyConventions.AddRange(assemblies);
         return this;
     }
-}
+}
diff --git a/src/Conventions/Testing/TestConventionContextBuilderExtensions.cs b/src/Conventions/Testing/TestConventionContextBuilderExtensions.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.Loader;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
@@ -58,6 +59,7 @@ public static ConventionContextBuilder ForTesting(
         var logger = loggerFactory.CreateLogger("TestContext");
 
         return builder
+              .AddIfMissing(AssemblyLoadContext.Default)
               .Set(HostType.UnitTest)
               .WithConventionsFrom(factory)
               .WithLoggerFactory(loggerFactory)
@@ -306,4 +308,4 @@ private static void EnsureConfigured(ConventionContextBuilder builder)
 //
 //        return builder;
 //    }
-}
+}