Skip to content

Escape TeamCity parameter values, fixes #94 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2014
Merged

Escape TeamCity parameter values, fixes #94 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions GitFlowVersion/BuildServers/TeamCity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,26 @@ public void PerformPreProcessingSteps(string gitDirectory)

public string GenerateSetParameterMessage(string name, string value)
{
return string.Format("##teamcity[setParameter name='GitFlowVersion.{0}' value='{1}']", name, value);
return string.Format("##teamcity[setParameter name='GitFlowVersion.{0}' value='{1}']", name, EscapeValue(value));
}

public string GenerateSetVersionMessage(string versionToUseForBuildNumber)
{
return string.Format("##teamcity[buildNumber '{0}']", versionToUseForBuildNumber);
return string.Format("##teamcity[buildNumber '{0}']", EscapeValue(versionToUseForBuildNumber));
}

static string EscapeValue(string value)
{
// List of escape values from http://confluence.jetbrains.com/display/TCD8/Build+Script+Interaction+with+TeamCity

value = value.Replace("|", "||");
value = value.Replace("'", "|'");
value = value.Replace("[", "|[");
value = value.Replace("]", "|]");
value = value.Replace("\r", "|r");
value = value.Replace("\n", "|n");

return value;
}
}
}
8 changes: 8 additions & 0 deletions Tests/BuildServers/TeamCityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,12 @@ public void Develop_branch()
Assert.AreEqual("##teamcity[buildNumber '0.0.0-Unstable4']", tcVersion);
}

[Test]
public void EscapeValues()
{
var versionBuilder = new TeamCity();
var tcVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
Assert.AreEqual("##teamcity[setParameter name='GitFlowVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion);
}

}