Merge branch 'gitfool-gh2432' into develop

* gitfool-gh2432: Fix environment variable used by TFBuildAgentInfo.MachineName Fix TFBuildProvider.IsHostedAgent for Azure Pipelines
cake-build · Jan 7, 2019 · 37e79be · 37e79be
2 parents 62b3bda + fa13221
commit 37e79be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Cake.Common.Tests/Fixtures/Build/TFBuildInfoFixture.cs b/src/Cake.Common.Tests/Fixtures/Build/TFBuildInfoFixture.cs
@@ -29,7 +29,7 @@ public TFBuildInfoFixture()
  Environment.GetEnvironmentVariable("AGENT_WORKFOLDER").Returns(@"c:\agent\_work");
  Environment.GetEnvironmentVariable("AGENT_ID").Returns("71");
  Environment.GetEnvironmentVariable("AGENT_NAME").Returns("Agent-1");
- Environment.GetEnvironmentVariable("AGENT_MACHINE_NAME").Returns("BuildServer");
+ Environment.GetEnvironmentVariable("AGENT_MACHINENAME").Returns("BuildServer");
 
  // VSTS BuildInfo
  Environment.GetEnvironmentVariable("BUILD_BUILDID").Returns("100234");

diff --git a/src/Cake.Common/Build/TFBuild/Data/TFBuildAgentInfo.cs b/src/Cake.Common/Build/TFBuild/Data/TFBuildAgentInfo.cs
@@ -71,7 +71,7 @@ public TFBuildAgentInfo(ICakeEnvironment environment)
  /// <value>
  /// The name of the machine on which the agent is installed.
  /// </value>
- public string MachineName => GetEnvironmentString("AGENT_MACHINE_NAME");
+ public string MachineName => GetEnvironmentString("AGENT_MACHINENAME");
 
  /// <summary>
  /// Gets a value indicating whether the current agent is a hosted agent.

diff --git a/src/Cake.Common/Build/TFBuild/TFBuildProvider.cs b/src/Cake.Common/Build/TFBuild/TFBuildProvider.cs
@@ -77,8 +77,7 @@ public bool IsRunningOnTFS
  /// <c>true</c> if the current build is running on a hosted agent; otherwise, <c>false</c>.
  /// </value>
  private bool IsHostedAgent
- =>
- !string.IsNullOrWhiteSpace(_environment.GetEnvironmentVariable("AGENT_NAME")) &&
- _environment.GetEnvironmentVariable("AGENT_NAME") == "Hosted Agent";
+ => !string.IsNullOrWhiteSpace(_environment.GetEnvironmentVariable("AGENT_NAME")) &&
+ _environment.GetEnvironmentVariable("AGENT_NAME").StartsWith("Hosted");
  }
 }