Merge pull request #3969 from arturcic/feature/cleanup

cleanup

Author: arturcic

src/GitVersion.App.Tests/ArgumentParserTests.cs

@@ -597,8 +597,8 @@ public void EnsureAssemblyInfoFalse()
     [Test]
     public void DynamicRepoLocation()
     {
-        var arguments = this.argumentParser.ParseArguments("-dynamicRepoLocation c:\\foo\\");
-        arguments.ClonePath.ShouldBe("c:\\foo\\");
+        var arguments = this.argumentParser.ParseArguments(@"-dynamicRepoLocation /tmp/foo");
+        arguments.ClonePath.ShouldBe("/tmp/foo");
     }
 
     [Test]
@@ -748,14 +748,14 @@ public void EnsureFormatIsSet()
     }
 
     [TestCase("custom-config.yaml")]
-    [TestCase(@"c:\custom-config.yaml")]
+    [TestCase("/tmp/custom-config.yaml")]
     public void ThrowIfConfigurationFileDoesNotExist(string configFile) =>
         Should.Throw<WarningException>(() => _ = this.argumentParser.ParseArguments($"-config {configFile}"));
 
     [Test]
     public void EnsureConfigurationFileIsSet()
     {
-        var configFile = Path.GetTempPath() + Guid.NewGuid() + ".yaml";
+        var configFile = PathHelper.GetTempPath() + Guid.NewGuid() + ".yaml";
         File.WriteAllText(configFile, "next-version: 1.0.0");
         var arguments = this.argumentParser.ParseArguments($"-config {configFile}");
         arguments.ConfigurationFile.ShouldBe(configFile);

src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs

@@ -142,9 +142,9 @@ public async Task VerifyBitBucketPipelinesPullRequest(string pullRequestRef)
 
     private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pullRequestRef, Dictionary<string, string> env)
     {
-        using var fixture = new EmptyRepositoryFixture("main");
-        var remoteRepositoryPath = PathHelper.GetTempPath();
-        RepositoryFixtureBase.Init(remoteRepositoryPath, "main");
+        using var fixture = new EmptyRepositoryFixture();
+        var remoteRepositoryPath = PathHelper.GetRepositoryTempPath();
+        RepositoryFixtureBase.Init(remoteRepositoryPath);
         using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
             remoteRepository.Config.Set("user.name", "Test");

src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs

@@ -34,9 +34,9 @@ public async Task VerifyTagCheckoutOnGitHubActions()
 
     private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionary<string, string> env)
     {
-        using var fixture = new EmptyRepositoryFixture("main");
-        var remoteRepositoryPath = PathHelper.GetTempPath();
-        RepositoryFixtureBase.Init(remoteRepositoryPath, "main");
+        using var fixture = new EmptyRepositoryFixture();
+        var remoteRepositoryPath = PathHelper.GetRepositoryTempPath();
+        RepositoryFixtureBase.Init(remoteRepositoryPath);
         using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
             remoteRepository.Config.Set("user.name", "Test");

src/GitVersion.App/ArgumentParser.cs

@@ -174,7 +174,7 @@ private void ParseTargetPath(Arguments arguments, string? name, IReadOnlyList<st
         // If we've reached through all argument switches without a match, we can relatively safely assume that the first argument isn't a switch, but the target path.
         if (parseEnded)
         {
-            if (name?.StartsWith("/") == true)
+            if (name?.StartsWith('/') == true)
             {
                 if (Path.DirectorySeparatorChar == '/' && name.IsValidPath())
                 {

src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs

@@ -20,7 +20,7 @@ public void SetEnvironmentVariableForTest()
         this.buildServer = sp.GetRequiredService<EnvRun>();
 
         // set environment variable and create an empty envrun file to indicate that EnvRun is running...
-        this.mFilePath = PathHelper.Combine(Path.GetTempPath(), "envrun.db");
+        this.mFilePath = PathHelper.Combine(PathHelper.GetTempPath(), "envrun.db");
         this.environment.SetEnvironmentVariable(EnvVarName, this.mFilePath);
         File.OpenWrite(this.mFilePath).Dispose();
     }

src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs

@@ -13,9 +13,6 @@ public static class ConfigurationFileLocatorTests
 {
     public class DefaultConfigFileLocatorTests : TestBase
     {
-        private const string DefaultRepoPath = @"c:\MyGitRepo";
-        private const string DefaultWorkingPath = @"c:\MyGitRepo\Working";
-
         private string repoPath;
         private string workingPath;
         private IFileSystem fileSystem;
@@ -25,8 +22,8 @@ public class DefaultConfigFileLocatorTests : TestBase
         [SetUp]
         public void Setup()
         {
-            this.repoPath = DefaultRepoPath;
-            this.workingPath = DefaultWorkingPath;
+            this.repoPath = Path.Combine(PathHelper.GetTempPath(), "MyGitRepo");
+            this.workingPath = Path.Combine(PathHelper.GetTempPath(), "MyGitRepo", "Working");
             var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
 
             var sp = ConfigureServices(services => services.AddSingleton(options));
@@ -76,8 +73,8 @@ private string SetupConfigFileContent(string text, string fileName, string path)
 
     public class NamedConfigurationFileLocatorTests : TestBase
     {
-        private const string DefaultRepoPath = @"c:\MyGitRepo";
-        private const string DefaultWorkingPath = @"c:\MyGitRepo\Working";
+        private static readonly string DefaultRepoPath = Path.Combine(PathHelper.GetTempPath(), "MyGitRepo");
+        private static readonly string DefaultWorkingPath = Path.Combine(PathHelper.GetTempPath(), "MyGitRepo", "Working");
         private const string myConfigYaml = "my-config.yaml";
 
         private string repoPath;
@@ -189,7 +186,7 @@ public void NoWarnOnCustomYmlFileOutsideRepoPath()
             this.configFileLocator = sp.GetRequiredService<IConfigurationFileLocator>();
             this.fileSystem = sp.GetRequiredService<IFileSystem>();
 
-            SetupConfigFileContent(string.Empty, path: @"c:\\Unrelated\\path");
+            SetupConfigFileContent(string.Empty, path: PathHelper.Combine(PathHelper.GetTempPath(), "unrelatedPath"));
 
             var configurationProvider = (ConfigurationProvider)sp.GetRequiredService<IConfigurationProvider>();
 

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

@@ -13,16 +13,14 @@ namespace GitVersion.Core.Tests;
 [TestFixture]
 public class ConfigurationProviderTests : TestBase
 {
-    private const string DefaultRepoPath = @"c:\MyGitRepo";
-
     private string repoPath;
     private ConfigurationProvider configurationProvider;
     private IFileSystem fileSystem;
 
     [SetUp]
     public void Setup()
     {
-        this.repoPath = DefaultRepoPath;
+        this.repoPath = Path.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.Configuration/ConfigurationFileLocator.cs

@@ -19,7 +19,7 @@ public bool TryGetConfigurationFile(string? workingDirectory, string? projectRoo
 
     public void Verify(string? workingDirectory, string? projectRootDirectory)
     {
-        if (!Path.IsPathRooted(this.configurationFile) && !fileSystem.PathsEqual(workingDirectory, projectRootDirectory))
+        if (!Path.IsPathRooted(this.configurationFile) && !PathHelper.Equal(workingDirectory, projectRootDirectory))
             WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory);
     }
 

src/GitVersion.Configuration/ConfigurationProvider.cs

@@ -1,20 +1,15 @@
 using GitVersion.Configuration.SupportedWorkflows;
 using GitVersion.Extensions;
-using GitVersion.Logging;
 using Microsoft.Extensions.Options;
 using YamlDotNet.Core;
 
 namespace GitVersion.Configuration;
 
 internal class ConfigurationProvider(
-    IFileSystem fileSystem,
-    ILog log,
     IConfigurationFileLocator configFileLocator,
     IOptions<GitVersionOptions> options)
     : IConfigurationProvider
 {
-    private readonly IFileSystem fileSystem = fileSystem.NotNull();
-    private readonly ILog log = log.NotNull();
     private readonly IConfigurationFileLocator configFileLocator = configFileLocator.NotNull();
     private readonly IOptions<GitVersionOptions> options = options.NotNull();
 

src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs

@@ -15,7 +15,7 @@ public class GitVersionTaskDirectoryTests : TestBase
     [SetUp]
     public void SetUp()
     {
-        this.workDirectory = PathHelper.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        this.workDirectory = PathHelper.Combine(PathHelper.GetTempPath(), Guid.NewGuid().ToString());
         this.gitDirectory = Repository.Init(this.workDirectory).TrimEnd(Path.DirectorySeparatorChar);
         Assert.That(this.gitDirectory, Is.Not.Null);
     }