Skip to content

Commit 4b0b47b

Browse files
committed
Replace the command line argument switches for GitVersion
Replace slash with dash in the command line argument switches for gitversion.exe, so it is more Unix friendly. It will still fail exeucting on OS X due to GitTools/GitVersion#890, but once that has been fixed, this should ensure that GitVersion executes successfully on OS X.
1 parent ff508d3 commit 4b0b47b

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/Cake.Common.Tests/Unit/Tools/GitVersion/GitVersionRunnerTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void Should_Add_OutputType_To_Arguments_If_Set()
9393
var result = fixture.Run();
9494

9595
// Then
96-
Assert.Equal("/output json", result.Args);
96+
Assert.Equal("-output json", result.Args);
9797
}
9898

9999
[Fact]
@@ -107,7 +107,7 @@ public void Should_Add_ShowVariable_To_Arguments_If_Set()
107107
var result = fixture.Run();
108108

109109
// Then
110-
Assert.Equal("/showvariable FullSemVer", result.Args);
110+
Assert.Equal("-showvariable FullSemVer", result.Args);
111111
}
112112

113113
[Fact]
@@ -122,7 +122,7 @@ public void Should_Add_Username_And_Password_To_Arguments_If_Set()
122122
var result = fixture.Run();
123123

124124
// Then
125-
Assert.Equal("/u \"bob\" /p \"password\"", result.Args);
125+
Assert.Equal("-u \"bob\" -p \"password\"", result.Args);
126126
}
127127

128128
[Fact]
@@ -136,7 +136,7 @@ public void Should_Add_UpdateAssemblyInfo_To_Arguments_If_Set()
136136
var result = fixture.Run();
137137

138138
// Then
139-
Assert.Equal("/updateassemblyinfo", result.Args);
139+
Assert.Equal("-updateassemblyinfo", result.Args);
140140
}
141141

142142
[Fact]
@@ -151,7 +151,7 @@ public void Should_Add_UpdateAssemblyInfoFilePath_To_Arguments_If_Set()
151151
var result = fixture.Run();
152152

153153
// Then
154-
Assert.Equal("/updateassemblyinfo \"c:/temp/assemblyinfo.cs\"", result.Args);
154+
Assert.Equal("-updateassemblyinfo \"c:/temp/assemblyinfo.cs\"", result.Args);
155155
}
156156

157157
[Fact]
@@ -165,7 +165,7 @@ public void Should_Add_RepositoryPath_To_Arguments_If_Set()
165165
var result = fixture.Run();
166166

167167
// Then
168-
Assert.Equal("/targetpath \"c:/temp\"", result.Args);
168+
Assert.Equal("-targetpath \"c:/temp\"", result.Args);
169169
}
170170

171171
[Fact]
@@ -182,7 +182,7 @@ public void Should_Add_DynamicRepoSettings_To_Arguments_If_Set()
182182
var result = fixture.Run();
183183

184184
// Then
185-
Assert.Equal("/url \"http://mygitrepo.co.uk\" /b master /c \"abcdef\" /dynamicRepoLocation \"c:/temp\"", result.Args);
185+
Assert.Equal("-url \"http://mygitrepo.co.uk\" -b master -c \"abcdef\" -dynamicRepoLocation \"c:/temp\"", result.Args);
186186
}
187187

188188
[Fact]
@@ -196,7 +196,7 @@ public void Should_Add_LogFilePath_To_Arguments_If_Set()
196196
var result = fixture.Run();
197197

198198
// Then
199-
Assert.Equal("/l \"c:/temp/gitversion.log\"", result.Args);
199+
Assert.Equal("-l \"c:/temp/gitversion.log\"", result.Args);
200200
}
201201
}
202202
}

src/Cake.Common/Tools/GitVersion/GitVersionRunner.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,34 +79,34 @@ private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
7979
switch (settings.OutputType.Value)
8080
{
8181
case GitVersionOutput.Json:
82-
builder.Append("/output");
82+
builder.Append("-output");
8383
builder.Append("json");
8484
break;
8585
case GitVersionOutput.BuildServer:
86-
builder.Append("/output");
86+
builder.Append("-output");
8787
builder.Append("buildserver");
8888
break;
8989
}
9090
}
9191

9292
if (!string.IsNullOrWhiteSpace(settings.ShowVariable))
9393
{
94-
builder.Append("/showvariable");
94+
builder.Append("-showvariable");
9595
builder.Append(settings.ShowVariable);
9696
}
9797

9898
if (!string.IsNullOrWhiteSpace(settings.UserName))
9999
{
100-
builder.Append("/u");
100+
builder.Append("-u");
101101
builder.AppendQuoted(settings.UserName);
102102

103-
builder.Append("/p");
103+
builder.Append("-p");
104104
builder.AppendQuotedSecret(settings.Password);
105105
}
106106

107107
if (settings.UpdateAssemblyInfo)
108108
{
109-
builder.Append("/updateassemblyinfo");
109+
builder.Append("-updateassemblyinfo");
110110

111111
if (settings.UpdateAssemblyInfoFilePath != null)
112112
{
@@ -116,17 +116,17 @@ private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
116116

117117
if (settings.RepositoryPath != null)
118118
{
119-
builder.Append("/targetpath");
119+
builder.Append("-targetpath");
120120
builder.AppendQuoted(settings.RepositoryPath.FullPath);
121121
}
122122
else if (!string.IsNullOrWhiteSpace(settings.Url))
123123
{
124-
builder.Append("/url");
124+
builder.Append("-url");
125125
builder.AppendQuoted(settings.Url);
126126

127127
if (!string.IsNullOrWhiteSpace(settings.Branch))
128128
{
129-
builder.Append("/b");
129+
builder.Append("-b");
130130
builder.Append(settings.Branch);
131131
}
132132
else
@@ -136,20 +136,20 @@ private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
136136

137137
if (!string.IsNullOrWhiteSpace(settings.Commit))
138138
{
139-
builder.Append("/c");
139+
builder.Append("-c");
140140
builder.AppendQuoted(settings.Commit);
141141
}
142142

143143
if (settings.DynamicRepositoryPath != null)
144144
{
145-
builder.Append("/dynamicRepoLocation");
145+
builder.Append("-dynamicRepoLocation");
146146
builder.AppendQuoted(settings.DynamicRepositoryPath.FullPath);
147147
}
148148
}
149149

150150
if (settings.LogFilePath != null)
151151
{
152-
builder.Append("/l");
152+
builder.Append("-l");
153153
builder.AppendQuoted(settings.LogFilePath.FullPath);
154154
}
155155

0 commit comments

Comments
 (0)