Cleanup

Fody.sln.DotSettings

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=FE2F1D5B_002D5931_002D413B_002DB376_002DDD491BD63610/@EntryIndexedValue">ExplicitlyExcluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">ERROR</s:String>

Fody/AssemblyPathValidator.cs

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

Fody/BuildLogger.cs

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

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");
@@ -77,7 +70,7 @@ public static WeaverConfigFile GenerateDefault(string projectDirectory, List<Wea
         var weaverConfig = new XDocument(root);
 
         var elements = weaverEntries
-            .Select(entry => new XElement(entry.ElementName))
+            .Select(_ => new XElement(_.ElementName))
             .ToArray();
 
         root.Add(elements);
@@ -105,7 +98,7 @@ static void CreateSchemaForConfig(string projectConfigFilePath, IEnumerable<Weav
     {
         var schema = XDocument.Parse(Fody.Properties.Resources.FodyWeavers_SchemaTemplate);
 
-        var baseNode = schema.Descendants().First(item => item.Name == schemaNamespace.GetName("all"));
+        var baseNode = schema.Descendants().First(_ => _.Name == schemaNamespace.GetName("all"));
 
         var fragments = weavers.Select(CreateItemFragment);
 
@@ -182,9 +175,9 @@ public static void EnsureSchemaIsUpToDate(string projectDirectory, IEnumerable<W
             }
 
             var hasNamespace = doc.Root.Attributes()
-                .Any(attr => !attr.IsNamespaceDeclaration &&
-                             attr.Name.LocalName == "noNamespaceSchemaLocation" &&
-                             string.Equals(attr.Value, "FodyWeavers.xsd", StringComparison.OrdinalIgnoreCase));
+                .Any(_ => !_.IsNamespaceDeclaration &&
+                          _.Name.LocalName == "noNamespaceSchemaLocation" &&
+                          string.Equals(_.Value, "FodyWeavers.xsd", StringComparison.OrdinalIgnoreCase));
 
             if (!hasNamespace)
             {

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,12 +1,8 @@
-using System;
-using System.Linq;
-using System.Reflection;
-
 public static class DomainAssemblyResolver
 {
     public static void Connect() =>
         AppDomain.CurrentDomain.AssemblyResolve += (_, args) => GetAssembly(args.Name);
 
     public static Assembly? GetAssembly(string name) =>
-        AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x => string.Equals(x.FullName, name, StringComparison.OrdinalIgnoreCase));
+        AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(_ => string.Equals(_.FullName, name, StringComparison.OrdinalIgnoreCase));
 }

Fody/ExceptionExtensions.cs

@@ -1,11 +1,9 @@
-using System;
-
 public static class ExceptionExtensions
 {
     public static void LogException(this ILogger logger, Exception exception)
     {
-        var exceptionType = exception.GetType();
-        if (exceptionType.Name == "WeavingException")
+        var type = exception.GetType();
+        if (type.Name == "WeavingException")
         {
             logger.LogError(exception.Message);
         }

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)
@@ -9,6 +6,7 @@ internal static List<string> GetConstants(this string? input)
         {
             return new();
         }
+
         return input.Split(';').ToList();
     }
-}
+}

Fody/GlobalUsings.cs

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

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!;
@@ -81,7 +76,8 @@ void Inner()
         ConfigEntries = ConfigFileFinder.ParseWeaverConfigEntries(ConfigFiles);
 
         var extraEntries = ConfigEntries.Values
-            .Where(entry => !entry.ConfigFile.AllowExtraEntries && !Weavers.Any(weaver => string.Equals(weaver.ElementName, entry.ElementName)))
+            .Where(entry => !entry.ConfigFile.AllowExtraEntries &&
+                            Weavers.All(weaver => weaver.ElementName != entry.ElementName))
             .ToArray();
 
         const string missingWeaversHelp = "Add the desired weavers via their nuget package.";
@@ -113,8 +109,8 @@ void Inner()
         ConfigFileFinder.EnsureSchemaIsUpToDate(ProjectDirectory, Weavers, GenerateXsd);
 
         Weavers = Weavers
-            .Where(weaver => weaver.Element != null)
-            .OrderBy(weaver => weaver.ExecutionOrder)
+            .Where(_ => _.Element != null)
+            .OrderBy(_ => _.ExecutionOrder)
             .ToList();
 
         lock (mutex)

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,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
@@ -38,11 +34,11 @@ void InnerExecute()
         var referenceCopyLocalPaths = new HashSet<string>(CopyLocalFiles.Select(_ => _.ItemSpec), StringComparer.OrdinalIgnoreCase);
 
         var existingReferenceCopyLocalFiles = CopyLocalFiles
-            .Where(item => updatedReferenceCopyLocalPaths.Contains(item.ItemSpec));
+            .Where(_ => updatedReferenceCopyLocalPaths.Contains(_.ItemSpec));
 
         var newReferenceCopyLocalFiles = updatedReferenceCopyLocalPaths
-            .Where(item => !referenceCopyLocalPaths.Contains(item))
-            .Select(item => new TaskItem(item));
+            .Where(_ => !referenceCopyLocalPaths.Contains(_))
+            .Select(_ => new TaskItem(_));
 
         UpdatedCopyLocalFiles = existingReferenceCopyLocalFiles.Concat(newReferenceCopyLocalFiles).ToArray();
     }

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!;
@@ -94,6 +87,7 @@ public static bool ExtractVerifyAssemblyFromConfigs(IEnumerable<WeaverConfigFile
                 return value;
             }
         }
+
         return false;
     }
 
@@ -103,12 +97,16 @@ public static IEnumerable<string> ExtractVerifyIgnoreCodesConfigs(IEnumerable<We
         {
             var configXml = configFile.Document;
             var element = configXml.Root;
-            var codesConfigs = (string)element.Attribute("VerifyIgnoreCodes");
+            var codesConfigs = (string) element.Attribute("VerifyIgnoreCodes");
             if (string.IsNullOrWhiteSpace(codesConfigs))
             {
                 continue;
             }
-            foreach (var value in codesConfigs.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries))
+
+            foreach (var value in codesConfigs.Split(new[]
+                     {
+                         ','
+                     }, StringSplitOptions.RemoveEmptyEntries))
             {
                 yield return value;
             }

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 @@
-using System;
-
-class WeavingException : Exception
-{
-    public WeavingException(string message)
-        : base(message)
-    {
-    }
-}
+class WeavingException(string message) : Exception(message);

Fody/WeavingTask.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
@@ -141,11 +137,11 @@ public List<WeaverEntry> GetWeaversFromProps()
 
         return WeaverFiles
             .Select(
-                taskItem => new
+                _ => new
                 {
-                    taskItem.ItemSpec,
-                    ClassNames = GetConfiguredClassNames(taskItem),
-                    PackageReference = GetPackageReference(taskItem)
+                    _.ItemSpec,
+                    ClassNames = GetConfiguredClassNames(_),
+                    PackageReference = GetPackageReference(_)
                 })
             .SelectMany(entry => entry.ClassNames.Select(
                 className =>
@@ -163,14 +159,14 @@ public List<WeaverEntry> GetWeaversFromProps()
     static IEnumerable<string> GetConfiguredClassNames(ITaskItem taskItem) =>
         taskItem.GetMetadata("WeaverClassNames")
             .Split(';')
-            .Select(name => name.Trim())
-            .Where(name => !string.IsNullOrEmpty(name))
+            .Select(_ => _.Trim())
+            .Where(_ => !string.IsNullOrEmpty(_))
             .DefaultIfEmpty();
 
     ITaskItem? GetPackageReference(ITaskItem weaverFileItem)
     {
         var packageName = Path.GetFileNameWithoutExtension(weaverFileItem.ItemSpec);
-        return PackageReferences?.FirstOrDefault(p => string.Equals(p.ItemSpec, packageName, StringComparison.OrdinalIgnoreCase));
+        return PackageReferences?.FirstOrDefault(_ => string.Equals(_.ItemSpec, packageName, StringComparison.OrdinalIgnoreCase));
     }
 
     public void Cancel() =>

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)
@@ -20,8 +15,8 @@ public static void StripNamespace(this XDocument document)
 
     static IEnumerable<XAttribute> GetAttributes(XElement xElement) =>
         xElement.Attributes()
-            .Where(x => !x.IsNamespaceDeclaration)
-            .Select(x => new XAttribute(x.Name.LocalName, x.Value));
+            .Where(_ => !_.IsNamespaceDeclaration)
+            .Select(_ => new XAttribute(_.Name.LocalName, _.Value));
 
     public static bool TryReadBool(this XElement config, string nodeName, out bool value)
     {

FodyCommon/AssemblyLocation.cs

@@ -1,5 +1,3 @@
-using System.IO;
-
 public static class AssemblyLocation
 {
     static AssemblyLocation()