VCI-772: Fix codesmells

VirtoCommerce · Feb 22, 2024 · a41421f · a41421f
1 parent a5a50f7
commit a41421f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/src/VirtoCommerce.Build/Build.cs b/src/VirtoCommerce.Build/Build.cs
@@ -234,12 +234,13 @@ public static Solution Solution
 
     protected static bool IsModule => ModuleManifestFile.FileExists();
 
+    private static readonly string[] cleanSearchPattern = new[] { "**/bin", "**/obj" };
+
     public Target Clean => _ => _
         .Before(Restore)
         .Executes(() =>
         {
-            var searchPattern = new[] { "**/bin", "**/obj" };
-            CleanSolution(searchPattern);
+            CleanSolution(cleanSearchPattern);
         });
 
     public Target Restore => _ => _

diff --git a/src/VirtoCommerce.Build/PlatformTools/Build.MatchVerisons.cs b/src/VirtoCommerce.Build/PlatformTools/Build.MatchVerisons.cs
@@ -13,7 +13,8 @@ namespace VirtoCommerce.Build
 {
     internal partial class Build
     {
-        private Regex _moduleNameRegEx = new Regex(@"(VirtoCommerce.+)Module", RegexOptions.Compiled);
+        [GeneratedRegex(@"(VirtoCommerce.+)Module", RegexOptions.Compiled)]
+        private static partial Regex ModuleNameRegEx();
 
         public Target MatchVersions => _ => _
              .Executes(() =>
@@ -38,7 +39,7 @@ internal partial class Build
                  var missedDependenciesErrors = ValidateForMissedDependencies(allPackages);
                  errors.AddRange(missedDependenciesErrors);
 
-                 if (errors.Any())
+                 if (errors.Count != 0)
                  {
                      Assert.Fail(errors.Join(Environment.NewLine));
                  }
@@ -54,7 +55,7 @@ private IEnumerable<PackageItem> GetProjectPackages(Project project)
             // find all VirtoCommerce references
             return msBuildProject.Items
                 .Where(x => x.ItemType == "PackageReference"
-                    && (x.EvaluatedInclude.StartsWith("VirtoCommerce.Platform.") || _moduleNameRegEx.IsMatch(x.EvaluatedInclude)))
+                    && (x.EvaluatedInclude.StartsWith("VirtoCommerce.Platform.") || ModuleNameRegEx().IsMatch(x.EvaluatedInclude)))
                 .Select(x =>
                 {
                     var versionMetadata = x.Metadata.FirstOrDefault(x => x.Name == "Version");
@@ -90,7 +91,7 @@ private IEnumerable<string> ValdatePlatformVersion(IEnumerable<PackageItem> pack
         /// <summary>
         /// Check dependencies for module packages versions mismatch
         /// </summary>
-        private IEnumerable<string> ValidateModuleDependenciesVersions(IEnumerable<PackageItem> packages)
+        private List<string> ValidateModuleDependenciesVersions(IEnumerable<PackageItem> packages)
         {
             var result = new List<string>();
 
@@ -117,7 +118,7 @@ private IEnumerable<string> ValidateModuleDependenciesVersions(IEnumerable<Packa
         /// <summary>
         /// Check project packages for missed dependency in manifest
         /// </summary>
-        private IEnumerable<string> ValidateForMissedDependencies(IEnumerable<PackageItem> packages)
+        private List<string> ValidateForMissedDependencies(IEnumerable<PackageItem> packages)
         {
             var result = new List<string>();
 
@@ -139,7 +140,7 @@ private IEnumerable<string> ValidateForMissedDependencies(IEnumerable<PackageIte
 
         private bool HasNameMatch(string packageName, string dependencyName)
         {
-            var match = _moduleNameRegEx.Match(packageName);
+            var match = ModuleNameRegEx().Match(packageName);
             return match.Groups.Values.Any(x => x.Value == dependencyName);
         }
     }

diff --git a/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs b/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs
@@ -84,7 +84,7 @@ internal partial class Build
                  {
                      UpdateModules(Module, externalModuleCatalog, modules);
                  }
-                 else if (!PlatformParameter && !modules.Any() && !File.Exists(Path.GetFullPath(PackageManifestPath)))
+                 else if (!PlatformParameter && modules.IsEmpty() && !File.Exists(Path.GetFullPath(PackageManifestPath)))
                  {
                      AddCommerceModules(externalModuleCatalog, modules);
                  }
@@ -162,7 +162,7 @@ private static IEnumerable<ModuleItem> ParseModuleParameter(string[] moduleStrin
                 if (parts.Length > 1)
                 {
                     moduleId = parts[0];
-                    moduleVersion = parts[parts.Count() - 1];
+                    moduleVersion = parts[parts.Length - 1];
                 }
                 else if (moduleStrings.Length == 1 && !string.IsNullOrEmpty(VersionToInstall))
                 {
@@ -209,7 +209,7 @@ private static bool PlatformVersionChanged()
         public Target Rollback => _ => _
             .DependsOn(Backup)
             .After(Backup, Install, Update, InstallPlatform, InstallModules)
-            .OnlyWhenDynamic(() => FailedTargets.Any() && SucceededTargets.Contains(Backup))
+            .OnlyWhenDynamic(() => FailedTargets.Count > 0 && SucceededTargets.Contains(Backup))
             .AssuredAfterFailure()
             .Executes(() => CompressionExtensions.UnTarGZipTo(BackupFile, RootDirectory));
 

diff --git a/src/VirtoCommerce.Build/Utils/ArtifactPacker.cs b/src/VirtoCommerce.Build/Utils/ArtifactPacker.cs
@@ -8,7 +8,7 @@
 
 namespace Utils
 {
-    public static class ArtifactPacker
+    public static partial class ArtifactPacker
     {
         public static void CompressPlatform(AbsolutePath sourceDirectory, AbsolutePath outputZipPath)
         {
@@ -26,7 +26,7 @@ public static void CompressModule(Action<ModuleCompressionOptionsBuilder> option
                 FileExistsPolicy.Overwrite);
 
             //Exclude all ignored files and *module files not related to compressed module
-            var ignoreModuleFilesRegex = new Regex(@".+Module\..*", RegexOptions.IgnoreCase);
+            var ignoreModuleFilesRegex = IgnoreModuleFilesRegex();
             var includeModuleFilesRegex =
                 new Regex(@$".*{options.ModuleId}(Module)?\..*", RegexOptions.IgnoreCase);
 
@@ -73,5 +73,8 @@ public static bool KeepFileByRegex(string name, Regex keepRegex)
         {
             return keepRegex.IsMatch(name);
         }
+
+        [GeneratedRegex(@".+Module\..*", RegexOptions.IgnoreCase)]
+        private static partial Regex IgnoreModuleFilesRegex();
     }
 }