Skip to content

Commit a03bf5f

Browse files
committed
fix appveyor build
1 parent 71ee221 commit a03bf5f

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ install:
99
- set PATH=C:\Ruby25-x64\bin;%PATH%
1010

1111
build_script:
12-
- pwsh: ./build.ps1 -script build.cake -target Default
12+
- pwsh: ./build.ps1 -script build.cake -target Default -verbosity Diagnostic
1313

1414
test: off
1515
skip_tags: true

src/GitVersionCore/BuildServers/AppVeyor.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ public override string[] GenerateSetParameterMessage(string name, string value)
6666
$"Adding Environment Variable. name='GitVersion_{name}' value='{value}']"
6767
};
6868
}
69+
70+
public override string GetCurrentBranch(bool usingDynamicRepos)
71+
{
72+
return Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
73+
}
74+
6975
public override bool PreventFetch() => false;
7076
}
7177
}

src/GitVersionCore/Log/FileAppender.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void WriteTo(LogLevel level, string message)
3131
WriteLogEntry(filePath, message);
3232
}
3333
}
34-
catch (Exception ex)
34+
catch (Exception)
3535
{
3636
//
3737
}

src/GitVersionCore/Log/LogExtensions.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static void Write(this ILog log, LogLevel level, string format, params ob
9090
if (log == null)
9191
return;
9292

93-
var verbosity = verbosityMaps[level];
93+
var verbosity = GetVerbosityForLevel(level);
9494
if (verbosity > log.Verbosity)
9595
{
9696
return;
@@ -118,7 +118,7 @@ public static void Write(this ILog log, LogLevel level, LogAction logAction)
118118
if (log == null || logAction == null)
119119
return;
120120

121-
var verbosity = verbosityMaps[level];
121+
var verbosity = GetVerbosityForLevel(level);
122122
if (verbosity > log.Verbosity)
123123
{
124124
return;
@@ -164,7 +164,9 @@ public static IDisposable WithVerbosity(this ILog log, Verbosity verbosity)
164164
return Disposable.Create(() => log.Verbosity = lastVerbosity);
165165
}
166166

167-
private static IDictionary<LogLevel, Verbosity> verbosityMaps = new Dictionary<LogLevel, Verbosity>
167+
public static Verbosity GetVerbosityForLevel(LogLevel level) => verbosityMaps[level];
168+
169+
private static readonly IDictionary<LogLevel, Verbosity> verbosityMaps = new Dictionary<LogLevel, Verbosity>
168170
{
169171
{ LogLevel.Debug, Verbosity.Diagnostic },
170172
{ LogLevel.Info, Verbosity.Normal },

src/GitVersionExe/ArgumentParser.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,12 @@ public Arguments ParseArguments(List<string> commandLineArguments)
379379

380380
if (name.IsSwitch("verbosity"))
381381
{
382-
if (!Enum.TryParse(value, true, out arguments.Verbosity))
382+
// first try the old version
383+
if (Enum.TryParse(value, true, out LogLevel logLevel))
384+
{
385+
arguments.Verbosity = LogExtensions.GetVerbosityForLevel(logLevel);
386+
}
387+
else if (!Enum.TryParse(value, true, out arguments.Verbosity))
383388
{
384389
throw new WarningException($"Could not parse Verbosity value '{value}'");
385390
}

src/GitVersionExe/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Program
1010
{
1111
static void Main()
1212
{
13-
var log = new Logging.Log();
13+
var log = new Log();
1414
var fileSystem = new FileSystem();
1515
var environment = new Environment();
1616
var argumentParser = new ArgumentParser(fileSystem, log);

0 commit comments

Comments
 (0)