rename VsoAgent to AzurePipelines

arturcic · arturcic · commit c4672cd9b681 · 2019-10-17T12:02:31.000+03:00
diff --git a/src/GitVersionCore.Tests/BuildServers/AzurePipelinesBuildNumberTests.cs b/src/GitVersionCore.Tests/BuildServers/AzurePipelinesBuildNumberTests.cs
@@ -7,11 +7,11 @@
 namespace GitVersionCore.Tests.BuildServers
 {
     [TestFixture]
-    public class VsoAgentBuildNumberTests : TestBase
+    public class AzurePipelinesBuildNumberTests : TestBase
     {
         string key = "BUILD_BUILDNUMBER";
         string logPrefix = "##vso[build.updatebuildnumber]";
-        VsoAgent versionBuilder;
+        AzurePipelines versionBuilder;
 
         private IEnvironment environment;
         private ILog log;
@@ -21,11 +21,11 @@ public void SetUp()
         {
             environment = new TestEnvironment();
             log = new NullLog();
-            versionBuilder = new VsoAgent(environment, log);
+            versionBuilder = new AzurePipelines(environment, log);
         }
 
         [TearDown]
-        public void TearDownVsoAgentBuildNumberTest()
+        public void TearDownAzurePipelinesBuildNumberTest()
         {
             environment.SetEnvironmentVariable(key, null);
         }
@@ -35,7 +35,7 @@ public void TearDownVsoAgentBuildNumberTest()
         [TestCase("$(GITVERSION_FULLSEMVER)", "1.0.0", "1.0.0")]
         [TestCase("$(GitVersion.FullSemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
         [TestCase("$(GITVERSION_FULLSEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
-        public void VsoAgentBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)
+        public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)
         {
             environment.SetEnvironmentVariable(key, buildNumberFormat);
             var vars = new TestableVersionVariables(fullSemVer: myFullSemVer);
@@ -48,7 +48,7 @@ public void VsoAgentBuildNumberWithFullSemVer(string buildNumberFormat, string m
         [TestCase("$(GITVERSION_SEMVER)", "1.0.0", "1.0.0")]
         [TestCase("$(GitVersion.SemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
         [TestCase("$(GITVERSION_SEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
-        public void VsoAgentBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)
+        public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)
         {
             environment.SetEnvironmentVariable(key, buildNumberFormat);
             var vars = new TestableVersionVariables(semVer: mySemVer);
diff --git a/src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs b/src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs
@@ -7,7 +7,7 @@
 namespace GitVersionCore.Tests.BuildServers
 {
     [TestFixture]
-    public class VsoAgentTests : TestBase
+    public class AzurePipelinesTests : TestBase
     {
         string key = "BUILD_BUILDNUMBER";
 
@@ -31,7 +31,7 @@ public void ClearEnvironmentVariableForTest()
         [Test]
         public void Develop_branch()
         {
-            var versionBuilder = new VsoAgent(environment, log);
+            var versionBuilder = new AzurePipelines(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
             var vsVersion = versionBuilder.GenerateSetVersionMessage(vars);
 
@@ -41,7 +41,7 @@ public void Develop_branch()
         [Test]
         public void EscapeValues()
         {
-            var versionBuilder = new VsoAgent(environment, log);
+            var versionBuilder = new AzurePipelines(environment, log);
             var vsVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
 
             vsVersion[0].ShouldBe("##vso[task.setvariable variable=GitVersion.Foo;]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
@@ -52,7 +52,7 @@ public void MissingEnvShouldNotBlowUp()
         {
             environment.SetEnvironmentVariable(key, null);
 
-            var versionBuilder = new VsoAgent(environment, log);
+            var versionBuilder = new AzurePipelines(environment, log);
             var semver = "0.0.0-Unstable4";
             var vars = new TestableVersionVariables(fullSemVer: semver);
             var vsVersion = versionBuilder.GenerateSetVersionMessage(vars);
diff --git a/src/GitVersionCore.Tests/ExecuteCoreTests.cs b/src/GitVersionCore.Tests/ExecuteCoreTests.cs
@@ -426,7 +426,7 @@ private void RepositoryScope(ExecuteCore executeCore, Action<EmptyRepositoryFixt
             // Make sure GitVersion doesn't trigger build server mode when we are running the tests
             environment.SetEnvironmentVariable(AppVeyor.EnvironmentVariableName, null);
             environment.SetEnvironmentVariable(TravisCI.EnvironmentVariableName, null);
-            environment.SetEnvironmentVariable(VsoAgent.EnvironmentVariableName, null);
+            environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, null);
 
             using (var fixture = new EmptyRepositoryFixture())
             {
diff --git a/src/GitVersionCore/BuildServers/AzurePipelines.cs b/src/GitVersionCore/BuildServers/AzurePipelines.cs
@@ -8,9 +8,9 @@
 
 namespace GitVersion.BuildServers
 {
-    public class VsoAgent : BuildServerBase
+    public class AzurePipelines : BuildServerBase
     {
-        public VsoAgent(IEnvironment environment, ILog log) : base(environment, log)
+        public AzurePipelines(IEnvironment environment, ILog log) : base(environment, log)
         {
         }
 
@@ -28,14 +28,19 @@ public override string[] GenerateSetParameterMessage(string name, string value)
 
         public override string GetCurrentBranch(bool usingDynamicRepos)
         {
+            var pullRequestBranchName = Environment.GetEnvironmentVariable("SYSTEM_PULLREQUEST_SOURCEBRANCH");
+            if (!string.IsNullOrWhiteSpace(pullRequestBranchName))
+            {
+                return pullRequestBranchName;
+            }
             return Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");
         }
 
         public override bool PreventFetch() => true;
 
         public override string GenerateSetVersionMessage(VersionVariables variables)
         {
-            // For VSO, we'll get the Build Number and insert GitVersion variables where
+            // For AzurePipelines, we'll get the Build Number and insert GitVersion variables where
             // specified
             var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");
             if (string.IsNullOrWhiteSpace(buildNumberEnv))
diff --git a/src/GitVersionCore/BuildServers/BuildServerList.cs b/src/GitVersionCore/BuildServers/BuildServerList.cs
@@ -42,7 +42,7 @@ public static void Init(IEnvironment environment, ILog log)
                 new MyGet(environment, log),
                 new Jenkins(environment, log),
                 new GitLabCi(environment, log),
-                new VsoAgent(environment, log),
+                new AzurePipelines(environment, log),
                 new TravisCI(environment, log),
                 new EnvRun(environment, log),
                 new Drone(environment, log),
diff --git a/src/GitVersionExe.Tests/GitVersionHelper.cs b/src/GitVersionExe.Tests/GitVersionHelper.cs
@@ -41,7 +41,7 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
                     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>(VsoAgent.EnvironmentVariableName, null),
+                    new KeyValuePair<string, string>(AzurePipelines.EnvironmentVariableName, null),
                 };
 
             var exitCode = -1;

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`	`namespace GitVersionCore.Tests.BuildServers`
`8`	`8`	`{`
`9`	`9`	`[TestFixture]`
`10`		`- public class VsoAgentBuildNumberTests : TestBase`
	`10`	`+ public class AzurePipelinesBuildNumberTests : TestBase`
`11`	`11`	`{`
`12`	`12`	`string key = "BUILD_BUILDNUMBER";`
`13`	`13`	`string logPrefix = "##vso[build.updatebuildnumber]";`
`14`		`- VsoAgent versionBuilder;`
	`14`	`+ AzurePipelines versionBuilder;`
`15`	`15`
`16`	`16`	`private IEnvironment environment;`
`17`	`17`	`private ILog log;`
`@@ -21,11 +21,11 @@ public void SetUp()`
`21`	`21`	`{`
`22`	`22`	`environment = new TestEnvironment();`
`23`	`23`	`log = new NullLog();`
`24`		`- versionBuilder = new VsoAgent(environment, log);`
	`24`	`+ versionBuilder = new AzurePipelines(environment, log);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`[TearDown]`
`28`		`- public void TearDownVsoAgentBuildNumberTest()`
	`28`	`+ public void TearDownAzurePipelinesBuildNumberTest()`
`29`	`29`	`{`
`30`	`30`	`environment.SetEnvironmentVariable(key, null);`
`31`	`31`	`}`
`@@ -35,7 +35,7 @@ public void TearDownVsoAgentBuildNumberTest()`
`35`	`35`	`[TestCase("$(GITVERSION_FULLSEMVER)", "1.0.0", "1.0.0")]`
`36`	`36`	`[TestCase("$(GitVersion.FullSemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]`
`37`	`37`	`[TestCase("$(GITVERSION_FULLSEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]`
`38`		`- public void VsoAgentBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)`
	`38`	`+ public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)`
`39`	`39`	`{`
`40`	`40`	`environment.SetEnvironmentVariable(key, buildNumberFormat);`
`41`	`41`	`var vars = new TestableVersionVariables(fullSemVer: myFullSemVer);`
`@@ -48,7 +48,7 @@ public void VsoAgentBuildNumberWithFullSemVer(string buildNumberFormat, string m`
`48`	`48`	`[TestCase("$(GITVERSION_SEMVER)", "1.0.0", "1.0.0")]`
`49`	`49`	`[TestCase("$(GitVersion.SemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]`
`50`	`50`	`[TestCase("$(GITVERSION_SEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]`
`51`		`- public void VsoAgentBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)`
	`51`	`+ public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)`
`52`	`52`	`{`
`53`	`53`	`environment.SetEnvironmentVariable(key, buildNumberFormat);`
`54`	`54`	`var vars = new TestableVersionVariables(semVer: mySemVer);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace GitVersionCore.Tests.BuildServers`
`8`	`8`	`{`
`9`	`9`	`[TestFixture]`
`10`		`- public class VsoAgentTests : TestBase`
	`10`	`+ public class AzurePipelinesTests : TestBase`
`11`	`11`	`{`
`12`	`12`	`string key = "BUILD_BUILDNUMBER";`
`13`	`13`
`@@ -31,7 +31,7 @@ public void ClearEnvironmentVariableForTest()`
`31`	`31`	`[Test]`
`32`	`32`	`public void Develop_branch()`
`33`	`33`	`{`
`34`		`- var versionBuilder = new VsoAgent(environment, log);`
	`34`	`+ var versionBuilder = new AzurePipelines(environment, log);`
`35`	`35`	`var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");`
`36`	`36`	`var vsVersion = versionBuilder.GenerateSetVersionMessage(vars);`
`37`	`37`
`@@ -41,7 +41,7 @@ public void Develop_branch()`
`41`	`41`	`[Test]`
`42`	`42`	`public void EscapeValues()`
`43`	`43`	`{`
`44`		`- var versionBuilder = new VsoAgent(environment, log);`
	`44`	`+ var versionBuilder = new AzurePipelines(environment, log);`
`45`	`45`	`var vsVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");`
`46`	`46`
`47`	`47`	`vsVersion[0].ShouldBe("##vso[task.setvariable variable=GitVersion.Foo;]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");`
`@@ -52,7 +52,7 @@ public void MissingEnvShouldNotBlowUp()`
`52`	`52`	`{`
`53`	`53`	`environment.SetEnvironmentVariable(key, null);`
`54`	`54`
`55`		`- var versionBuilder = new VsoAgent(environment, log);`
	`55`	`+ var versionBuilder = new AzurePipelines(environment, log);`
`56`	`56`	`var semver = "0.0.0-Unstable4";`
`57`	`57`	`var vars = new TestableVersionVariables(fullSemVer: semver);`
`58`	`58`	`var vsVersion = versionBuilder.GenerateSetVersionMessage(vars);`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ private void RepositoryScope(ExecuteCore executeCore, Action<EmptyRepositoryFixt`
`426`	`426`	`// Make sure GitVersion doesn't trigger build server mode when we are running the tests`
`427`	`427`	`environment.SetEnvironmentVariable(AppVeyor.EnvironmentVariableName, null);`
`428`	`428`	`environment.SetEnvironmentVariable(TravisCI.EnvironmentVariableName, null);`
`429`		`- environment.SetEnvironmentVariable(VsoAgent.EnvironmentVariableName, null);`
	`429`	`+ environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, null);`
`430`	`430`
`431`	`431`	`using (var fixture = new EmptyRepositoryFixture())`
`432`	`432`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`
`9`	`9`	`namespace GitVersion.BuildServers`
`10`	`10`	`{`
`11`		`- public class VsoAgent : BuildServerBase`
	`11`	`+ public class AzurePipelines : BuildServerBase`
`12`	`12`	`{`
`13`		`- public VsoAgent(IEnvironment environment, ILog log) : base(environment, log)`
	`13`	`+ public AzurePipelines(IEnvironment environment, ILog log) : base(environment, log)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`@@ -28,14 +28,19 @@ public override string[] GenerateSetParameterMessage(string name, string value)`
`28`	`28`
`29`	`29`	`public override string GetCurrentBranch(bool usingDynamicRepos)`
`30`	`30`	`{`
	`31`	`+ var pullRequestBranchName = Environment.GetEnvironmentVariable("SYSTEM_PULLREQUEST_SOURCEBRANCH");`
	`32`	`+ if (!string.IsNullOrWhiteSpace(pullRequestBranchName))`
	`33`	`+ {`
	`34`	`+ return pullRequestBranchName;`
	`35`	`+ }`
`31`	`36`	`return Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");`
`32`	`37`	`}`
`33`	`38`
`34`	`39`	`public override bool PreventFetch() => true;`
`35`	`40`
`36`	`41`	`public override string GenerateSetVersionMessage(VersionVariables variables)`
`37`	`42`	`{`
`38`		`- // For VSO, we'll get the Build Number and insert GitVersion variables where`
	`43`	`+ // For AzurePipelines, we'll get the Build Number and insert GitVersion variables where`
`39`	`44`	`// specified`
`40`	`45`	`var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");`
`41`	`46`	`if (string.IsNullOrWhiteSpace(buildNumberEnv))`