Revert "code cleanup"

This reverts commit 0a64985.

Author: arturcic

src/GitVersionCore.Tests/BuildServers/JenkinsTests.cs

@@ -15,7 +15,7 @@ namespace GitVersionCore.Tests.BuildServers
     [TestFixture]
     public class JenkinsTests : TestBase
     {
-        private const string key = Jenkins.EnvironmentVariableName;
+        private const string key = "JENKINS_URL";
         private const string branch = "GIT_BRANCH";
         private const string localBranch = "GIT_LOCAL_BRANCH";
         private const string pipelineBranch = "BRANCH_NAME";

src/GitVersionExe.Tests/GitVersionHelper.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using GitVersion.BuildServers;
 using GitVersion.Helpers;
 using GitVersionCore.Tests.Helpers;
 
@@ -33,6 +35,15 @@ private static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
             var executable = PathHelper.GetExecutable();
             var output = new StringBuilder();
 
+            var environmentalVariables =
+                new[]
+                {
+                    new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, arguments.IsTeamCity ? "8.0.0" : null),
+                    new KeyValuePair<string, string>(AppVeyor.EnvironmentVariableName, null),
+                    new KeyValuePair<string, string>(TravisCi.EnvironmentVariableName, null),
+                    new KeyValuePair<string, string>(AzurePipelines.EnvironmentVariableName, null),
+                };
+
             var exitCode = -1;
 
             try
@@ -48,7 +59,8 @@ private static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
                     null,
                     executable,
                     args,
-                    arguments.WorkingDirectory);
+                    arguments.WorkingDirectory,
+                    environmentalVariables);
             }
             catch (Exception exception)
             {

src/GitVersionExe.Tests/PullRequestInJenkinsPipelineTest.cs

@@ -1,6 +1,5 @@
 using System;
 using GitTools.Testing;
-using GitVersion.BuildServers;
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
@@ -46,7 +45,7 @@ public void GivenJenkinsPipelineHasDuplicatedOriginVersionIsCalculatedProperly()
 
             // Emulating Jenkins environment variable
             Environment.SetEnvironmentVariable(pipelineBranch, "PR-5");
-            Environment.SetEnvironmentVariable(Jenkins.EnvironmentVariableName, "url");
+            Environment.SetEnvironmentVariable("JENKINS_URL", "url");
 
             var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath);
 
@@ -57,7 +56,7 @@ public void GivenJenkinsPipelineHasDuplicatedOriginVersionIsCalculatedProperly()
             DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
 
             Environment.SetEnvironmentVariable(pipelineBranch, pipelineBranchOrig);
-            Environment.SetEnvironmentVariable(Jenkins.EnvironmentVariableName, null);
+            Environment.SetEnvironmentVariable("JENKINS_URL", null);
         }
     }
 }

src/GitVersionExe.Tests/PullRequestInTeamCityTest.cs

@@ -1,6 +1,5 @@
 using System;
 using GitTools.Testing;
-using GitVersion.BuildServers;
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
@@ -42,16 +41,11 @@ public void GivenARemoteWithATagOnMasterAndAPullRequestWithTwoCommitsAndBuildIsR
                 Commands.Checkout(fixture.Repository, mergeCommitSha);
             }
 
-            // Emulating Jenkins environment variable
-            Environment.SetEnvironmentVariable(TeamCity.EnvironmentVariableName, "8.0.0");
-
             var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, isTeamCity: true);
 
             result.ExitCode.ShouldBe(0);
             result.OutputVariables.FullSemVer.ShouldBe("1.0.4-PullRequest0005.3");
 
-            Environment.SetEnvironmentVariable(TeamCity.EnvironmentVariableName, null);
-
             // Cleanup repository files
             DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
         }