cleanup

Fody/AssemblyPathValidator.cs

@@ -1,5 +1,3 @@
-using System.IO;
-
 public partial class Processor
 {
     public virtual void ValidateAssemblyPath()

Fody/BuildLogger.cs

@@ -1,7 +1,3 @@
-using System;
-using Fody;
-using Microsoft.Build.Framework;
-
 public class BuildLogger :
     MarshalByRefObject,
     ILogger

Fody/ConfigFileFinder/ConfigFileFinder.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-
-public static class ConfigFileFinder
+public static class ConfigFileFinder
 {
     const string FodyWeaversConfigFileName = "FodyWeavers.xml";
     static readonly XNamespace schemaNamespace = XNamespace.Get("http://www.w3.org/2001/XMLSchema");

Fody/ConfigFileFinder/WeaverConfigFile.cs

@@ -1,6 +1,4 @@
-using System.Xml.Linq;
-
-public class WeaverConfigFile
+public class WeaverConfigFile
 {
     public readonly bool AllowExtraEntries;
     public readonly string? FilePath;

Fody/DomainAssemblyResolver.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Linq;
-using System.Reflection;
-
 public static class DomainAssemblyResolver
 {
     public static void Connect() =>

Fody/ExceptionExtensions.cs

@@ -1,5 +1,3 @@
-using System;
-
 public static class ExceptionExtensions
 {
     public static void LogException(this ILogger logger, Exception exception)

Fody/ExtractConstants.cs

@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-
 static class ExtractConstants
 {
     internal static List<string> GetConstants(this string? input)

Fody/GlobalUsings.cs

@@ -0,0 +1,15 @@
+// Global using directives
+
+global using System;
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Reflection;
+global using System.Text.RegularExpressions;
+global using System.Collections.Generic;
+global using System.IO;
+global using System.Linq;
+global using System.Xml;
+global using System.Xml.Linq;
+global using Fody;
+global using Microsoft.Build.Framework;
+global using Microsoft.Build.Utilities;

Fody/Processor.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
 public partial class Processor
 {
     public string AssemblyFilePath = null!;

Fody/ProjectPathFinder.cs

@@ -1,5 +1,3 @@
-using System.IO;
-
 public partial class Processor
 {
     public virtual void ValidateProjectPath()

Fody/SolutionDirectoryFinder.cs

@@ -1,5 +1,3 @@
-using System.IO;
-
 public class SolutionDirectoryFinder
 {
     public static string Find(string? solutionDir, string? nCrunchOriginalSolutionDir, string projectDirectory)

Fody/SolutionPathValidator.cs

@@ -1,5 +1,3 @@
-using System.IO;
-
 public partial class Processor
 {
     public virtual void ValidateSolutionPath()

Fody/UpdateReferenceCopyLocalTask.cs

@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
 namespace Fody;
 
 public class UpdateCopyLocalTask : Task

Fody/Verify/Verifier.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using Fody;
-
-public class Verifier
+public class Verifier
 {
     public ILogger Logger = null!;
     public string SolutionDirectory = null!;

Fody/Verify/VerifyTask.cs

@@ -1,6 +1,3 @@
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
 namespace Fody;
 
 public class VerifyTask :

Fody/WeaversHistory.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
 public static class WeaversHistory
 {
     public static Dictionary<string, DateTime> TimeStamps = new(StringComparer.OrdinalIgnoreCase);

Fody/WeavingException.cs

@@ -1,9 +1,2 @@
-using System;
-
-class WeavingException : Exception
-{
-    public WeavingException(string message)
-        : base(message)
-    {
-    }
-}
+class WeavingException(string message) :
+    Exception(message);

Fody/WeavingTask.cs

@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
 namespace Fody;
 
 public class WeavingTask :

Fody/XmlExtensions.cs

@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-
 public static class XmlExtensions
 {
     public static void StripNamespace(this XDocument document)

FodyHelpers/BaseModuleWeaver.cs

@@ -1,10 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Xml.Linq;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-
-namespace Fody;
+namespace Fody;
 
 /// <summary>
 /// Base class for module weavers.

FodyHelpers/CecilExtensions.cs

@@ -1,7 +1,3 @@
-using System.Linq;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-
 namespace Fody;
 
 public static class CecilExtensions

FodyHelpers/ConfigReader.cs

@@ -1,6 +1,4 @@
 using System.Xml;
-using System.Xml.Linq;
-using Fody;
 
 static class ConfigReader
 {

FodyHelpers/GlobalUsings.cs

@@ -1,4 +1,16 @@
 // Global using directives
 
 global using System;
-global using System.CodeDom.Compiler;
+global using System.Diagnostics;
+global using System.IO;
+global using System.CodeDom.Compiler;
+global using System.Collections.Generic;
+global using System.Linq;
+global using Fody;
+global using Mono.Cecil;
+global using Mono.Cecil.Cil;
+global using System.Text.RegularExpressions;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Reflection;
+global using System.Text;
+global using System.Xml.Linq;

FodyHelpers/Guard.cs

@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-
 namespace Fody;
 
 [Obsolete("Not for public use")]

FodyHelpers/MessageImportance.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Fody;
+namespace Fody;
 
 /// <summary>
 /// Abstraction for the MSBuild MessageImportance.

FodyHelpers/ReferenceCleaner.cs

@@ -1,9 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Fody;
-using Mono.Cecil;
-
 static class ReferenceCleaner
 {
     public static void CleanReferences(ModuleDefinition module, BaseModuleWeaver weaver, List<string> referenceCopyLocalPaths, List<string> runtimeCopyLocalPaths, Action<string> log)

FodyHelpers/StringExtensions.cs

@@ -1,5 +1,3 @@
-using System.Text;
-
 static class StringExtensions
 {
     public static string ReplaceCaseless(this string str, string oldValue, string newValue)

FodyHelpers/Testing/Ildasm.cs

@@ -1,6 +1,3 @@
-using System.Diagnostics;
-using System.Text;
-
 namespace Fody;
 
 /// <summary>

FodyHelpers/Testing/PeVerifier.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace Fody;
+namespace Fody;
 
 /// <summary>
 /// Verifies assemblies using peverify.exe.

FodyHelpers/Testing/SdkToolFinder.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-
-static class SdkToolFinder
+static class SdkToolFinder
 {
     static string windowsSdkDirectory;
 

FodyHelpers/Testing/SequencePointMessage.cs

@@ -1,5 +1,3 @@
-using Mono.Cecil.Cil;
-
 namespace Fody;
 
 /// <summary>

FodyHelpers/Testing/SymbolReaderProvider.cs

@@ -1,13 +1,6 @@
-using System.IO;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-
-class SymbolReaderProvider : ISymbolReaderProvider
+class SymbolReaderProvider : ISymbolReaderProvider
 {
-    DefaultSymbolReaderProvider inner;
-
-    public SymbolReaderProvider() =>
-        inner = new(false);
+    DefaultSymbolReaderProvider inner = new(false);
 
     public ISymbolReader? GetSymbolReader(ModuleDefinition module, string fileName)
     {

FodyHelpers/Testing/TestAssemblyResolver.cs

@@ -1,9 +1,3 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Reflection;
-using Mono.Cecil;
-
 namespace Fody;
 
 /// <summary>

FodyHelpers/Testing/TestResult.cs

@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Reflection;
-using Mono.Cecil.Cil;
-
 namespace Fody;
 
 /// <summary>

FodyHelpers/Testing/WeaverTestHelper.cs

@@ -1,10 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-
 namespace Fody;
 
 /// <summary>

FodyHelpers/TryFindTypeFunc.cs

@@ -1,6 +1,4 @@
-using Mono.Cecil;
-
-namespace Fody;
+namespace Fody;
 
 [Obsolete("No longer required as BaseModuleWeaver.TryFindType has been replace with BaseModuleWeaver.TryFindTypeDefinition", false)]
 public delegate bool TryFindTypeFunc(string typeName, out TypeDefinition? type);

FodyHelpers/TypeCache.cs

@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Mono.Cecil;
-
 namespace Fody;
 
 /// <summary>

FodyHelpers/TypeSystem.cs

@@ -1,6 +1,4 @@
-using Mono.Cecil;
-
-namespace Fody;
+namespace Fody;
 
 /// <summary>
 /// Replacement for <see cref="ModuleDefinition.TypeSystem"/>.

FodyHelpers/WeavingException.cs

@@ -1,5 +1,3 @@
-using Mono.Cecil.Cil;
-
 namespace Fody;
 
 public class WeavingException :

FodyIsolated/AssemblyExtensions.cs

@@ -1,6 +1,4 @@
-using System.Reflection;
-
-static class AssemblyExtensions
+static class AssemblyExtensions
 {
     public static string GetVersion(this Assembly assembly)
     {

FodyIsolated/AssemblyLoader.cs

@@ -1,5 +1,3 @@
-using System.Reflection;
-
 public partial class InnerWeaver
 {
     static Dictionary<string, Assembly> assemblies = new(StringComparer.OrdinalIgnoreCase);

FodyIsolated/DelegateBuilder.cs

@@ -1,5 +1,4 @@
 using System.Linq.Expressions;
-using System.Reflection;
 
 public static class DelegateBuilder
 {

FodyIsolated/ExceptionExtensions.cs

@@ -1,4 +1,3 @@
-using System.Reflection;
 using System.Text;
 
 public static class ExceptionExtensions

FodyIsolated/FodyVersion.cs

@@ -1,5 +1,3 @@
-using System.Reflection;
-
 public static class FodyVersion
 {
     public static readonly Version Version = typeof(FodyVersion).Assembly.GetName().Version;