replace Path.* usage with PathHelper.*

arturcic · Bi0T1N · commit fc30dbbc5055 · 2025-03-07T18:18:56.000+01:00
diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs
@@ -289,7 +289,7 @@ public void UpdateAssemblyInfoWithFilename()
         var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs");
         arguments.UpdateAssemblyInfo.ShouldBe(true);
         arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
     }
 
     [Test]
@@ -306,8 +306,8 @@ public void UpdateAssemblyInfoWithMultipleFilenames()
         var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs VersionAssemblyInfo.cs");
         arguments.UpdateAssemblyInfo.ShouldBe(true);
         arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
     }
 
     [Test]
@@ -324,8 +324,8 @@ public void UpdateProjectFilesWithMultipleFilenames()
         var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateProjectFiles CommonAssemblyInfo.csproj VersionAssemblyInfo.csproj");
         arguments.UpdateProjectFiles.ShouldBe(true);
         arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.csproj"));
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.csproj"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("CommonAssemblyInfo.csproj"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("VersionAssemblyInfo.csproj"));
     }
 
     [Test]
@@ -348,9 +348,9 @@ public void UpdateAssemblyInfoWithMultipleFilenamesMatchingGlobbing()
         var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo **/*AssemblyInfo.cs");
         arguments.UpdateAssemblyInfo.ShouldBe(true);
         arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(3);
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("LocalAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("LocalAssemblyInfo.cs"));
     }
 
     [Test]
@@ -367,7 +367,7 @@ public void UpdateAssemblyInfoWithRelativeFilename()
         var arguments = this.argumentParser.ParseArguments($"-targetpath {targetPath} -updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
         arguments.UpdateAssemblyInfo.ShouldBe(true);
         arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
-        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => PathHelper.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
     }
 
     [Test]
diff --git a/src/GitVersion.App/ArgumentParser.cs b/src/GitVersion.App/ArgumentParser.cs
@@ -107,14 +107,14 @@ private void ValidateConfigurationFile(Arguments arguments)
     {
         if (arguments.ConfigurationFile.IsNullOrWhiteSpace()) return;
 
-        if (Path.IsPathRooted(arguments.ConfigurationFile))
+        if (PathHelper.IsPathRooted(arguments.ConfigurationFile))
         {
             if (!this.fileSystem.File.Exists(arguments.ConfigurationFile)) throw new WarningException($"Could not find config file at '{arguments.ConfigurationFile}'");
-            arguments.ConfigurationFile = Path.GetFullPath(arguments.ConfigurationFile);
+            arguments.ConfigurationFile = PathHelper.GetFullPath(arguments.ConfigurationFile);
         }
         else
         {
-            var configFilePath = Path.GetFullPath(PathHelper.Combine(arguments.TargetPath, arguments.ConfigurationFile));
+            var configFilePath = PathHelper.GetFullPath(PathHelper.Combine(arguments.TargetPath, arguments.ConfigurationFile));
             if (!this.fileSystem.File.Exists(configFilePath)) throw new WarningException($"Could not find config file at '{configFilePath}'");
             arguments.ConfigurationFile = configFilePath;
         }
@@ -156,7 +156,7 @@ private IEnumerable<string> ResolveFiles(string workingDirectory, ISet<string>?
 
             foreach (var path in paths)
             {
-                yield return Path.GetFullPath(PathHelper.Combine(workingDirectory, path));
+                yield return PathHelper.GetFullPath(PathHelper.Combine(workingDirectory, path));
             }
         }
     }
@@ -182,7 +182,7 @@ private void ParseTargetPath(Arguments arguments, string? name, IReadOnlyList<st
         {
             if (name?.StartsWith('/') == true)
             {
-                if (Path.DirectorySeparatorChar == '/' && name.IsValidPath())
+                if (PathHelper.DirectorySeparatorChar == '/' && name.IsValidPath())
                 {
                     arguments.TargetPath = name;
                     return;
diff --git a/src/GitVersion.App/ArgumentParserExtensions.cs b/src/GitVersion.App/ArgumentParserExtensions.cs
@@ -74,7 +74,7 @@ public static bool ArgumentRequiresValue(this string argument, int argumentIndex
         var argumentMightRequireValue = !booleanArguments.Contains(argument[1..], StringComparer.OrdinalIgnoreCase);
 
         // If this is the first argument that might be a target path, the argument starts with slash, and we're on an OS that supports paths with slashes, the argument does not require a value.
-        if (argumentMightRequireValue && argumentIndex == 0 && argument.StartsWith('/') && Path.DirectorySeparatorChar == '/' && argument.IsValidPath())
+        if (argumentMightRequireValue && argumentIndex == 0 && argument.StartsWith('/') && PathHelper.DirectorySeparatorChar == '/' && argument.IsValidPath())
             return false;
 
         return argumentMightRequireValue;
diff --git a/src/GitVersion.App/FileAppender.cs b/src/GitVersion.App/FileAppender.cs
@@ -15,7 +15,7 @@ public FileAppender(IFileSystem fileSystem, string filePath)
         this.fileSystem = fileSystem.NotNull();
         this.filePath = filePath;
 
-        var logFile = this.fileSystem.FileInfo.New(Path.GetFullPath(filePath));
+        var logFile = this.fileSystem.FileInfo.New(PathHelper.GetFullPath(filePath));
 
         logFile.Directory?.Create();
         if (logFile.Exists) return;
diff --git a/src/GitVersion.App/GitVersionExecutor.cs b/src/GitVersion.App/GitVersionExecutor.cs
@@ -56,7 +56,7 @@ public int Execute(GitVersionOptions gitVersionOptions)
     private int RunGitVersionTool(GitVersionOptions gitVersionOptions)
     {
         this.gitRepository.DiscoverRepository(gitVersionOptions.WorkingDirectory);
-        var mutexName = this.repositoryInfo.DotGitDirectory?.Replace(Path.DirectorySeparatorChar.ToString(), "") ?? string.Empty;
+        var mutexName = this.repositoryInfo.DotGitDirectory?.Replace(PathHelper.DirectorySeparatorChar.ToString(), "") ?? string.Empty;
         using var mutex = new Mutex(true, $@"Global\gitversion{mutexName}", out var acquired);
 
         try
diff --git a/src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs
@@ -120,7 +120,7 @@ public void GetCurrentBranchShouldHandlePullRequests()
     [Test]
     public void WriteAllVariablesToTheTextWriter()
     {
-        var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
         assemblyLocation.ShouldNotBeNull();
         var propertyFile = PathHelper.Combine(assemblyLocation, "gitversion.properties");
         var ps1File = PathHelper.Combine(assemblyLocation, "gitversion.ps1");
diff --git a/src/GitVersion.BuildAgents.Tests/Agents/CodeBuildTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/CodeBuildTests.cs
@@ -55,7 +55,7 @@ public void PicksUpBranchNameFromEnvironmentFromWebHook()
     [Test]
     public void WriteAllVariablesToTheTextWriter()
     {
-        var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
         assemblyLocation.ShouldNotBeNull();
         var f = PathHelper.Combine(assemblyLocation, "codebuild_this_file_should_be_deleted.properties");
 
diff --git a/src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs
@@ -23,7 +23,7 @@ public void SetUp()
         this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, "true");
         this.environment.SetEnvironmentVariable("GITHUB_REF_TYPE", "branch");
 
-        this.githubSetEnvironmentTempFilePath = Path.GetTempFileName();
+        this.githubSetEnvironmentTempFilePath = PathHelper.GetTempFileName();
         this.environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, this.githubSetEnvironmentTempFilePath);
     }
 
diff --git a/src/GitVersion.BuildAgents.Tests/Agents/GitLabCiTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/GitLabCiTests.cs
@@ -95,7 +95,7 @@ public void GetCurrentBranchShouldHandlePullRequests(string branchName, string e
     [Test]
     public void WriteAllVariablesToTheTextWriter()
     {
-        var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
         assemblyLocation.ShouldNotBeNull();
         var f = PathHelper.Combine(assemblyLocation, "jenkins_this_file_should_be_deleted.properties");
 
diff --git a/src/GitVersion.BuildAgents.Tests/Agents/JenkinsTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/JenkinsTests.cs
@@ -111,7 +111,7 @@ public void GenerateMessageTest()
     [Test]
     public void WriteAllVariablesToTheTextWriter()
     {
-        var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
         assemblyLocation.ShouldNotBeNull();
         var f = PathHelper.Combine(assemblyLocation, "gitlab_this_file_should_be_deleted.properties");
 
diff --git a/src/GitVersion.Configuration/ConfigurationFileLocator.cs b/src/GitVersion.Configuration/ConfigurationFileLocator.cs
@@ -26,7 +26,7 @@ internal class ConfigurationFileLocator(
 
     public void Verify(string? workingDirectory, string? projectRootDirectory)
     {
-        if (Path.IsPathRooted(this.ConfigurationFile)) return;
+        if (PathHelper.IsPathRooted(this.ConfigurationFile)) return;
         if (PathHelper.Equal(workingDirectory, projectRootDirectory)) return;
         WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory);
     }
diff --git a/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs
@@ -20,7 +20,7 @@ public void SetUp()
         var sp = ConfigureServices();
         this.fileSystem = sp.GetRequiredService<IFileSystem>();
         this.workDirectory = PathHelper.Combine(PathHelper.GetTempPath(), Guid.NewGuid().ToString());
-        this.gitDirectory = Repository.Init(this.workDirectory).TrimEnd(Path.DirectorySeparatorChar);
+        this.gitDirectory = Repository.Init(this.workDirectory).TrimEnd(PathHelper.DirectorySeparatorChar);
         Assert.That(this.gitDirectory, Is.Not.Null);
     }
 
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
@@ -111,8 +111,8 @@ public void HasDirtyFlagWhenUncommittedChangesAreInRepository(bool stageFile, in
 
         for (int i = 0; i < numberOfFiles; i++)
         {
-            var tempFile = Path.GetTempFileName();
-            var repoFile = PathHelper.Combine(fixture.RepositoryPath, Path.GetFileNameWithoutExtension(tempFile) + ".txt");
+            var tempFile = PathHelper.GetTempFileName();
+            var repoFile = PathHelper.Combine(fixture.RepositoryPath, PathHelper.GetFileNameWithoutExtension(tempFile) + ".txt");
             fileSystem.File.Move(tempFile, repoFile);
             fileSystem.File.WriteAllText(repoFile, $"Hello world / testfile {i}");
 
diff --git a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
@@ -100,7 +100,7 @@ public static bool IsReleaseBranch(this IGitVersionConfiguration configuration,
                 foreach (var groupName in regex.GetGroupNames())
                 {
                     var groupValue = match.Groups[groupName].Value;
-                    Lazy<string> escapedGroupValueLazy = new(() => EscapeInvalidCharaters(groupValue));
+                    Lazy<string> escapedGroupValueLazy = new(() => EscapeInvalidCharacters(groupValue));
                     var placeholder = $"{{{groupName}}}";
                     int index, startIndex = 0;
                     while ((index = label.IndexOf(placeholder, startIndex, StringComparison.InvariantCulture)) >= 0)
@@ -115,33 +115,33 @@ public static bool IsReleaseBranch(this IGitVersionConfiguration configuration,
         return label;
     }
 
-    private static string EscapeInvalidCharaters(string groupValue) => groupValue.RegexReplace(@"[^a-zA-Z0-9-]", "-");
+    private static string EscapeInvalidCharacters(string groupValue) => groupValue.RegexReplace("[^a-zA-Z0-9-]", "-");
 
-    public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(this IFileSystem fileSystem, string path)
+    public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(this IFileSystem fileSystem, string? path)
     {
         string? startingDir = path;
         while (startingDir is not null)
         {
             var dirOrFilePath = PathHelper.Combine(startingDir, ".git");
             if (fileSystem.Directory.Exists(dirOrFilePath))
             {
-                return (dirOrFilePath, Path.GetDirectoryName(dirOrFilePath)!);
+                return (dirOrFilePath, PathHelper.GetDirectoryName(dirOrFilePath));
             }
 
             if (fileSystem.File.Exists(dirOrFilePath))
             {
                 string? relativeGitDirPath = ReadGitDirFromFile(dirOrFilePath);
                 if (!string.IsNullOrWhiteSpace(relativeGitDirPath))
                 {
-                    var fullGitDirPath = Path.GetFullPath(PathHelper.Combine(startingDir, relativeGitDirPath));
+                    var fullGitDirPath = PathHelper.GetFullPath(PathHelper.Combine(startingDir, relativeGitDirPath));
                     if (fileSystem.Directory.Exists(fullGitDirPath))
                     {
-                        return (fullGitDirPath, Path.GetDirectoryName(dirOrFilePath)!);
+                        return (fullGitDirPath, PathHelper.GetDirectoryName(dirOrFilePath));
                     }
                 }
             }
 
-            startingDir = Path.GetDirectoryName(startingDir);
+            startingDir = PathHelper.GetDirectoryName(startingDir);
         }
 
         return null;
diff --git a/src/GitVersion.Core/Helpers/DirectoryHelper.cs b/src/GitVersion.Core/Helpers/DirectoryHelper.cs
@@ -40,7 +40,7 @@ public static void DeleteDirectory(string directoryPath)
                                           "{0}Known and common causes include:" +
                                           "{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
                                           "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
-                PathHelper.NewLine, Path.GetFullPath(directoryPath)));
+                PathHelper.NewLine, PathHelper.GetFullPath(directoryPath)));
         }
     }
 }
diff --git a/src/GitVersion.Core/Helpers/PathHelper.cs b/src/GitVersion.Core/Helpers/PathHelper.cs
@@ -5,6 +5,7 @@ namespace GitVersion.Helpers;
 internal static class PathHelper
 {
     public static string NewLine => SysEnv.NewLine;
+    public static char DirectorySeparatorChar => Path.DirectorySeparatorChar;
 
     private static readonly StringComparison OsDependentComparison =
         RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
@@ -33,13 +34,19 @@ public static string GetDirectoryName(string? path)
         return Path.GetDirectoryName(path)!;
     }
 
-    public static string GetFullPath(string? path)
+    public static string GetFileName(string? path)
     {
         ArgumentNullException.ThrowIfNull(path, nameof(path));
 
-        return Path.GetFullPath(path);
+        return Path.GetFileName(path);
     }
 
+    public static string? GetFileNameWithoutExtension(string? path) => Path.GetFileNameWithoutExtension(path);
+
+    public static string? GetExtension(string? path) => Path.GetExtension(path);
+
+    public static string GetFullPath(string? path) => Path.GetFullPath(path!);
+
     public static string Combine(string? path1, string? path2)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(path1);
@@ -79,4 +86,10 @@ public static bool Equal(string? path, string? otherPath) =>
             GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
             GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
             OsDependentComparison);
+
+    public static string GetRandomFileName() => Path.GetRandomFileName();
+
+    public static string GetTempFileName() => Path.GetTempFileName();
+
+    public static bool IsPathRooted(string? path) => Path.IsPathRooted(path);
 }
diff --git a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs
@@ -118,7 +118,7 @@ private List<string> CalculateDirectoryContents(string root)
                 try
                 {
                     if (!this.fileSystem.File.Exists(file)) continue;
-                    result.Add(Path.GetFileName(file));
+                    result.Add(PathHelper.GetFileName(file));
                     result.Add(this.fileSystem.File.ReadAllText(file));
                 }
                 catch (IOException e)
diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs
@@ -40,7 +40,7 @@ public GitRepositoryInfo(IFileSystem fileSystem, IOptions<GitVersionOptions> opt
         var targetUrl = repositoryInfo.TargetUrl;
         var clonePath = repositoryInfo.ClonePath;
 
-        var userTemp = clonePath ?? Path.GetTempPath();
+        var userTemp = clonePath ?? PathHelper.GetTempPath();
         var repositoryName = targetUrl.Split('/', '\\').Last().Replace(".git", string.Empty);
         var possiblePath = PathHelper.Combine(userTemp, repositoryName);
 
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs
diff --git a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
diff --git a/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs b/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs
diff --git a/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs b/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs
diff --git a/src/GitVersion.Output/GitVersionInfo/GitVersionInfoGenerator.cs b/src/GitVersion.Output/GitVersionInfo/GitVersionInfoGenerator.cs
diff --git a/src/GitVersion.Output/TemplateManager.cs b/src/GitVersion.Output/TemplateManager.cs
diff --git a/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs b/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs

Original file line number	Diff line number	Diff line change
`@@ -107,14 +107,14 @@ private void ValidateConfigurationFile(Arguments arguments)`
`107`	`107`	`{`
`108`	`108`	`if (arguments.ConfigurationFile.IsNullOrWhiteSpace()) return;`
`109`	`109`
`110`		`- if (Path.IsPathRooted(arguments.ConfigurationFile))`
	`110`	`+ if (PathHelper.IsPathRooted(arguments.ConfigurationFile))`
`111`	`111`	`{`
`112`	`112`	`if (!this.fileSystem.File.Exists(arguments.ConfigurationFile)) throw new WarningException($"Could not find config file at '{arguments.ConfigurationFile}'");`
`113`		`- arguments.ConfigurationFile = Path.GetFullPath(arguments.ConfigurationFile);`
	`113`	`+ arguments.ConfigurationFile = PathHelper.GetFullPath(arguments.ConfigurationFile);`
`114`	`114`	`}`
`115`	`115`	`else`
`116`	`116`	`{`
`117`		`- var configFilePath = Path.GetFullPath(PathHelper.Combine(arguments.TargetPath, arguments.ConfigurationFile));`
	`117`	`+ var configFilePath = PathHelper.GetFullPath(PathHelper.Combine(arguments.TargetPath, arguments.ConfigurationFile));`
`118`	`118`	`if (!this.fileSystem.File.Exists(configFilePath)) throw new WarningException($"Could not find config file at '{configFilePath}'");`
`119`	`119`	`arguments.ConfigurationFile = configFilePath;`
`120`	`120`	`}`
`@@ -156,7 +156,7 @@ private IEnumerable<string> ResolveFiles(string workingDirectory, ISet<string>?`
`156`	`156`
`157`	`157`	`foreach (var path in paths)`
`158`	`158`	`{`
`159`		`- yield return Path.GetFullPath(PathHelper.Combine(workingDirectory, path));`
	`159`	`+ yield return PathHelper.GetFullPath(PathHelper.Combine(workingDirectory, path));`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`	`}`
`@@ -182,7 +182,7 @@ private void ParseTargetPath(Arguments arguments, string? name, IReadOnlyList<st`
`182`	`182`	`{`
`183`	`183`	`if (name?.StartsWith('/') == true)`
`184`	`184`	`{`
`185`		`- if (Path.DirectorySeparatorChar == '/' && name.IsValidPath())`
	`185`	`+ if (PathHelper.DirectorySeparatorChar == '/' && name.IsValidPath())`
`186`	`186`	`{`
`187`	`187`	`arguments.TargetPath = name;`
`188`	`188`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public int Execute(GitVersionOptions gitVersionOptions)`
`56`	`56`	`private int RunGitVersionTool(GitVersionOptions gitVersionOptions)`
`57`	`57`	`{`
`58`	`58`	`this.gitRepository.DiscoverRepository(gitVersionOptions.WorkingDirectory);`
`59`		`- var mutexName = this.repositoryInfo.DotGitDirectory?.Replace(Path.DirectorySeparatorChar.ToString(), "") ?? string.Empty;`
	`59`	`+ var mutexName = this.repositoryInfo.DotGitDirectory?.Replace(PathHelper.DirectorySeparatorChar.ToString(), "") ?? string.Empty;`
`60`	`60`	`using var mutex = new Mutex(true, $@"Global\gitversion{mutexName}", out var acquired);`
`61`	`61`
`62`	`62`	`try`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public void GetCurrentBranchShouldHandlePullRequests()`
`120`	`120`	`[Test]`
`121`	`121`	`public void WriteAllVariablesToTheTextWriter()`
`122`	`122`	`{`
`123`		`- var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
	`123`	`+ var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
`124`	`124`	`assemblyLocation.ShouldNotBeNull();`
`125`	`125`	`var propertyFile = PathHelper.Combine(assemblyLocation, "gitversion.properties");`
`126`	`126`	`var ps1File = PathHelper.Combine(assemblyLocation, "gitversion.ps1");`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void PicksUpBranchNameFromEnvironmentFromWebHook()`
`55`	`55`	`[Test]`
`56`	`56`	`public void WriteAllVariablesToTheTextWriter()`
`57`	`57`	`{`
`58`		`- var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
	`58`	`+ var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
`59`	`59`	`assemblyLocation.ShouldNotBeNull();`
`60`	`60`	`var f = PathHelper.Combine(assemblyLocation, "codebuild_this_file_should_be_deleted.properties");`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void SetUp()`
`23`	`23`	`this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, "true");`
`24`	`24`	`this.environment.SetEnvironmentVariable("GITHUB_REF_TYPE", "branch");`
`25`	`25`
`26`		`- this.githubSetEnvironmentTempFilePath = Path.GetTempFileName();`
	`26`	`+ this.githubSetEnvironmentTempFilePath = PathHelper.GetTempFileName();`
`27`	`27`	`this.environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, this.githubSetEnvironmentTempFilePath);`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public void GetCurrentBranchShouldHandlePullRequests(string branchName, string e`
`95`	`95`	`[Test]`
`96`	`96`	`public void WriteAllVariablesToTheTextWriter()`
`97`	`97`	`{`
`98`		`- var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
	`98`	`+ var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
`99`	`99`	`assemblyLocation.ShouldNotBeNull();`
`100`	`100`	`var f = PathHelper.Combine(assemblyLocation, "jenkins_this_file_should_be_deleted.properties");`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public void GenerateMessageTest()`
`111`	`111`	`[Test]`
`112`	`112`	`public void WriteAllVariablesToTheTextWriter()`
`113`	`113`	`{`
`114`		`- var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
	`114`	`+ var assemblyLocation = PathHelper.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
`115`	`115`	`assemblyLocation.ShouldNotBeNull();`
`116`	`116`	`var f = PathHelper.Combine(assemblyLocation, "gitlab_this_file_should_be_deleted.properties");`
`117`	`117`