Skip to content

Commit 27d9d89

Browse files
committed
fixes for VsoAgent so that we can build on azure pipelines
1 parent 1c07af2 commit 27d9d89

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/GitVersionCore.Tests/ExecuteCoreTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GitTools.Testing;
1+
using GitTools.Testing;
22
using GitVersion;
33
using GitVersion.Helpers;
44
using GitVersionCore.Tests;
@@ -270,6 +270,7 @@ LogMessages RepositoryScope(ExecuteCore executeCore = null, Action<EmptyReposito
270270
// Make sure GitVersion doesn't trigger build server mode when we are running the tests
271271
Environment.SetEnvironmentVariable(AppVeyor.EnvironmentVariableName, null);
272272
Environment.SetEnvironmentVariable(TravisCI.EnvironmentVariableName, null);
273+
Environment.SetEnvironmentVariable(VsoAgent.EnvironmentVariableName, null);
273274
var debugBuilder = new StringBuilder();
274275
Action<string> debugLogger = s =>
275276
{
@@ -315,4 +316,4 @@ LogMessages RepositoryScope(ExecuteCore executeCore = null, Action<EmptyReposito
315316
Error = errorBuilder.ToString()
316317
};
317318
}
318-
}
319+
}

src/GitVersionCore/BuildServers/VsoAgent.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
namespace GitVersion
1+
namespace GitVersion
22
{
33
using System;
44
using System.Linq;
55
using System.Text.RegularExpressions;
66

77
public class VsoAgent : BuildServerBase
88
{
9+
public const string EnvironmentVariableName = "TF_BUILD";
10+
911
public override bool CanApplyToCurrentContext()
1012
{
11-
return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TF_BUILD"));
13+
return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableName));
1214
}
1315

1416
public override string[] GenerateSetParameterMessage(string name, string value)

src/GitVersionExe.Tests/GitVersionHelper.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Text;
@@ -40,6 +40,7 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
4040
new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, arguments.IsTeamCity ? "8.0.0" : null),
4141
new KeyValuePair<string, string>(AppVeyor.EnvironmentVariableName, null),
4242
new KeyValuePair<string, string>(TravisCI.EnvironmentVariableName, null),
43+
new KeyValuePair<string, string>(VsoAgent.EnvironmentVariableName, null),
4344
};
4445

4546
var exitCode = -1;
@@ -82,4 +83,4 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
8283

8384
return new ExecutionResults(exitCode, output.ToString(), logContents);
8485
}
85-
}
86+
}

src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="1.3.2"></PackageReference>
4747
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2"></PackageReference>
4848
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="1.3.2"></PackageReference>
49-
<PackageReference Include="Newtonsoft.Json" Version="8.0.3"></PackageReference>
49+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3"></PackageReference>
5050
<PackageReference Include="NSubstitute" Version="1.10.0"></PackageReference>
5151
<PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
5252
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>

0 commit comments

Comments
 (0)