Merge branch 'master' into fix/remove-json-output-formatter

arturcic · web-flow · commit aad3ee83ebed · 2020-01-24T15:49:46.000+02:00
diff --git a/src/GitVersionCore.Tests/BuildServers/JenkinsTests.cs b/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";
diff --git a/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
@@ -80,7 +80,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)
         {
             var arguments = new Arguments
             {
-                Authentication = new Authentication(),
+                Authentication = new AuthenticationInfo(),
                 TargetPath = fixture.LocalRepositoryFixture.RepositoryPath
             };
             var options = Options.Create(arguments);
diff --git a/src/GitVersionCore/Arguments.cs b/src/GitVersionCore/Arguments.cs
@@ -7,7 +7,7 @@ namespace GitVersion
 {
     public class Arguments
     {
-        public Authentication Authentication;
+        public AuthenticationInfo Authentication;
 
         public Config OverrideConfig;
         public bool HasOverrideConfig;
diff --git a/src/GitVersionCore/Authentication.cs b/src/GitVersionCore/Authentication.cs
diff --git a/src/GitVersionExe.Tests/GitVersionHelper.cs b/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)
             {
diff --git a/src/GitVersionExe.Tests/PullRequestInJenkinsPipelineTest.cs b/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);
         }
     }
 }
diff --git a/src/GitVersionExe.Tests/PullRequestInTeamCityTest.cs b/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);
         }
diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -123,15 +123,15 @@ public Arguments ParseArguments(string[] commandLineArguments)
                 if (name.IsSwitch("u"))
                 {
                     EnsureArgumentValueCount(values);
-                    if (arguments.Authentication == null) arguments.Authentication = new Authentication();
+                    if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();
                     arguments.Authentication.Username = value;
                     continue;
                 }
 
                 if (name.IsSwitch("p"))
                 {
                     EnsureArgumentValueCount(values);
-                    if (arguments.Authentication == null) arguments.Authentication = new Authentication();
+                    if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();
                     arguments.Authentication.Password = value;
                     continue;
                 }
@@ -413,14 +413,14 @@ private void AddAuthentication(Arguments arguments)
             var username = environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
             if (!string.IsNullOrWhiteSpace(username))
             {
-                if (arguments.Authentication == null) arguments.Authentication = new Authentication();
+                if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();
                 arguments.Authentication.Username = username;
             }
 
             var password = environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
             if (!string.IsNullOrWhiteSpace(password))
             {
-                if (arguments.Authentication == null) arguments.Authentication = new Authentication();
+                if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();
                 arguments.Authentication.Username = password;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace GitVersionCore.Tests.BuildServers`
`15`	`15`	`[TestFixture]`
`16`	`16`	`public class JenkinsTests : TestBase`
`17`	`17`	`{`
`18`		`- private const string key = Jenkins.EnvironmentVariableName;`
	`18`	`+ private const string key = "JENKINS_URL";`
`19`	`19`	`private const string branch = "GIT_BRANCH";`
`20`	`20`	`private const string localBranch = "GIT_LOCAL_BRANCH";`
`21`	`21`	`private const string pipelineBranch = "BRANCH_NAME";`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)`
`80`	`80`	`{`
`81`	`81`	`var arguments = new Arguments`
`82`	`82`	`{`
`83`		`- Authentication = new Authentication(),`
	`83`	`+ Authentication = new AuthenticationInfo(),`
`84`	`84`	`TargetPath = fixture.LocalRepositoryFixture.RepositoryPath`
`85`	`85`	`};`
`86`	`86`	`var options = Options.Create(arguments);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace GitVersion`
`7`	`7`	`{`
`8`	`8`	`public class Arguments`
`9`	`9`	`{`
`10`		`- public Authentication Authentication;`
	`10`	`+ public AuthenticationInfo Authentication;`
`11`	`11`
`12`	`12`	`public Config OverrideConfig;`
`13`	`13`	`public bool HasOverrideConfig;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using GitTools.Testing;`
`3`		`-using GitVersion.BuildServers;`
`4`	`3`	`using LibGit2Sharp;`
`5`	`4`	`using NUnit.Framework;`
`6`	`5`	`using Shouldly;`
`@@ -46,7 +45,7 @@ public void GivenJenkinsPipelineHasDuplicatedOriginVersionIsCalculatedProperly()`
`46`	`45`
`47`	`46`	`// Emulating Jenkins environment variable`
`48`	`47`	`Environment.SetEnvironmentVariable(pipelineBranch, "PR-5");`
`49`		`- Environment.SetEnvironmentVariable(Jenkins.EnvironmentVariableName, "url");`
	`48`	`+ Environment.SetEnvironmentVariable("JENKINS_URL", "url");`
`50`	`49`
`51`	`50`	`var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath);`
`52`	`51`
`@@ -57,7 +56,7 @@ public void GivenJenkinsPipelineHasDuplicatedOriginVersionIsCalculatedProperly()`
`57`	`56`	`DirectoryHelper.DeleteDirectory(remoteRepositoryPath);`
`58`	`57`
`59`	`58`	`Environment.SetEnvironmentVariable(pipelineBranch, pipelineBranchOrig);`
`60`		`- Environment.SetEnvironmentVariable(Jenkins.EnvironmentVariableName, null);`
	`59`	`+ Environment.SetEnvironmentVariable("JENKINS_URL", null);`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,15 +123,15 @@ public Arguments ParseArguments(string[] commandLineArguments)`
`123`	`123`	`if (name.IsSwitch("u"))`
`124`	`124`	`{`
`125`	`125`	`EnsureArgumentValueCount(values);`
`126`		`- if (arguments.Authentication == null) arguments.Authentication = new Authentication();`
	`126`	`+ if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();`
`127`	`127`	`arguments.Authentication.Username = value;`
`128`	`128`	`continue;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`if (name.IsSwitch("p"))`
`132`	`132`	`{`
`133`	`133`	`EnsureArgumentValueCount(values);`
`134`		`- if (arguments.Authentication == null) arguments.Authentication = new Authentication();`
	`134`	`+ if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();`
`135`	`135`	`arguments.Authentication.Password = value;`
`136`	`136`	`continue;`
`137`	`137`	`}`
`@@ -413,14 +413,14 @@ private void AddAuthentication(Arguments arguments)`
`413`	`413`	`var username = environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");`
`414`	`414`	`if (!string.IsNullOrWhiteSpace(username))`
`415`	`415`	`{`
`416`		`- if (arguments.Authentication == null) arguments.Authentication = new Authentication();`
	`416`	`+ if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();`
`417`	`417`	`arguments.Authentication.Username = username;`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`var password = environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");`
`421`	`421`	`if (!string.IsNullOrWhiteSpace(password))`
`422`	`422`	`{`
`423`		`- if (arguments.Authentication == null) arguments.Authentication = new Authentication();`
	`423`	`+ if (arguments.Authentication == null) arguments.Authentication = new AuthenticationInfo();`
`424`	`424`	`arguments.Authentication.Username = password;`
`425`	`425`	`}`
`426`	`426`	`}`