diff --git a/docs/ApprovalTests/Reporters.md b/docs/ApprovalTests/Reporters.md
index 5afa78c1..4fa62da2 100644
--- a/docs/ApprovalTests/Reporters.md
+++ b/docs/ApprovalTests/Reporters.md
@@ -42,6 +42,9 @@ Extend `IApprovalFailureReporter`. For example a file can be launched on failure
```cs
+using System.Diagnostics;
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
public class FileLauncherReporter : IApprovalFailureReporter
@@ -55,7 +58,7 @@ public class FileLauncherReporter : IApprovalFailureReporter
}
}
```
-snippet source | anchor
+snippet source | anchor
@@ -98,7 +101,7 @@ MyGetReporter.INSTANCE,
GoContinuousDeliveryReporter.INSTANCE,
AppVeyorReporter.INSTANCE
```
-snippet source | anchor
+snippet source | anchor
You can add to this by configuring the FrontLoadedReporter Annotation.
diff --git a/docs/ApprovalTests/explanations/MainConcepts.md b/docs/ApprovalTests/explanations/MainConcepts.md
index dc9039ed..9e97b4db 100644
--- a/docs/ApprovalTests/explanations/MainConcepts.md
+++ b/docs/ApprovalTests/explanations/MainConcepts.md
@@ -121,7 +121,7 @@ Eventually, all Verify methods call:
```cs
public static void Verify(IApprovalWriter writer, IApprovalNamer namer, IApprovalFailureReporter reporter)
```
-snippet source | anchor
+snippet source | anchor
Most of the time this is hidden in an underlying a Verify call.
@@ -143,7 +143,7 @@ If you simply wanted to format text this is usually done in a separate step befo
```cs
public static void VerifyWithExtension(string text, string fileExtensionWithDot, Func scrubber = null)
```
-snippet source | anchor
+snippet source | anchor
diff --git a/docs/ApprovalUtilities/readme.md b/docs/ApprovalUtilities/readme.md
index 4c7e85d8..8318245b 100644
--- a/docs/ApprovalUtilities/readme.md
+++ b/docs/ApprovalUtilities/readme.md
@@ -17,7 +17,7 @@ Guards are convenient functions if incorrect values are passed in.
```cs
Guard.AgainstNullAndEmpty(subdirectory, nameof(subdirectory));
```
-snippet source | anchor
+snippet source | anchor
diff --git a/src/ApprovalTests/AlwaysWorksReporter.cs b/src/ApprovalTests/AlwaysWorksReporter.cs
index 46ac385e..a731fb64 100644
--- a/src/ApprovalTests/AlwaysWorksReporter.cs
+++ b/src/ApprovalTests/AlwaysWorksReporter.cs
@@ -1,6 +1,13 @@
-class AlwaysWorksReporter(IApprovalFailureReporter reporter) :
- IEnvironmentAwareReporter
+using ApprovalTests.Core;
+
+class AlwaysWorksReporter : IEnvironmentAwareReporter
{
+ readonly IApprovalFailureReporter reporter;
+
+ public AlwaysWorksReporter(IApprovalFailureReporter reporter) =>
+ this.reporter = reporter;
+
+
public void Report(string approved, string received) =>
reporter.Report(approved, received);
diff --git a/src/ApprovalTests/Approvals.cs b/src/ApprovalTests/Approvals.cs
index 2b8dd266..06b19f89 100644
--- a/src/ApprovalTests/Approvals.cs
+++ b/src/ApprovalTests/Approvals.cs
@@ -1,8 +1,15 @@
using ApprovalTests.Approvers;
+using ApprovalTests.Core;
using ApprovalTests.Html;
+using ApprovalTests.Namers;
+using ApprovalTests.Reporters;
+using ApprovalTests.Scrubber;
+using ApprovalTests.Utilities;
+using ApprovalTests.Writers;
using ApprovalTests.Xml;
using ApprovalUtilities.CallStack;
using ApprovalUtilities.Persistence;
+using ApprovalUtilities.Utilities;
namespace ApprovalTests;
diff --git a/src/ApprovalTests/Approvers/FileApprover.cs b/src/ApprovalTests/Approvers/FileApprover.cs
index 8766997d..61825295 100644
--- a/src/ApprovalTests/Approvers/FileApprover.cs
+++ b/src/ApprovalTests/Approvers/FileApprover.cs
@@ -1,3 +1,4 @@
+using ApprovalTests.Core;
using ApprovalTests.Core.Exceptions;
using EmptyFiles;
diff --git a/src/ApprovalTests/Combinations/CombinationApprovals.cs b/src/ApprovalTests/Combinations/CombinationApprovals.cs
index 533de93a..57c237c2 100644
--- a/src/ApprovalTests/Combinations/CombinationApprovals.cs
+++ b/src/ApprovalTests/Combinations/CombinationApprovals.cs
@@ -1,4 +1,5 @@
using System.Globalization;
+using System.Text;
namespace ApprovalTests.Combinations;
diff --git a/src/ApprovalTests/Email/EmailApprovals.cs b/src/ApprovalTests/Email/EmailApprovals.cs
index dc8428d1..2e4c0c74 100644
--- a/src/ApprovalTests/Email/EmailApprovals.cs
+++ b/src/ApprovalTests/Email/EmailApprovals.cs
@@ -1,4 +1,6 @@
using System.Net.Mail;
+using ApprovalTests.Scrubber;
+using ApprovalTests.Writers;
namespace ApprovalTests.Email;
diff --git a/src/ApprovalTests/Events/EventApprovals.cs b/src/ApprovalTests/Events/EventApprovals.cs
index b8c86c7f..f6148cb9 100644
--- a/src/ApprovalTests/Events/EventApprovals.cs
+++ b/src/ApprovalTests/Events/EventApprovals.cs
@@ -1,4 +1,5 @@
-using ApprovalUtilities.Reflection;
+using System.Text;
+using ApprovalUtilities.Reflection;
namespace ApprovalTests.Events;
diff --git a/src/ApprovalTests/ExceptionalExceptions/ExceptionalId.cs b/src/ApprovalTests/ExceptionalExceptions/ExceptionalId.cs
index e0eeee1a..1170a732 100644
--- a/src/ApprovalTests/ExceptionalExceptions/ExceptionalId.cs
+++ b/src/ApprovalTests/ExceptionalExceptions/ExceptionalId.cs
@@ -1,3 +1,5 @@
+using ApprovalUtilities.Utilities;
+
namespace ApprovalTests.ExceptionalExceptions;
public class ExceptionalId
diff --git a/src/ApprovalTests/GlobalUsings.cs b/src/ApprovalTests/GlobalUsings.cs
deleted file mode 100644
index 3fd7bb8f..00000000
--- a/src/ApprovalTests/GlobalUsings.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Global using directives
-
-global using System.Collections.Concurrent;
-global using System.Diagnostics;
-global using System.Text;
-global using System.Text.RegularExpressions;
-global using ApprovalTests.Core;
-global using ApprovalTests.Namers;
-global using ApprovalTests.Reporters;
-global using ApprovalTests.Reporters.ContinuousIntegration;
-global using ApprovalTests.Scrubber;
-global using ApprovalTests.StackTraceParsers;
-global using ApprovalTests.Utilities;
-global using ApprovalTests.Writers;
-global using ApprovalUtilities.Utilities;
-global using ApprovalUtilities.Xml;
-global using DiffEngine;
-global using Microsoft.Win32;
-global using TextCopy;
\ No newline at end of file
diff --git a/src/ApprovalTests/Maintenance/ApprovalMaintenance.cs b/src/ApprovalTests/Maintenance/ApprovalMaintenance.cs
index 30d9476a..e6e9f2fc 100644
--- a/src/ApprovalTests/Maintenance/ApprovalMaintenance.cs
+++ b/src/ApprovalTests/Maintenance/ApprovalMaintenance.cs
@@ -1,5 +1,6 @@
using System.Reflection;
using ApprovalUtilities.CallStack;
+using ApprovalUtilities.Utilities;
namespace ApprovalTests.Maintenance;
diff --git a/src/ApprovalTests/Namers/ApprovalResults.cs b/src/ApprovalTests/Namers/ApprovalResults.cs
index 6de904c5..76f9ea5b 100644
--- a/src/ApprovalTests/Namers/ApprovalResults.cs
+++ b/src/ApprovalTests/Namers/ApprovalResults.cs
@@ -1,3 +1,5 @@
+using ApprovalUtilities.Utilities;
+
namespace ApprovalTests.Namers;
public static class ApprovalResults
diff --git a/src/ApprovalTests/Namers/ApprovalsFilename.cs b/src/ApprovalTests/Namers/ApprovalsFilename.cs
index 22dfc0f0..4922573e 100644
--- a/src/ApprovalTests/Namers/ApprovalsFilename.cs
+++ b/src/ApprovalTests/Namers/ApprovalsFilename.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Namers;
+using ApprovalUtilities.Utilities;
+
+namespace ApprovalTests.Namers;
public class ApprovalsFilename
{
diff --git a/src/ApprovalTests/Namers/StackTraceParsers/AttributeStackTraceParser.cs b/src/ApprovalTests/Namers/StackTraceParsers/AttributeStackTraceParser.cs
index 056de282..0f58735a 100644
--- a/src/ApprovalTests/Namers/StackTraceParsers/AttributeStackTraceParser.cs
+++ b/src/ApprovalTests/Namers/StackTraceParsers/AttributeStackTraceParser.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
using ApprovalUtilities.CallStack;
namespace ApprovalTests.Namers.StackTraceParsers;
diff --git a/src/ApprovalTests/Namers/StackTraceParsers/IStackTraceParser.cs b/src/ApprovalTests/Namers/StackTraceParsers/IStackTraceParser.cs
index 9a3af21b..6a246af6 100644
--- a/src/ApprovalTests/Namers/StackTraceParsers/IStackTraceParser.cs
+++ b/src/ApprovalTests/Namers/StackTraceParsers/IStackTraceParser.cs
@@ -1,3 +1,5 @@
+using System.Diagnostics;
+
namespace ApprovalTests.Namers.StackTraceParsers;
public interface IStackTraceParser
diff --git a/src/ApprovalTests/Namers/StackTraceParsers/StackTraceParser.cs b/src/ApprovalTests/Namers/StackTraceParsers/StackTraceParser.cs
index 2aa3d837..65237a15 100644
--- a/src/ApprovalTests/Namers/StackTraceParsers/StackTraceParser.cs
+++ b/src/ApprovalTests/Namers/StackTraceParsers/StackTraceParser.cs
@@ -1,3 +1,6 @@
+using ApprovalTests.StackTraceParsers;
+using ApprovalUtilities.Utilities;
+using System.Diagnostics;
using ApprovalTests.Namers.UnitTestFrameworks;
namespace ApprovalTests.Namers.StackTraceParsers;
diff --git a/src/ApprovalTests/Namers/UnitTestFrameworkNamer.cs b/src/ApprovalTests/Namers/UnitTestFrameworkNamer.cs
index fdef1b8f..00b31e0d 100644
--- a/src/ApprovalTests/Namers/UnitTestFrameworkNamer.cs
+++ b/src/ApprovalTests/Namers/UnitTestFrameworkNamer.cs
@@ -1,3 +1,4 @@
+using ApprovalTests.Core;
using ApprovalTests.Namers.StackTraceParsers;
namespace ApprovalTests.Namers;
diff --git a/src/ApprovalTests/Namers/UnitTestFrameworks/MSpecStackTraceParser.cs b/src/ApprovalTests/Namers/UnitTestFrameworks/MSpecStackTraceParser.cs
index ac3eea1d..27e26900 100644
--- a/src/ApprovalTests/Namers/UnitTestFrameworks/MSpecStackTraceParser.cs
+++ b/src/ApprovalTests/Namers/UnitTestFrameworks/MSpecStackTraceParser.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
using System.Reflection;
using ApprovalTests.Namers.StackTraceParsers;
using ApprovalUtilities.CallStack;
diff --git a/src/ApprovalTests/Namers/UseApprovalSubdirectoryAttribute.cs b/src/ApprovalTests/Namers/UseApprovalSubdirectoryAttribute.cs
index 200da4fa..2efd521f 100644
--- a/src/ApprovalTests/Namers/UseApprovalSubdirectoryAttribute.cs
+++ b/src/ApprovalTests/Namers/UseApprovalSubdirectoryAttribute.cs
@@ -1,3 +1,5 @@
+using ApprovalUtilities.Utilities;
+
namespace ApprovalTests.Namers;
public class UseApprovalSubdirectoryAttribute : Attribute
diff --git a/src/ApprovalTests/Reporters/AllFailingTestsClipboardReporter.cs b/src/ApprovalTests/Reporters/AllFailingTestsClipboardReporter.cs
index d36514cb..b31609e2 100644
--- a/src/ApprovalTests/Reporters/AllFailingTestsClipboardReporter.cs
+++ b/src/ApprovalTests/Reporters/AllFailingTestsClipboardReporter.cs
@@ -1,4 +1,8 @@
-namespace ApprovalTests.Reporters;
+using System.Text;
+using ApprovalTests.Core;
+using TextCopy;
+
+namespace ApprovalTests.Reporters;
public class AllFailingTestsClipboardReporter : IApprovalFailureReporter
{
diff --git a/src/ApprovalTests/Reporters/ClipboardReporter.cs b/src/ApprovalTests/Reporters/ClipboardReporter.cs
index 29138f07..d2f1702c 100644
--- a/src/ApprovalTests/Reporters/ClipboardReporter.cs
+++ b/src/ApprovalTests/Reporters/ClipboardReporter.cs
@@ -1,3 +1,6 @@
+using ApprovalTests.Core;
+using TextCopy;
+
namespace ApprovalTests.Reporters;
public class ClipboardReporter : IApprovalFailureReporter
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/AppVeyorReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/AppVeyorReporter.cs
index b5c56814..c8c38d90 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/AppVeyorReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/AppVeyorReporter.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters.ContinuousIntegration;
public class AppVeyorReporter : IEnvironmentAwareReporter
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/BambooReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/BambooReporter.cs
index 56cd4182..1f48a866 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/BambooReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/BambooReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
public class BambooReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/GoContinuousDeliveryReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/GoContinuousDeliveryReporter.cs
index 7472ad5c..3aab7a69 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/GoContinuousDeliveryReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/GoContinuousDeliveryReporter.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters.ContinuousIntegration;
public class GoContinuousDeliveryReporter : IEnvironmentAwareReporter
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/JenkinsReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/JenkinsReporter.cs
index a670a2e2..00d24fa4 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/JenkinsReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/JenkinsReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
public class JenkinsReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/MyGetReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/MyGetReporter.cs
index 36b269d7..327eb4e8 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/MyGetReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/MyGetReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
public class MyGetReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/NCrunchReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/NCrunchReporter.cs
index e883d00e..84be3365 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/NCrunchReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/NCrunchReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
public class NCrunchReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/TeamCityReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/TeamCityReporter.cs
index a62353c4..342042d1 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/TeamCityReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/TeamCityReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
public class TeamCityReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/TfsReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/TfsReporter.cs
index 43c73f6f..a188a3c2 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/TfsReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/TfsReporter.cs
@@ -1,4 +1,7 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+using ApprovalTests.Utilities;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
public class TfsReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/ContinuousIntegration/TfsVnextReporter.cs b/src/ApprovalTests/Reporters/ContinuousIntegration/TfsVnextReporter.cs
index 2a1960c0..fceeaee0 100644
--- a/src/ApprovalTests/Reporters/ContinuousIntegration/TfsVnextReporter.cs
+++ b/src/ApprovalTests/Reporters/ContinuousIntegration/TfsVnextReporter.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters.ContinuousIntegration;
public class TfsVnextReporter : IEnvironmentAwareReporter
diff --git a/src/ApprovalTests/Reporters/DefaultFrontLoaderReporter.cs b/src/ApprovalTests/Reporters/DefaultFrontLoaderReporter.cs
index 6c61a320..8ec40b39 100644
--- a/src/ApprovalTests/Reporters/DefaultFrontLoaderReporter.cs
+++ b/src/ApprovalTests/Reporters/DefaultFrontLoaderReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using ApprovalTests.Reporters.ContinuousIntegration;
+
+namespace ApprovalTests.Reporters;
public class DefaultFrontLoaderReporter : FirstWorkingReporter
{
diff --git a/src/ApprovalTests/Reporters/DiffReporter.cs b/src/ApprovalTests/Reporters/DiffReporter.cs
index 4912716e..69df7147 100644
--- a/src/ApprovalTests/Reporters/DiffReporter.cs
+++ b/src/ApprovalTests/Reporters/DiffReporter.cs
@@ -1,4 +1,7 @@
-namespace ApprovalTests.Reporters;
+using ApprovalTests.Core;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class DiffReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/DiffToolReporter.cs b/src/ApprovalTests/Reporters/DiffToolReporter.cs
index 057fe31a..2fb4f799 100644
--- a/src/ApprovalTests/Reporters/DiffToolReporter.cs
+++ b/src/ApprovalTests/Reporters/DiffToolReporter.cs
@@ -1,3 +1,6 @@
+using ApprovalTests.Core;
+using DiffEngine;
+
namespace ApprovalTests.Reporters;
public class DiffToolReporter(DiffTool diffTool) : IEnvironmentAwareReporter
diff --git a/src/ApprovalTests/Reporters/ExecutableQueryFailure.cs b/src/ApprovalTests/Reporters/ExecutableQueryFailure.cs
index d66441af..e704bf5f 100644
--- a/src/ApprovalTests/Reporters/ExecutableQueryFailure.cs
+++ b/src/ApprovalTests/Reporters/ExecutableQueryFailure.cs
@@ -1,3 +1,4 @@
+using ApprovalTests.Core;
using ApprovalUtilities.Persistence;
namespace ApprovalTests.Reporters;
diff --git a/src/ApprovalTests/Reporters/FileLauncherReporter.cs b/src/ApprovalTests/Reporters/FileLauncherReporter.cs
index 7bc2f0e0..67b96fac 100644
--- a/src/ApprovalTests/Reporters/FileLauncherReporter.cs
+++ b/src/ApprovalTests/Reporters/FileLauncherReporter.cs
@@ -1,3 +1,6 @@
+using System.Diagnostics;
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
public class FileLauncherReporter : IApprovalFailureReporter
diff --git a/src/ApprovalTests/Reporters/FileLauncherWithDelayReporter.cs b/src/ApprovalTests/Reporters/FileLauncherWithDelayReporter.cs
index 1d63cc76..54d9236b 100644
--- a/src/ApprovalTests/Reporters/FileLauncherWithDelayReporter.cs
+++ b/src/ApprovalTests/Reporters/FileLauncherWithDelayReporter.cs
@@ -1,4 +1,7 @@
-public class FileLauncherWithDelayReporter(int seconds = 2) :
+using ApprovalTests.Core;
+using ApprovalTests.Reporters;
+
+public class FileLauncherWithDelayReporter(int seconds = 2) :
IApprovalFailureReporter
{
public static readonly FileLauncherWithDelayReporter INSTANCE = new();
diff --git a/src/ApprovalTests/Reporters/FirstWorkingReporter.cs b/src/ApprovalTests/Reporters/FirstWorkingReporter.cs
index 9cbcf145..28c4d4cb 100644
--- a/src/ApprovalTests/Reporters/FirstWorkingReporter.cs
+++ b/src/ApprovalTests/Reporters/FirstWorkingReporter.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
public class FirstWorkingReporter(IEnumerable reporters) :
diff --git a/src/ApprovalTests/Reporters/FrontLoadedReporterAttribute.cs b/src/ApprovalTests/Reporters/FrontLoadedReporterAttribute.cs
index af9aed29..6c56bbfd 100644
--- a/src/ApprovalTests/Reporters/FrontLoadedReporterAttribute.cs
+++ b/src/ApprovalTests/Reporters/FrontLoadedReporterAttribute.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
[AttributeUsage(AttributeTargets.Assembly)]
diff --git a/src/ApprovalTests/Reporters/FrontLoadedReporterDisposer.cs b/src/ApprovalTests/Reporters/FrontLoadedReporterDisposer.cs
index bf4e77d5..ddb54806 100644
--- a/src/ApprovalTests/Reporters/FrontLoadedReporterDisposer.cs
+++ b/src/ApprovalTests/Reporters/FrontLoadedReporterDisposer.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
public class FrontLoadedReporterDisposer : IDisposable
diff --git a/src/ApprovalTests/Reporters/InlineTextReporter.cs b/src/ApprovalTests/Reporters/InlineTextReporter.cs
index de31fea8..550b03f1 100644
--- a/src/ApprovalTests/Reporters/InlineTextReporter.cs
+++ b/src/ApprovalTests/Reporters/InlineTextReporter.cs
@@ -1,3 +1,7 @@
+using ApprovalTests.Core;
+using ApprovalUtilities.Utilities;
+using TextCopy;
+
namespace ApprovalTests.Reporters;
public class InlineTextReporter : IApprovalFailureReporter
diff --git a/src/ApprovalTests/Reporters/IntroductionReporter.cs b/src/ApprovalTests/Reporters/IntroductionReporter.cs
index eb09974e..707ea20a 100644
--- a/src/ApprovalTests/Reporters/IntroductionReporter.cs
+++ b/src/ApprovalTests/Reporters/IntroductionReporter.cs
@@ -1,4 +1,7 @@
-namespace ApprovalTests.Reporters;
+using System.Diagnostics;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters;
public class IntroductionReporter : IApprovalFailureReporter
{
diff --git a/src/ApprovalTests/Reporters/InvalidReporterConfiguration.cs b/src/ApprovalTests/Reporters/InvalidReporterConfiguration.cs
index a965c230..25c0ee4e 100644
--- a/src/ApprovalTests/Reporters/InvalidReporterConfiguration.cs
+++ b/src/ApprovalTests/Reporters/InvalidReporterConfiguration.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
public class InvalidReporterConfiguration(Type reporter) :
diff --git a/src/ApprovalTests/Reporters/MachineSpecificReporter.cs b/src/ApprovalTests/Reporters/MachineSpecificReporter.cs
index 2d6b9860..dc90f7d4 100644
--- a/src/ApprovalTests/Reporters/MachineSpecificReporter.cs
+++ b/src/ApprovalTests/Reporters/MachineSpecificReporter.cs
@@ -1,4 +1,8 @@
-namespace ApprovalTests.Reporters;
+using System.Text;
+using ApprovalTests.Core;
+using ApprovalTests.Namers;
+
+namespace ApprovalTests.Reporters;
public class MachineSpecificReporter : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/MultiReporter.cs b/src/ApprovalTests/Reporters/MultiReporter.cs
index 2b1e3574..8db1e253 100644
--- a/src/ApprovalTests/Reporters/MultiReporter.cs
+++ b/src/ApprovalTests/Reporters/MultiReporter.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
public class MultiReporter : IEnvironmentAwareReporter, IApprovalReporterWithCleanUp
diff --git a/src/ApprovalTests/Reporters/PowershellClipboardReporter.cs b/src/ApprovalTests/Reporters/PowershellClipboardReporter.cs
index 92631d7f..5a4d34ff 100644
--- a/src/ApprovalTests/Reporters/PowershellClipboardReporter.cs
+++ b/src/ApprovalTests/Reporters/PowershellClipboardReporter.cs
@@ -1,3 +1,6 @@
+using ApprovalTests.Core;
+using TextCopy;
+
namespace ApprovalTests.Reporters;
public class PowerShellClipboardReporter : IApprovalFailureReporter
diff --git a/src/ApprovalTests/Reporters/QuietReporter.cs b/src/ApprovalTests/Reporters/QuietReporter.cs
index 9d4f8e2d..700aa44b 100644
--- a/src/ApprovalTests/Reporters/QuietReporter.cs
+++ b/src/ApprovalTests/Reporters/QuietReporter.cs
@@ -1,4 +1,6 @@
+using System.Diagnostics;
using System.Runtime.InteropServices;
+using ApprovalTests.Core;
namespace ApprovalTests.Reporters;
diff --git a/src/ApprovalTests/Reporters/ReportWithoutFrontLoading.cs b/src/ApprovalTests/Reporters/ReportWithoutFrontLoading.cs
index ee8a4849..91d9e672 100644
--- a/src/ApprovalTests/Reporters/ReportWithoutFrontLoading.cs
+++ b/src/ApprovalTests/Reporters/ReportWithoutFrontLoading.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters;
public class ReportWithoutFrontLoading : IEnvironmentAwareReporter
{
diff --git a/src/ApprovalTests/Reporters/TestFrameworks/AssertReporter.cs b/src/ApprovalTests/Reporters/TestFrameworks/AssertReporter.cs
index 99d72afb..f3e9fe16 100644
--- a/src/ApprovalTests/Reporters/TestFrameworks/AssertReporter.cs
+++ b/src/ApprovalTests/Reporters/TestFrameworks/AssertReporter.cs
@@ -1,4 +1,5 @@
using System.Reflection;
+using ApprovalTests.Core;
using ApprovalTests.Namers.StackTraceParsers;
using EmptyFiles;
diff --git a/src/ApprovalTests/Reporters/TestFrameworks/MsTestReporter.cs b/src/ApprovalTests/Reporters/TestFrameworks/MsTestReporter.cs
index d1898a19..7e2e4980 100644
--- a/src/ApprovalTests/Reporters/TestFrameworks/MsTestReporter.cs
+++ b/src/ApprovalTests/Reporters/TestFrameworks/MsTestReporter.cs
@@ -1,4 +1,5 @@
using System.Reflection;
+using ApprovalTests.StackTraceParsers;
namespace ApprovalTests.Reporters.TestFrameworks;
diff --git a/src/ApprovalTests/Reporters/TestFrameworks/NUnitReporter.cs b/src/ApprovalTests/Reporters/TestFrameworks/NUnitReporter.cs
index 35806c3e..cfc4c81a 100644
--- a/src/ApprovalTests/Reporters/TestFrameworks/NUnitReporter.cs
+++ b/src/ApprovalTests/Reporters/TestFrameworks/NUnitReporter.cs
@@ -1,7 +1,13 @@
+using ApprovalTests.StackTraceParsers;
+
namespace ApprovalTests.Reporters.TestFrameworks;
-public class NUnitReporter() :
- AssertReporter("NUnit.Framework.Assert, nunit.framework", "AreEqual", NUnitStackTraceParser.Attribute)
+public class NUnitReporter : AssertReporter
{
public readonly static NUnitReporter INSTANCE = new();
+
+ public NUnitReporter()
+ : base("NUnit.Framework.Assert, nunit.framework", "AreEqual", NUnitStackTraceParser.Attribute)
+ {
+ }
}
\ No newline at end of file
diff --git a/src/ApprovalTests/Reporters/TestFrameworks/XUnit2Reporter.cs b/src/ApprovalTests/Reporters/TestFrameworks/XUnit2Reporter.cs
index 6c6713a9..d8dd80a6 100644
--- a/src/ApprovalTests/Reporters/TestFrameworks/XUnit2Reporter.cs
+++ b/src/ApprovalTests/Reporters/TestFrameworks/XUnit2Reporter.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.StackTraceParsers;
+
namespace ApprovalTests.Reporters.TestFrameworks;
public class XUnit2Reporter() :
diff --git a/src/ApprovalTests/Reporters/Tools/AraxisMergeReporter.cs b/src/ApprovalTests/Reporters/Tools/AraxisMergeReporter.cs
index 9ae08275..dfc3170e 100644
--- a/src/ApprovalTests/Reporters/Tools/AraxisMergeReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/AraxisMergeReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class AraxisMergeReporter() :
DiffToolReporter(DiffTool.AraxisMerge)
diff --git a/src/ApprovalTests/Reporters/Tools/BeyondCompareReporter.cs b/src/ApprovalTests/Reporters/Tools/BeyondCompareReporter.cs
index 126366f1..515a106c 100644
--- a/src/ApprovalTests/Reporters/Tools/BeyondCompareReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/BeyondCompareReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class BeyondCompareReporter() :
DiffToolReporter(DiffTool.BeyondCompare)
diff --git a/src/ApprovalTests/Reporters/Tools/KDiff3Reporter.cs b/src/ApprovalTests/Reporters/Tools/KDiff3Reporter.cs
index 39a8d4e0..202f49ed 100644
--- a/src/ApprovalTests/Reporters/Tools/KDiff3Reporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/KDiff3Reporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class KDiff3Reporter() :
DiffToolReporter(DiffTool.KDiff3)
diff --git a/src/ApprovalTests/Reporters/Tools/KaleidoscopeDiffReporter.cs b/src/ApprovalTests/Reporters/Tools/KaleidoscopeDiffReporter.cs
index 0d43d372..b4d05452 100644
--- a/src/ApprovalTests/Reporters/Tools/KaleidoscopeDiffReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/KaleidoscopeDiffReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class KaleidoscopeDiffReporter() :
DiffToolReporter(DiffTool.Kaleidoscope)
diff --git a/src/ApprovalTests/Reporters/Tools/MeldReporter.cs b/src/ApprovalTests/Reporters/Tools/MeldReporter.cs
index 6e6ba6ec..5f3140cf 100644
--- a/src/ApprovalTests/Reporters/Tools/MeldReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/MeldReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class MeldReporter() :
DiffToolReporter(DiffTool.Meld)
diff --git a/src/ApprovalTests/Reporters/Tools/P4MergeReporter.cs b/src/ApprovalTests/Reporters/Tools/P4MergeReporter.cs
index 24bda22e..afc2fbda 100644
--- a/src/ApprovalTests/Reporters/Tools/P4MergeReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/P4MergeReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class P4MergeReporter() :
DiffToolReporter(DiffTool.P4Merge)
diff --git a/src/ApprovalTests/Reporters/Tools/RiderReporter.cs b/src/ApprovalTests/Reporters/Tools/RiderReporter.cs
index fdd8a543..2ca62c63 100644
--- a/src/ApprovalTests/Reporters/Tools/RiderReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/RiderReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class RiderReporter() :
DiffToolReporter(DiffTool.Rider)
diff --git a/src/ApprovalTests/Reporters/Tools/TkDiffReporter.cs b/src/ApprovalTests/Reporters/Tools/TkDiffReporter.cs
index 26ddc4b2..fb8e7dc3 100644
--- a/src/ApprovalTests/Reporters/Tools/TkDiffReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/TkDiffReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class TkDiffReporter() :
DiffToolReporter(DiffTool.TkDiff)
diff --git a/src/ApprovalTests/Reporters/Tools/TortoiseGitTextDiffReporter.cs b/src/ApprovalTests/Reporters/Tools/TortoiseGitTextDiffReporter.cs
index 6bf88f92..264ba362 100644
--- a/src/ApprovalTests/Reporters/Tools/TortoiseGitTextDiffReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/TortoiseGitTextDiffReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class TortoiseGitTextDiffReporter() :
DiffToolReporter(DiffTool.TortoiseGitMerge)
diff --git a/src/ApprovalTests/Reporters/Tools/TortoiseImageDiffReporter.cs b/src/ApprovalTests/Reporters/Tools/TortoiseImageDiffReporter.cs
index 3cdb8490..5eda46c7 100644
--- a/src/ApprovalTests/Reporters/Tools/TortoiseImageDiffReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/TortoiseImageDiffReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class TortoiseImageDiffReporter() :
DiffToolReporter(DiffTool.TortoiseIDiff)
diff --git a/src/ApprovalTests/Reporters/Tools/TortoiseTextDiffReporter.cs b/src/ApprovalTests/Reporters/Tools/TortoiseTextDiffReporter.cs
index 95c1d626..51800ca2 100644
--- a/src/ApprovalTests/Reporters/Tools/TortoiseTextDiffReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/TortoiseTextDiffReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class TortoiseTextDiffReporter() :
DiffToolReporter(DiffTool.TortoiseMerge)
diff --git a/src/ApprovalTests/Reporters/Tools/VisualStudioReporter.cs b/src/ApprovalTests/Reporters/Tools/VisualStudioReporter.cs
index 060dbbde..3406f2d6 100644
--- a/src/ApprovalTests/Reporters/Tools/VisualStudioReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/VisualStudioReporter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
public class VisualStudioReporter() :
DiffToolReporter(DiffTool.VisualStudio)
diff --git a/src/ApprovalTests/Reporters/Tools/WinMergeReporter.cs b/src/ApprovalTests/Reporters/Tools/WinMergeReporter.cs
index e181b1ff..1daba929 100644
--- a/src/ApprovalTests/Reporters/Tools/WinMergeReporter.cs
+++ b/src/ApprovalTests/Reporters/Tools/WinMergeReporter.cs
@@ -1,3 +1,5 @@
+using DiffEngine;
+
namespace ApprovalTests.Reporters;
public class WinMergeReporter() :
diff --git a/src/ApprovalTests/Reporters/UseReporterAttribute.cs b/src/ApprovalTests/Reporters/UseReporterAttribute.cs
index 9b72ab8a..8a9d4c9a 100644
--- a/src/ApprovalTests/Reporters/UseReporterAttribute.cs
+++ b/src/ApprovalTests/Reporters/UseReporterAttribute.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Reporters;
[AttributeUsage(AttributeTargets.All)]
diff --git a/src/ApprovalTests/Scrubber/HtmlScrubbers.cs b/src/ApprovalTests/Scrubber/HtmlScrubbers.cs
index 233c8856..bd524186 100644
--- a/src/ApprovalTests/Scrubber/HtmlScrubbers.cs
+++ b/src/ApprovalTests/Scrubber/HtmlScrubbers.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Scrubber;
+using System.Text.RegularExpressions;
+
+namespace ApprovalTests.Scrubber;
public static class HtmlScrubbers
{
diff --git a/src/ApprovalTests/Scrubber/PdfScrubber.cs b/src/ApprovalTests/Scrubber/PdfScrubber.cs
index b0102465..afdcf627 100644
--- a/src/ApprovalTests/Scrubber/PdfScrubber.cs
+++ b/src/ApprovalTests/Scrubber/PdfScrubber.cs
@@ -1,3 +1,8 @@
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace ApprovalTests.Scrubber;
+
static class PdfScrubber
{
public static void ScrubPdf(string pdfFilePath)
diff --git a/src/ApprovalTests/Scrubber/ScrubberUtils.cs b/src/ApprovalTests/Scrubber/ScrubberUtils.cs
index 78d1fa00..612738d7 100644
--- a/src/ApprovalTests/Scrubber/ScrubberUtils.cs
+++ b/src/ApprovalTests/Scrubber/ScrubberUtils.cs
@@ -1,3 +1,5 @@
+using ApprovalUtilities.Utilities;
+
namespace ApprovalTests.Scrubber;
public static class ScrubberUtils
diff --git a/src/ApprovalTests/TheoryTests/ThreadSafetyTheory.cs b/src/ApprovalTests/TheoryTests/ThreadSafetyTheory.cs
index df08812e..36316f04 100644
--- a/src/ApprovalTests/TheoryTests/ThreadSafetyTheory.cs
+++ b/src/ApprovalTests/TheoryTests/ThreadSafetyTheory.cs
@@ -1,4 +1,8 @@
-namespace ApprovalTests.TheoryTests;
+using System.Collections.Concurrent;
+using ApprovalTests.Utilities;
+using ApprovalUtilities.Utilities;
+
+namespace ApprovalTests.TheoryTests;
public static class ThreadSafetyTheory
{
diff --git a/src/ApprovalTests/Utilities/ParentProcessUtils.cs b/src/ApprovalTests/Utilities/ParentProcessUtils.cs
index e251f67c..c8d50259 100644
--- a/src/ApprovalTests/Utilities/ParentProcessUtils.cs
+++ b/src/ApprovalTests/Utilities/ParentProcessUtils.cs
@@ -1,4 +1,6 @@
-using System.Runtime.InteropServices;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using ApprovalUtilities.Utilities;
namespace ApprovalTests.Utilities;
diff --git a/src/ApprovalTests/Utilities/StackTraceScrubber.cs b/src/ApprovalTests/Utilities/StackTraceScrubber.cs
index f5ebea4b..503441d3 100644
--- a/src/ApprovalTests/Utilities/StackTraceScrubber.cs
+++ b/src/ApprovalTests/Utilities/StackTraceScrubber.cs
@@ -1,3 +1,6 @@
+using System.Text.RegularExpressions;
+using ApprovalTests.Scrubber;
+
namespace ApprovalTests.Utilities;
public static class StackTraceScrubber
diff --git a/src/ApprovalTests/Utilities/StringReporting.cs b/src/ApprovalTests/Utilities/StringReporting.cs
index e7eb6999..85e9e776 100644
--- a/src/ApprovalTests/Utilities/StringReporting.cs
+++ b/src/ApprovalTests/Utilities/StringReporting.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Utilities;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Utilities;
public static class StringReporting
{
diff --git a/src/ApprovalTests/Utilities/TestCounter.cs b/src/ApprovalTests/Utilities/TestCounter.cs
index 3d7aa360..c015ef84 100644
--- a/src/ApprovalTests/Utilities/TestCounter.cs
+++ b/src/ApprovalTests/Utilities/TestCounter.cs
@@ -1,4 +1,6 @@
using System.ComponentModel;
+using System.Diagnostics;
+using ApprovalUtilities.Utilities;
namespace ApprovalTests.Utilities;
diff --git a/src/ApprovalTests/WebApi/RestQuery.cs b/src/ApprovalTests/WebApi/MicrosoftHttpClient/RestQuery.cs
similarity index 95%
rename from src/ApprovalTests/WebApi/RestQuery.cs
rename to src/ApprovalTests/WebApi/MicrosoftHttpClient/RestQuery.cs
index 6a22b29f..0b63afa1 100644
--- a/src/ApprovalTests/WebApi/RestQuery.cs
+++ b/src/ApprovalTests/WebApi/MicrosoftHttpClient/RestQuery.cs
@@ -1,5 +1,7 @@
using System.Net;
+using System.Text;
using ApprovalUtilities.Persistence;
+using ApprovalUtilities.Utilities;
namespace ApprovalTests.WebApi.MicrosoftHttpClient;
diff --git a/src/ApprovalTests/WindowsRegistry/WindowsRegistryAssert.cs b/src/ApprovalTests/WindowsRegistry/WindowsRegistryAssert.cs
index f11e1007..94a41fb6 100644
--- a/src/ApprovalTests/WindowsRegistry/WindowsRegistryAssert.cs
+++ b/src/ApprovalTests/WindowsRegistry/WindowsRegistryAssert.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.WindowsRegistry;
+using Microsoft.Win32;
+
+namespace ApprovalTests.WindowsRegistry;
public static class WindowsRegistryAssert
{
diff --git a/src/ApprovalTests/Writers/ApprovalBinaryWriter.cs b/src/ApprovalTests/Writers/ApprovalBinaryWriter.cs
index ea6c27a6..d2819d0e 100644
--- a/src/ApprovalTests/Writers/ApprovalBinaryWriter.cs
+++ b/src/ApprovalTests/Writers/ApprovalBinaryWriter.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Writers;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Writers;
public class ApprovalBinaryWriter : IApprovalWriter
{
diff --git a/src/ApprovalTests/Writers/ApprovalTextWriter.cs b/src/ApprovalTests/Writers/ApprovalTextWriter.cs
index 6c8cbc19..35c72576 100644
--- a/src/ApprovalTests/Writers/ApprovalTextWriter.cs
+++ b/src/ApprovalTests/Writers/ApprovalTextWriter.cs
@@ -1,3 +1,6 @@
+using System.Text;
+using ApprovalTests.Core;
+
namespace ApprovalTests;
public class ApprovalTextWriter : IApprovalWriter
diff --git a/src/ApprovalTests/Writers/ExistingFileWriter.cs b/src/ApprovalTests/Writers/ExistingFileWriter.cs
index 00600889..0b46e326 100644
--- a/src/ApprovalTests/Writers/ExistingFileWriter.cs
+++ b/src/ApprovalTests/Writers/ExistingFileWriter.cs
@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
namespace ApprovalTests.Writers;
public class ExistingFileWriter : IApprovalWriter
diff --git a/src/ApprovalTests/Writers/WriterFactory.cs b/src/ApprovalTests/Writers/WriterFactory.cs
index 8d92091b..b0ac6147 100644
--- a/src/ApprovalTests/Writers/WriterFactory.cs
+++ b/src/ApprovalTests/Writers/WriterFactory.cs
@@ -1,4 +1,6 @@
-namespace ApprovalTests.Writers;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Writers;
public static class WriterFactory
{
diff --git a/src/ApprovalTests/Xml/XmlApprovals.cs b/src/ApprovalTests/Xml/XmlApprovals.cs
index 115fd642..5ca158af 100644
--- a/src/ApprovalTests/Xml/XmlApprovals.cs
+++ b/src/ApprovalTests/Xml/XmlApprovals.cs
@@ -1,4 +1,8 @@
-namespace ApprovalTests.Xml;
+using ApprovalTests.Scrubber;
+using ApprovalTests.Writers;
+using ApprovalUtilities.Xml;
+
+namespace ApprovalTests.Xml;
public static class XmlApprovals
{
diff --git a/src/ApprovalUtilities.Tests/ApprovalTestsConfig.cs b/src/ApprovalUtilities.Tests/ApprovalTestsConfig.cs
index 24fb3f57..ef7b709e 100644
--- a/src/ApprovalUtilities.Tests/ApprovalTestsConfig.cs
+++ b/src/ApprovalUtilities.Tests/ApprovalTestsConfig.cs
@@ -1 +1,3 @@
-[assembly: UseReporter(typeof(DiffReporter))]
+using ApprovalTests.Reporters;
+
+[assembly: UseReporter(typeof(DiffReporter))]
diff --git a/src/ApprovalUtilities.Tests/GlobalUsings.cs b/src/ApprovalUtilities.Tests/GlobalUsings.cs
index fab77e24..f2bf5a3c 100644
--- a/src/ApprovalUtilities.Tests/GlobalUsings.cs
+++ b/src/ApprovalUtilities.Tests/GlobalUsings.cs
@@ -1,13 +1,3 @@
-global using System.ComponentModel;
-global using System.Reflection;
-global using System.Runtime.CompilerServices;
-global using System.Windows.Forms;
-global using ApprovalTests;
-global using ApprovalTests.Namers.StackTraceParsers;
-global using ApprovalTests.Reporters;
-global using ApprovalTests.Utilities;
-global using ApprovalUtilities.Persistence;
-global using ApprovalUtilities.Reflection;
-global using ApprovalUtilities.SimpleLogger;
+global using ApprovalTests;
global using ApprovalUtilities.Utilities;
global using Xunit;
\ No newline at end of file
diff --git a/src/ApprovalUtilities.Tests/LoggerTest.cs b/src/ApprovalUtilities.Tests/LoggerTest.cs
index 184ee982..131b5a2a 100644
--- a/src/ApprovalUtilities.Tests/LoggerTest.cs
+++ b/src/ApprovalUtilities.Tests/LoggerTest.cs
@@ -1,4 +1,9 @@
-[UseReporter(typeof(DiffReporter))]
+using ApprovalTests.Reporters;
+using ApprovalTests.Utilities;
+using ApprovalUtilities.Persistence;
+using ApprovalUtilities.SimpleLogger;
+
+[UseReporter(typeof(DiffReporter))]
public class LoggerTest
{
[Fact]
diff --git a/src/ApprovalUtilities.Tests/ModuleInitializer.cs b/src/ApprovalUtilities.Tests/ModuleInitializer.cs
index 7755e4a9..f7c593f9 100644
--- a/src/ApprovalUtilities.Tests/ModuleInitializer.cs
+++ b/src/ApprovalUtilities.Tests/ModuleInitializer.cs
@@ -1,3 +1,6 @@
+using System.Runtime.CompilerServices;
+using ApprovalTests.Namers.StackTraceParsers;
+
public static class ModuleInitializer
{
[ModuleInitializer]
diff --git a/src/ApprovalUtilities.Tests/Reflection/HandlerListEntryTest.cs b/src/ApprovalUtilities.Tests/Reflection/HandlerListEntryTest.cs
index d4dbda78..3334b63c 100644
--- a/src/ApprovalUtilities.Tests/Reflection/HandlerListEntryTest.cs
+++ b/src/ApprovalUtilities.Tests/Reflection/HandlerListEntryTest.cs
@@ -1,3 +1,7 @@
+using System.ComponentModel;
+using System.Windows.Forms;
+using ApprovalUtilities.Reflection;
+
public class HandlerListEntryTest
{
[Fact]
diff --git a/src/ApprovalUtilities.Tests/Reflection/HandlerListUtilitiesTest.cs b/src/ApprovalUtilities.Tests/Reflection/HandlerListUtilitiesTest.cs
index ba4fba06..873aac00 100644
--- a/src/ApprovalUtilities.Tests/Reflection/HandlerListUtilitiesTest.cs
+++ b/src/ApprovalUtilities.Tests/Reflection/HandlerListUtilitiesTest.cs
@@ -1,3 +1,7 @@
+using System.ComponentModel;
+using System.Windows.Forms;
+using ApprovalUtilities.Reflection;
+
public class HandlerListUtilitiesTest
{
[Fact]
diff --git a/src/ApprovalUtilities.Tests/Reflection/ReflectionUtilitiesTest.cs b/src/ApprovalUtilities.Tests/Reflection/ReflectionUtilitiesTest.cs
index 23940eef..a32102d4 100644
--- a/src/ApprovalUtilities.Tests/Reflection/ReflectionUtilitiesTest.cs
+++ b/src/ApprovalUtilities.Tests/Reflection/ReflectionUtilitiesTest.cs
@@ -1,5 +1,10 @@
#pragma warning disable CS0169
+using System.Reflection;
+using System.Windows.Forms;
+using ApprovalUtilities.Reflection;
+using ApprovalTests.Reporters;
+
[UseReporter(typeof(DiffReporter))]
public class ReflectionUtilitiesTest
{
diff --git a/src/ApprovalUtilities.Tests/Reflection/TestingEventPoco.cs b/src/ApprovalUtilities.Tests/Reflection/TestingEventPoco.cs
index c375542e..30987fe7 100644
--- a/src/ApprovalUtilities.Tests/Reflection/TestingEventPoco.cs
+++ b/src/ApprovalUtilities.Tests/Reflection/TestingEventPoco.cs
@@ -1,3 +1,5 @@
+using System.ComponentModel;
+
public class TestingEventPoco
{
readonly object NonEventField = new();