cleanup

Author: arturcic

src/GitVersion.App/ArgumentParser.cs

@@ -108,7 +108,7 @@ private static void ValidateConfigurationFile(Arguments arguments)
         }
         else
         {
-            var configFilePath = Path.GetFullPath(Path.Combine(arguments.TargetPath!, arguments.ConfigurationFile));
+            var configFilePath = Path.GetFullPath(PathHelper.Combine(arguments.TargetPath, arguments.ConfigurationFile));
             if (!File.Exists(configFilePath)) throw new WarningException($"Could not find config file at '{configFilePath}'");
             arguments.ConfigurationFile = configFilePath;
         }

src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs

@@ -20,7 +20,7 @@ public class ConfigurationProviderTests : TestBase
     [SetUp]
     public void Setup()
     {
-        this.repoPath = Path.Combine(PathHelper.GetTempPath(), "MyGitRepo");
+        this.repoPath = PathHelper.Combine(PathHelper.GetTempPath(), "MyGitRepo");
         var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
         var sp = ConfigureServices(services => services.AddSingleton(options));
         this.configurationProvider = (ConfigurationProvider)sp.GetRequiredService<IConfigurationProvider>();

src/GitVersion.Core/Extensions/ConfigurationExtensions.cs

@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Git;
+using GitVersion.Helpers;
 using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
@@ -117,7 +118,7 @@ public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(thi
         string? startingDir = path;
         while (startingDir is not null)
         {
-            var dirOrFilePath = Path.Combine(startingDir, ".git");
+            var dirOrFilePath = PathHelper.Combine(startingDir, ".git");
             if (Directory.Exists(dirOrFilePath))
             {
                 return (dirOrFilePath, Path.GetDirectoryName(dirOrFilePath)!);
@@ -128,7 +129,7 @@ public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(thi
                 string? relativeGitDirPath = ReadGitDirFromFile(dirOrFilePath);
                 if (!string.IsNullOrWhiteSpace(relativeGitDirPath))
                 {
-                    var fullGitDirPath = Path.GetFullPath(Path.Combine(startingDir, relativeGitDirPath));
+                    var fullGitDirPath = Path.GetFullPath(PathHelper.Combine(startingDir, relativeGitDirPath));
                     if (Directory.Exists(fullGitDirPath))
                     {
                         return (fullGitDirPath, Path.GetDirectoryName(dirOrFilePath)!);

src/GitVersion.Core/Helpers/PathHelper.cs

@@ -4,7 +4,7 @@ internal static class PathHelper
 {
     public static string NewLine => SysEnv.NewLine;
 
-    public static readonly StringComparison OsDependentComparison = SysEnv.OSVersion.Platform switch
+    private static readonly StringComparison OsDependentComparison = SysEnv.OSVersion.Platform switch
     {
         PlatformID.Unix or PlatformID.MacOSX => StringComparison.Ordinal,
         _ => StringComparison.OrdinalIgnoreCase,

src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs

@@ -169,7 +169,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildA
         var extension = FileHelper.GetFileExtension(language);
         using var result = ExecuteMsBuildExe(project =>
         {
-            var intermediateOutputPath = Path.Combine("$(MSBuildProjectDirectory)", randDir);
+            var intermediateOutputPath = PathHelper.Combine("$(MSBuildProjectDirectory)", randDir);
             AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty, language, intermediateOutputPath);
         }, language);
 
@@ -200,7 +200,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildA
         var extension = FileHelper.GetFileExtension(language);
         using var result = ExecuteMsBuildExeInAzurePipeline(project =>
         {
-            var intermediateOutputPath = Path.Combine("$(MSBuildProjectDirectory)", randDir);
+            var intermediateOutputPath = PathHelper.Combine("$(MSBuildProjectDirectory)", randDir);
             AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty, language, intermediateOutputPath);
         }, language);
 
@@ -231,7 +231,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildA
         var extension = FileHelper.GetFileExtension(language);
         using var result = ExecuteMsBuildExe(project =>
         {
-            var intermediateOutputPath = Path.Combine("$(MSBuildProjectDirectory)", randDir);
+            var intermediateOutputPath = PathHelper.Combine("$(MSBuildProjectDirectory)", randDir);
             AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty, language, intermediateOutputPath).Property("UseProjectNamespaceForGitVersionInformation", "True").Property("RootNamespace", "Test.Root");
         }, language);
 
@@ -264,7 +264,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildA
         var extension = FileHelper.GetFileExtension(language);
         using var result = ExecuteMsBuildExeInAzurePipeline(project =>
         {
-            var intermediateOutputPath = Path.Combine("$(MSBuildProjectDirectory)", randDir);
+            var intermediateOutputPath = PathHelper.Combine("$(MSBuildProjectDirectory)", randDir);
             AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty, language, intermediateOutputPath).Property("UseProjectNamespaceForGitVersionInformation", "True");
         }, language);
 

src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs

@@ -143,7 +143,7 @@ public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildAndIntermedi
         var extension = FileHelper.GetFileExtension(language);
         using var result = ExecuteMsBuildExe(project =>
         {
-            var intermediateOutputPath = Path.Combine("$(MSBuildProjectDirectory)", randDir);
+            var intermediateOutputPath = PathHelper.Combine("$(MSBuildProjectDirectory)", randDir);
             AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty, language, intermediateOutputPath);
         }, language);
 
@@ -170,7 +170,7 @@ public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildAndIntermedi
         var extension = FileHelper.GetFileExtension(language);
         using var result = ExecuteMsBuildExeInAzurePipeline(project =>
         {
-            var intermediateOutputPath = Path.Combine("$(MSBuildProjectDirectory)", randDir);
+            var intermediateOutputPath = PathHelper.Combine("$(MSBuildProjectDirectory)", randDir);
             AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty, language, intermediateOutputPath);
         }, language);
 

src/GitVersion.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -1,3 +1,4 @@
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
 namespace GitVersion.Testing;
@@ -25,7 +26,7 @@ public BaseGitFlowRepositoryFixture(Action<IRepository> initialMainAction, strin
 
     private void SetupRepo(Action<IRepository> initialMainAction)
     {
-        var randomFile = Path.Combine(Repository.Info.WorkingDirectory, Guid.NewGuid().ToString());
+        var randomFile = PathHelper.Combine(Repository.Info.WorkingDirectory, Guid.NewGuid().ToString());
         File.WriteAllText(randomFile, string.Empty);
         Commands.Stage(Repository, randomFile);
 

src/GitVersion.Testing/GitTestExtensions.cs

@@ -23,7 +23,7 @@ public static Commit[] MakeCommits(this IRepository repository, int numCommitsTo
 
     private static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string? commitMessage = null)
     {
-        var randomFile = Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
+        var randomFile = PathHelper.Combine(repository.Info.WorkingDirectory, relativeFileName);
         if (File.Exists(randomFile))
         {
             File.Delete(randomFile);

src/GitVersion.Testing/Helpers/DirectoryHelper.cs

@@ -1,3 +1,5 @@
+using GitVersion.Helpers;
+
 namespace GitVersion.Testing.Internal;
 
 internal static class DirectoryHelper
@@ -19,7 +21,7 @@ public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo targ
 
         foreach (var file in source.GetFiles())
         {
-            file.CopyTo(Path.Combine(target.FullName, Rename(file.Name)));
+            file.CopyTo(PathHelper.Combine(target.FullName, Rename(file.Name)));
         }
     }