using IEnvironment instead of System.Environment

Author: arturcic

src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

@@ -29,7 +29,7 @@ public void Setup()
             var baseVersionCalculator = new BaseVersionCalculator(log, null);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
-            variableProvider = new VariableProvider(nextVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator, new TestEnvironment());
         }
 
         [TestCase("cs")]

src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

@@ -26,7 +26,7 @@ public void SetUp()
             var baseVersionCalculator = new BaseVersionCalculator(log, null);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
-            variableProvider = new VariableProvider(nextVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator, new TestEnvironment());
         }
 
         [Test]

src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs

@@ -29,7 +29,7 @@ public void SetUp()
             var baseVersionCalculator = new BaseVersionCalculator(log, null);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
-            variableProvider = new VariableProvider(nextVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator, new TestEnvironment());
         }
 
         [Test]

src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs

@@ -28,7 +28,7 @@ public void SetUp()
             var baseVersionCalculator = new BaseVersionCalculator(log, null);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
-            variableProvider = new VariableProvider(nextVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator, new TestEnvironment());
         }
 
         [Test]

src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

@@ -28,7 +28,7 @@ public void SetUp()
             var baseVersionCalculator = new BaseVersionCalculator(log, null);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
-            variableProvider = new VariableProvider(nextVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator, new TestEnvironment());
         }
 
         [Test]

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -27,18 +27,21 @@ public class ConfigProviderTests : TestBase
         private IConfigFileLocator configFileLocator;
         private IConfigProvider configProvider;
         private IConfigInitWizard configInitWizard;
+        private IEnvironment environment;
 
         [SetUp]
         public void Setup()
         {
             fileSystem = new TestFileSystem();
             var log = new NullLog();
+            environment = new TestEnvironment();
+
             var stepFactory = new ConfigInitStepFactory();
             configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
             configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
             repoPath = DefaultRepoPath;
 
-            var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
+            var gitPreparer = new GitPreparer(log, environment, Options.Create(new Arguments { TargetPath = repoPath }));
             configProvider = new ConfigProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
@@ -293,7 +296,7 @@ public void NoWarnOnGitVersionYmlFile()
             var log = new Log(logAppender);
 
             var defaultConfigFileLocator = new DefaultConfigFileLocator(fileSystem, log);
-            var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
+            var gitPreparer = new GitPreparer(log, environment, Options.Create(new Arguments { TargetPath = repoPath }));
 
             configProvider = new ConfigProvider(fileSystem, log, defaultConfigFileLocator, gitPreparer, configInitWizard);
 

src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs

@@ -92,7 +92,7 @@ public void NoWarnOnGitVersionYmlFile()
             {
                 var log = new NullLog();
                 var defaultConfigFileLocator = new DefaultConfigFileLocator(fileSystem, log);
-                var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
+                var gitPreparer = new GitPreparer(log, new TestEnvironment(), Options.Create(new Arguments { TargetPath = repoPath }));
                 var stepFactory = new ConfigInitStepFactory();
                 var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
 

src/GitVersionCore.Tests/DynamicRepositoryTests.cs

@@ -94,13 +94,13 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
             var nextVersionCalculator = new NextVersionCalculator(log, metadataCalculator, baseVersionCalculator, mainlineVersionCalculator);
             var gitVersionFinder = new GitVersionFinder(log, nextVersionCalculator);
 
-            var gitPreparer = new GitPreparer(log, options);
+            var gitPreparer = new GitPreparer(log, new TestEnvironment(), options);
             var stepFactory = new ConfigInitStepFactory();
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
 
             var configurationProvider = new ConfigProvider(testFileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
-            var variableProvider = new VariableProvider(nextVersionCalculator);
+            var variableProvider = new VariableProvider(nextVersionCalculator, new TestEnvironment());
             var gitVersionCalculator = new GitVersionCalculator(testFileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider, options);
 
             var versionVariables = gitVersionCalculator.CalculateVersionVariables();

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

@@ -34,7 +34,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
             var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
-            var variableProvider = new VariableProvider(nextVersionCalculator);
+            var variableProvider = new VariableProvider(nextVersionCalculator, new TestEnvironment());
             var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);
             var executeGitVersion = ExecuteGitVersion(gitVersionContext);
             var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
@@ -99,7 +99,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)
                 Authentication = new Authentication(),
                 TargetPath = fixture.LocalRepositoryFixture.RepositoryPath
             };
-            new GitPreparer(log, Options.Create(arguments)).Prepare(true, null);
+            new GitPreparer(log, new TestEnvironment(), Options.Create(arguments)).Prepare(true, null);
         }
     }
 }

src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -15,6 +15,7 @@
         <PackageReference Include="GitTools.Testing" Version="1.2.0" />
         <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     </ItemGroup>
     <ItemGroup>