Refactor RemoveReferencesFromCsProj by simplifying package removal logic and removing support for global usings. Adjust execution strategies accordingly.

Author: gogo4ds

Services/Common/OJS.Workers/OJS.Workers.ExecutionStrategies/CSharp/DotNetCore/DotNetCoreProjectTestsExecutionStrategy.cs

@@ -19,7 +19,7 @@ public class DotNetCoreProjectTestsExecutionStrategy<TSettings> : CSharpProjectT
         protected new const string AdditionalExecutionArguments = "--noresult";
         protected const string CsProjFileExtension = ".csproj";
 
-        protected IEnumerable<string> PackageNamesToRemoveFromUserCsProjFile =>
+        protected string[] PackageNamesToRemoveFromUserCsProjFile =>
         [
             "NUnit",
             "NUnitLite",

Services/Common/OJS.Workers/OJS.Workers.ExecutionStrategies/CSharp/DotNetCore/DotNetCoreUnitTestsExecutionStrategy.cs

@@ -57,8 +57,7 @@ protected override async Task<IExecutionResult<TestResult>> ExecuteAgainstTestsI
         DotNetCoreStrategiesHelper.RemoveReferencesFromCsProj(
             userCsProjPath,
             this.PackageNamesToRemoveFromUserCsProjFile,
-            removeProjectReferences: true,
-            removeGlobalUsings: true);
+            removeProjectReferences: true);
 
         var (csProjTemplate, csProjPath) = this.CreateNUnitLiteConsoleApp([userCsProjPath]);
 

Services/Common/OJS.Workers/OJS.Workers.ExecutionStrategies/Helpers/DotNetCoreStrategiesHelper.cs

@@ -1,6 +1,5 @@
 namespace OJS.Workers.ExecutionStrategies.Helpers
 {
-    using System.Collections.Generic;
     using System.Linq;
     using System.Xml.Linq;
 
@@ -13,59 +12,42 @@ internal static class DotNetCoreStrategiesHelper
         /// <param name="csProjPath">Path to .csproj file.</param>
         /// <param name="packageNames">The names of the packages that should be removed (case-insensitive).</param>
         /// <param name="removeProjectReferences">Whether to remove "<ProjectReference />" items as well.</param>
-        /// <param name="removeGlobalUsings">Whether to remove "<Using />" items as well.</param>
-        public static void RemoveReferencesFromCsProj(string csProjPath, IEnumerable<string> packageNames, bool removeProjectReferences = false, bool removeGlobalUsings = false)
+        public static void RemoveReferencesFromCsProj(string csProjPath, string[] packageNames, bool removeProjectReferences = false)
         {
-            var packageNamesToLower = new HashSet<string>(
-                packageNames.Select(p => p.ToLowerInvariant()));
-
             var csProjDoc = XDocument.Load(csProjPath);
 
             var ns = csProjDoc.Root?.Name.Namespace ?? XNamespace.None;
 
             var toRemove = csProjDoc
                 .Descendants(ns + "PackageReference")
-                .Where(pr =>
-                {
-                    var include = pr.Attribute("Include")?.Value;
-                    return include != null && packageNamesToLower.Contains(include.ToLowerInvariant());
-                })
+                .Where(ShouldRemoveInclude)
                 .ToList();
 
             toRemove.AddRange(csProjDoc
                 .Descendants(ns + "Using")
-                .Where(u =>
-                {
-                    var value = u.Attribute("Include")?.Value;
-                    return value != null &&
-                           packageNamesToLower.Any(pn =>
-                               value.Equals(pn, StringComparison.OrdinalIgnoreCase) ||
-                               value.StartsWith($"{pn}.", StringComparison.InvariantCultureIgnoreCase) ||
-                               value.StartsWith($"{pn}:", StringComparison.InvariantCultureIgnoreCase));
-                }));
+                .Where(ShouldRemoveInclude));
 
             if (removeProjectReferences)
             {
                 toRemove.AddRange(csProjDoc.Descendants(ns + "ProjectReference"));
             }
 
-            if (removeGlobalUsings)
-            {
-                toRemove.AddRange(csProjDoc.Descendants(ns + "Using")
-                    .Where(u =>
-                    {
-                        var value = u.Attribute("Include")?.Value;
-                        return value != null &&
-                               packageNamesToLower.Any(pn =>
-                                   value == pn ||
-                                   value.StartsWith($"{pn}.", StringComparison.InvariantCultureIgnoreCase) ||
-                                   value.StartsWith($"{pn}:", StringComparison.InvariantCultureIgnoreCase));
-                    }));
-            }
-
             toRemove.ForEach(x => x.Remove());
 
             csProjDoc.Save(csProjPath);
+
+            return;
+
+            bool ShouldRemoveInclude(XElement element)
+            {
+                var include = element.Attribute("Include")?.Value;
+                return
+                    include != null &&
+                    packageNames.Any(pn =>
+                       include.Equals(pn, StringComparison.OrdinalIgnoreCase) ||
+                       include.StartsWith($"{pn}.", StringComparison.InvariantCultureIgnoreCase) ||
+                       include.StartsWith($"{pn}:", StringComparison.InvariantCultureIgnoreCase));
+            }
         }
     }
 }