Skip to content

Commit bfbd16f

Browse files
committed
(GH-25) Update to latest Cake internals
1 parent d582604 commit bfbd16f

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

src/Cake.AppVeyor.Tests/Fakes/FakeCakeArguments.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
using System;
22
using Cake.Core;
33
using System.Collections.Generic;
4+
using System.Linq;
45

56
namespace Cake.AppVeyor.Fakes
67
{
78
internal sealed class FakeCakeArguments : ICakeArguments
89
{
9-
private readonly Dictionary<string, string> _arguments;
10+
private readonly Dictionary<string, List<string>> _arguments;
1011

1112
/// <summary>
1213
/// Gets the arguments.
1314
/// </summary>
1415
/// <value>The arguments.</value>
15-
public IReadOnlyDictionary<string, string> Arguments
16+
public IReadOnlyDictionary<string, List<string>> Arguments
1617
{
1718
get { return _arguments; }
1819
}
@@ -22,14 +23,14 @@ public IReadOnlyDictionary<string, string> Arguments
2223
/// </summary>
2324
public FakeCakeArguments()
2425
{
25-
_arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
26+
_arguments = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
2627
}
2728

2829
/// <summary>
2930
/// Initializes the argument list.
3031
/// </summary>
3132
/// <param name="arguments">The arguments.</param>
32-
public void SetArguments(IDictionary<string, string> arguments)
33+
public void SetArguments(IDictionary<string, List<string>> arguments)
3334
{
3435
if (arguments == null)
3536
{
@@ -61,8 +62,13 @@ public bool HasArgument(string name)
6162
/// <returns>The argument value.</returns>
6263
public string GetArgument(string name)
6364
{
64-
return _arguments.ContainsKey(name)
65-
? _arguments[name] : null;
65+
return GetArguments(name).LastOrDefault();
66+
}
67+
68+
public ICollection<string> GetArguments(string name)
69+
{
70+
_arguments.TryGetValue(name, out var arguments);
71+
return arguments ?? (ICollection<string>)Array.Empty<string>();
6672
}
6773
}
6874
}

src/Cake.AppVeyor.Tests/Fakes/FakeCakeContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ public FakeCakeContext()
2020

2121
log = new FakeLog();
2222
var fileSystem = new FileSystem();
23-
var environment = new CakeEnvironment(new CakePlatform(), new CakeRuntime(), log);
23+
var environment = new CakeEnvironment(new CakePlatform(), new CakeRuntime());
2424
var globber = new Globber(fileSystem, environment);
2525
var args = new FakeCakeArguments();
2626
var registry = new WindowsRegistry();
2727
var toolRepo = new ToolRepository(environment);
2828
var config = new Core.Configuration.CakeConfigurationProvider(fileSystem, environment).CreateConfiguration(testsDir, new Dictionary<string, string>());
29-
var toolResolutionStrategy = new ToolResolutionStrategy(fileSystem, environment, globber, config);
29+
var toolResolutionStrategy = new ToolResolutionStrategy(fileSystem, environment, globber, config, log);
3030
var toolLocator = new ToolLocator(environment, toolRepo, toolResolutionStrategy);
3131
var processRunner = new ProcessRunner(fileSystem, environment, log, toolLocator, config);
3232
var data = Substitute.For<ICakeDataService>();

0 commit comments

Comments
 (0)