Skip to content

Commit 29cd1c2

Browse files
committed
Removed normalisation from build server
1 parent afd64db commit 29cd1c2

File tree

15 files changed

+46
-130
lines changed

15 files changed

+46
-130
lines changed

GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ public override bool CanApplyToCurrentContext()
3535
throw new NotImplementedException();
3636
}
3737

38-
public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
39-
{
40-
throw new NotImplementedException();
41-
}
42-
4338
public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
4439
{
4540
return versionToUseForBuildNumber;

GitVersionCore.Tests/BuildServers/ContinuaCiTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ public class ContinuaCiTests
88
[Test]
99
public void GenerateBuildVersion()
1010
{
11-
var authentication = new Authentication();
12-
var versionBuilder = new ContinuaCi(authentication);
11+
var versionBuilder = new ContinuaCi();
1312
var continuaCiVersion = versionBuilder.GenerateSetVersionMessage("0.0.0-Beta4.7");
1413
Assert.AreEqual("@@continua[setBuildVersion value='0.0.0-Beta4.7']", continuaCiVersion);
1514
}

GitVersionCore.Tests/BuildServers/MyGetTests.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,23 @@ public class MyGetTests
77
[Test]
88
public void Develop_branch()
99
{
10-
var authentication = new Authentication();
11-
var versionBuilder = new MyGet(authentication);
10+
var versionBuilder = new MyGet();
1211
var message = versionBuilder.GenerateSetVersionMessage("0.0.0-Unstable4");
1312
Assert.AreEqual(null, message);
1413
}
1514

1615
[Test]
1716
public void EscapeValues()
1817
{
19-
var authentication = new Authentication();
20-
var versionBuilder = new MyGet(authentication);
18+
var versionBuilder = new MyGet();
2119
var message = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
2220
Assert.AreEqual("##myget[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", message[0]);
2321
}
2422

2523
[Test]
2624
public void BuildNumber()
2725
{
28-
var authentication = new Authentication();
29-
var versionBuilder = new MyGet(authentication);
26+
var versionBuilder = new MyGet();
3027
var message = versionBuilder.GenerateSetParameterMessage("LegacySemVerPadded", "0.8.0-unstable568");
3128
Assert.AreEqual("##myget[buildNumber '0.8.0-unstable568']", message[1]);
3229
}

GitVersionCore.Tests/BuildServers/TeamCityTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ public class TeamCityTests
77
[Test]
88
public void Develop_branch()
99
{
10-
var authentication = new Authentication();
11-
var versionBuilder = new TeamCity(authentication);
10+
var versionBuilder = new TeamCity();
1211
var tcVersion = versionBuilder.GenerateSetVersionMessage("0.0.0-Unstable4");
1312
Assert.AreEqual("##teamcity[buildNumber '0.0.0-Unstable4']", tcVersion);
1413
}
1514

1615
[Test]
1716
public void EscapeValues()
1817
{
19-
var authentication = new Authentication();
20-
var versionBuilder = new TeamCity(authentication);
18+
var versionBuilder = new TeamCity();
2119
var tcVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
2220
Assert.AreEqual("##teamcity[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[0]);
2321
Assert.AreEqual("##teamcity[setParameter name='system.GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[1]);

GitVersionCore/BuildServers/AppVeyor.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,11 @@
66

77
public class AppVeyor : BuildServerBase
88
{
9-
Authentication authentication;
10-
11-
public AppVeyor(Authentication authentication)
12-
{
13-
this.authentication = authentication;
14-
}
15-
169
public override bool CanApplyToCurrentContext()
1710
{
1811
return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR"));
1912
}
2013

21-
public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
22-
{
23-
if (string.IsNullOrEmpty(gitDirectory))
24-
{
25-
throw new WarningException("Failed to find .git directory on agent.");
26-
}
27-
28-
GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
29-
}
30-
3114
public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
3215
{
3316
var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");

GitVersionCore/BuildServers/BuildServerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
public abstract class BuildServerBase : IBuildServer
66
{
77
public abstract bool CanApplyToCurrentContext();
8-
public abstract void PerformPreProcessingSteps(string gitDirectory, bool noFetch);
98
public abstract string GenerateSetVersionMessage(string versionToUseForBuildNumber);
109
public abstract string[] GenerateSetParameterMessage(string name, string value);
1110

GitVersionCore/BuildServers/BuildServerList.cs

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,16 @@
55

66
public static class BuildServerList
77
{
8-
static List<IBuildServer> BuildServers;
9-
10-
public static Func<Authentication, IEnumerable<IBuildServer>> Selector = arguments => DefaultSelector(arguments);
11-
12-
public static void ResetSelector()
13-
{
14-
Selector = DefaultSelector;
15-
}
16-
17-
public static IEnumerable<IBuildServer> GetApplicableBuildServers(Authentication authentication)
8+
static List<IBuildServer> BuildServers = new List<IBuildServer>
189
{
19-
return Selector(authentication);
20-
}
10+
new ContinuaCi(),
11+
new TeamCity(),
12+
new AppVeyor(),
13+
new MyGet()
14+
};
2115

22-
static IEnumerable<IBuildServer> DefaultSelector(Authentication authentication)
16+
public static IEnumerable<IBuildServer> GetApplicableBuildServers()
2317
{
24-
if (BuildServers == null)
25-
{
26-
BuildServers = new List<IBuildServer>
27-
{
28-
new ContinuaCi(authentication),
29-
new TeamCity(authentication),
30-
new AppVeyor(authentication),
31-
new MyGet(authentication)
32-
};
33-
}
34-
3518
var buildServices = new List<IBuildServer>();
3619

3720
foreach (var buildServer in BuildServers)

GitVersionCore/BuildServers/ContinuaCi.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44

55
public class ContinuaCi : BuildServerBase
66
{
7-
Authentication authentication;
8-
9-
public ContinuaCi(Authentication authentication)
10-
{
11-
this.authentication = authentication;
12-
}
13-
147
public override bool CanApplyToCurrentContext()
158
{
169
const string KeyName = @"Software\VSoft Technologies\Continua CI Agent";
@@ -28,16 +21,6 @@ public override bool CanApplyToCurrentContext()
2821
return false;
2922
}
3023

31-
public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
32-
{
33-
if (string.IsNullOrEmpty(gitDirectory))
34-
{
35-
throw new WarningException("Failed to find .git directory on agent");
36-
}
37-
38-
GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
39-
}
40-
4124
public override string[] GenerateSetParameterMessage(string name, string value)
4225
{
4326
return new[]

GitVersionCore/BuildServers/IBuildServer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
public interface IBuildServer
66
{
77
bool CanApplyToCurrentContext();
8-
void PerformPreProcessingSteps(string gitDirectory, bool noFetch);
98
string GenerateSetVersionMessage(string versionToUseForBuildNumber);
109
string[] GenerateSetParameterMessage(string name, string value);
1110

GitVersionCore/BuildServers/MyGet.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55

66
public class MyGet : BuildServerBase
77
{
8-
Authentication authentication;
9-
10-
public MyGet(Authentication authentication)
11-
{
12-
this.authentication = authentication;
13-
}
14-
158
public override bool CanApplyToCurrentContext()
169
{
1710
var buildRunner = Environment.GetEnvironmentVariable("BuildRunner");
@@ -20,16 +13,6 @@ public override bool CanApplyToCurrentContext()
2013
&& buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);
2114
}
2215

23-
public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
24-
{
25-
if (string.IsNullOrEmpty(gitDirectory))
26-
{
27-
throw new WarningException("Failed to find .git directory on agent.");
28-
}
29-
30-
GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
31-
}
32-
3316
public override string[] GenerateSetParameterMessage(string name, string value)
3417
{
3518
var messages = new List<string>

0 commit comments

Comments
 (0)