Merge branch 'main' into ensure-DerivePathInfo-is-only-called-once

Author: SimonCropp

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>29.0.0-beta.2</Version>
+    <Version>29.0.0-beta.5</Version>
     <NoWarn>CA1822;CS1591;CS0649;xUnit1026;xUnit1013;CS1573;VerifyTestsProjectDir;VerifySetParameters;PolyFillTargetsForNuget;xUnit1051</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>preview</LangVersion>

src/Verify/VerifierSettings_TargetAssembly.cs

@@ -34,14 +34,13 @@ public static void AssignTargetAssembly(Assembly assembly)
             return;
         }
 
-        lock (locker)
+        using (locker.EnterScope())
         {
             if (VerifierSettings.assembly is not null)
             {
                 return;
             }
 
-            VerifierSettings.assembly = assembly;
             Namer.UseAssembly(assembly);
             IoHelpers.MapPathsForCallingAssembly(assembly);
             ProjectDir = AttributeReader.GetProjectDirectory(assembly);
@@ -54,6 +53,7 @@ public static void AssignTargetAssembly(Assembly assembly)
 
             SolutionDir = solutionDir;
             ApplyScrubbers.UseAssembly(solutionDir, ProjectDir);
+            VerifierSettings.assembly = assembly;
         }
     }
 }