Handle temp race condition (#1650)

Author: SimonCropp

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CA1822;CS1591;CS0649;xUnit1026;xUnit1013;CS1573;VerifyTestsProjectDir;VerifySetParameters;PolyFillTargetsForNuget;xUnit1051;NU1608;NU1109</NoWarn>
-    <Version>31.7.2</Version>
+    <Version>31.7.4</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>

src/RawTempUsage/GlobalUsings.cs

@@ -0,0 +1,4 @@
+// Global using directives
+
+global using VerifyTests;
+global using Xunit;

src/RawTempUsage/RawTempUsage.cs

@@ -0,0 +1,14 @@
+public class RawTempUsage
+{
+    [Fact]
+    public void Directory()
+    {
+        using var directory = new TempDirectory();
+    }
+
+    [Fact]
+    public void File()
+    {
+        using var file = new TempFile();
+    }
+}

src/RawTempUsage/RawTempUsage.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputType>Exe</OutputType>
+    <NoWarn>$(NoWarn);CS8002</NoWarn>
+    <RootNamespace>Fake</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Verify\Verify.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="MarkdownSnippets.MsBuild" PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
+    <PackageReference Include="xunit.v3" />
+  </ItemGroup>
+
+</Project>

src/Verify.slnx

@@ -16,11 +16,12 @@
   <Project Path="Benchmarks/Benchmarks.csproj" />
   <Project Path="DeterministicTests/DeterministicTests.csproj" />
   <Project Path="DisableScrubbersTests/DisableScrubbersTests.csproj" />
-  <Project Path="DisableVerifyFileNestingTests/DisableVerifyFileNestingTests.csproj" Type="C#" />
+  <Project Path="DisableVerifyFileNestingTests/DisableVerifyFileNestingTests.csproj" />
   <Project Path="FakeDiffTool/FakeDiffTool.csproj" />
   <Project Path="FSharpTests/FSharpTests.fsproj" />
   <Project Path="ModuleInitDocs/ModuleInitDocs.csproj" />
   <Project Path="NullComparer/NullComparer.csproj" />
+  <Project Path="RawTempUsage/RawTempUsage.csproj" />
   <Project Path="StaticSettingsTests/StaticSettingsTests.csproj" />
   <Project Path="StrictJsonTests/StrictJsonTests.csproj" />
   <Project Path="TargetLibrary/TargetLibrary.csproj" />

src/Verify/TempDirectory.cs

@@ -28,6 +28,8 @@ namespace VerifyTests;
 public class TempDirectory :
     IDisposable
 {
+    List<string> paths;
+
     /// <summary>
     /// The full path to the directory.
     /// </summary>
@@ -58,16 +60,17 @@ public static void Init()
             before: () =>
             {
             },
-            after: () => paths.Value = null);
+            after: () => asyncPaths.Value = null);
 
         VerifierSettings.GlobalScrubbers.Add((scrubber, _, _) =>
         {
-            if (paths.Value == null)
+            var pathsValue = asyncPaths.Value;
+            if (pathsValue == null)
             {
                 return;
             }
 
-            foreach (var path in paths.Value)
+            foreach (var path in pathsValue)
             {
                 scrubber.Replace(path, "{TempDirectory}");
             }
@@ -76,7 +79,7 @@ public static void Init()
         Cleanup();
     }
 
-    static AsyncLocal<List<string>?> paths = new();
+    static AsyncLocal<List<string>?> asyncPaths = new();
 
     internal static void Cleanup()
     {
@@ -118,13 +121,14 @@ public TempDirectory()
         Path = IoPath.Combine(RootDirectory, IoPath.GetRandomFileName());
         Directory.CreateDirectory(Path);
 
-        if (paths.Value == null)
+        paths = asyncPaths.Value!;
+        if (paths == null)
         {
-            paths.Value = [Path];
+            paths = asyncPaths.Value = [Path];
         }
         else
         {
-            paths.Value!.Add(Path);
+            paths.Add(Path);
         }
     }
 
@@ -135,7 +139,7 @@ public void Dispose()
             Directory.Delete(Path, true);
         }
 
-        paths.Value!.Remove(Path);
+        paths.Remove(Path);
     }
 
     /// <summary>

src/Verify/TempFile.cs

@@ -32,6 +32,8 @@ namespace VerifyTests;
 public class TempFile :
     IDisposable
 {
+    List<string> paths;
+
     /// <summary>
     /// The full path to the file.
     /// </summary>
@@ -61,16 +63,17 @@ public static void Init()
             before: () =>
             {
             },
-            after: () => paths.Value = null);
+            after: () => asyncPaths.Value = null);
 
         VerifierSettings.GlobalScrubbers.Add((scrubber, _, _) =>
         {
-            if (paths.Value == null)
+            var pathsValue = asyncPaths.Value;
+            if (pathsValue == null)
             {
                 return;
             }
 
-            foreach (var path in paths.Value)
+            foreach (var path in pathsValue)
             {
                 scrubber.Replace(path, "{TempFile}");
             }
@@ -79,7 +82,7 @@ public static void Init()
         Cleanup();
     }
 
-    static AsyncLocal<List<string>?> paths = new();
+    static AsyncLocal<List<string>?> asyncPaths = new();
 
     internal static void Cleanup()
     {
@@ -132,13 +135,14 @@ public TempFile(string? extension = null)
 
         Path = IoPath.Combine(RootDirectory, fileName);
 
-        if (paths.Value == null)
+        paths = asyncPaths.Value!;
+        if (paths == null)
         {
-            paths.Value = [Path];
+            paths = asyncPaths.Value = [Path];
         }
         else
         {
-            paths.Value!.Add(Path);
+            paths.Add(Path);
         }
     }
 
@@ -162,7 +166,7 @@ public void Dispose()
             File.Delete(Path);
         }
 
-        paths.Value!.Remove(Path);
+        paths.Remove(Path);
     }
 
     /// <summary>

src/VerifyCore.slnf

@@ -1,13 +1,14 @@
-{
+{
   "solution": {
     "path": "Verify.slnx",
     "projects": [
+      "DisableScrubbersTests\\DisableScrubbersTests.csproj",
+      "RawTempUsage\\RawTempUsage.csproj",
       "TargetLibrary\\TargetLibrary.csproj",
       "Verify.NUnit\\Verify.NUnit.csproj",
       "Verify.SamplePlugin\\Verify.SamplePlugin.csproj",
       "Verify.Tests\\Verify.Tests.csproj",
       "Verify.XunitV3\\Verify.XunitV3.csproj",
-      "DisableScrubbersTests\\DisableScrubbersTests.csproj",
       "Verify\\Verify.csproj"
     ]
   }