Skip to content

uses c# 7 features #27

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

Open
manne wants to merge 1 commit into
base: master
Choose a base branch
from
Open

uses c# 7 features #27

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
7 changes: 1 addition & 6 deletions Source/Cake.Paket.Addin/Tooling/PaketTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ internal class PaketTool<TSettings> : Tool<TSettings>
protected PaketTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools, IPaketToolResolver resolver)
: base(fileSystem, environment, processRunner, tools)
{
if (resolver == null)
{
throw new ArgumentNullException(nameof(resolver));
}

Resolver = resolver;
Resolver = resolver ?? throw new ArgumentNullException(nameof(resolver));
}

private IPaketToolResolver Resolver { get; }
Expand Down
61 changes: 12 additions & 49 deletions Source/Cake.Paket.Addin/Tooling/PaketToolResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,42 +24,12 @@ internal sealed class PaketToolResolver : IPaketToolResolver
/// <param name="log">The log.</param>
internal PaketToolResolver(IFileSystem fileSystem, ICakeEnvironment environment, IToolLocator tools, IProcessRunner processRunner, ICakeArguments arguments, ICakeLog log)
{
if (fileSystem == null)
{
throw new ArgumentNullException(nameof(fileSystem));
}

if (environment == null)
{
throw new ArgumentNullException(nameof(environment));
}

if (tools == null)
{
throw new ArgumentNullException(nameof(tools));
}

if (processRunner == null)
{
throw new ArgumentNullException(nameof(processRunner));
}

if (arguments == null)
{
throw new ArgumentNullException(nameof(arguments));
}

if (log == null)
{
throw new ArgumentNullException(nameof(log));
}

FileSystem = fileSystem;
Environment = environment;
Tools = tools;
ProcessRunner = processRunner;
Arguments = arguments;
Log = log;
FileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
Environment = environment ?? throw new ArgumentNullException(nameof(environment));
Tools = tools ?? throw new ArgumentNullException(nameof(tools));
ProcessRunner = processRunner ?? throw new ArgumentNullException(nameof(processRunner));
Arguments = arguments ?? throw new ArgumentNullException(nameof(arguments));
Log = log ?? throw new ArgumentNullException(nameof(log));
}

private IFileSystem FileSystem { get; }
Expand Down Expand Up @@ -117,8 +87,7 @@ private DirectoryPath Try2GetDotPaket(out bool wasResolved)

private FilePath Try2GetExeInDotPaket(string exe, out bool wasResolved)
{
bool gotDotPaket;
var dotPaket = Try2GetDotPaket(out gotDotPaket);
var dotPaket = Try2GetDotPaket(out var gotDotPaket);
if (gotDotPaket)
{
var e = FileSystem.GetFile(dotPaket.CombineWithFilePath(new FilePath(exe)));
Expand All @@ -135,8 +104,7 @@ private FilePath Try2GetExeInDotPaket(string exe, out bool wasResolved)

private FilePath Try2ResolvePath2PaketExe(out bool wasResolved)
{
bool gotIt;
var paketExe = Try2GetExeInDotPaket("paket.exe", out gotIt);
var paketExe = Try2GetExeInDotPaket("paket.exe", out var gotIt);
if (gotIt)
{
wasResolved = true;
Expand Down Expand Up @@ -169,8 +137,7 @@ private FilePath Try2ResolvePath2PaketBootStrapperExe(out bool wasResolved)
}
}

bool gotIt;
var paketBootStrapperExe = Try2GetExeInDotPaket("paket.bootstrapper.exe", out gotIt);
var paketBootStrapperExe = Try2GetExeInDotPaket("paket.bootstrapper.exe", out var gotIt);
if (gotIt)
{
wasResolved = true;
Expand Down Expand Up @@ -200,14 +167,12 @@ private bool RunPaketBootStrapperExe(FilePath paketBootStrapperExe)

private FilePath Try2ResolvePath2PaketExeByRunningPaketBootStrapperExeFirst(out bool wasResolved)
{
bool paketBootStrapperExeWasResolved;
var paketBootStrapperExe = Try2ResolvePath2PaketBootStrapperExe(out paketBootStrapperExeWasResolved);
var paketBootStrapperExe = Try2ResolvePath2PaketBootStrapperExe(out var paketBootStrapperExeWasResolved);
if (paketBootStrapperExeWasResolved)
{
if (RunPaketBootStrapperExe(paketBootStrapperExe))
{
bool paketExeWasResolved;
var paketExe = Try2ResolvePath2PaketExe(out paketExeWasResolved);
var paketExe = Try2ResolvePath2PaketExe(out var paketExeWasResolved);
if (paketExeWasResolved)
{
wasResolved = true;
Expand All @@ -222,9 +187,7 @@ private FilePath Try2ResolvePath2PaketExeByRunningPaketBootStrapperExeFirst(out

private FilePath ResolvePath2PaketExe()
{
bool paketExeWasResolved;

var paketExe = Try2ResolvePath2PaketExe(out paketExeWasResolved);
var paketExe = Try2ResolvePath2PaketExe(out var paketExeWasResolved);
if (paketExeWasResolved)
{
return paketExe;
Expand Down