wip

nuke-build · Sep 3, 2024 · 6fb353e · 6fb353e
1 parent 899b866
commit 6fb353e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/source/Nuke.Tooling.Tests/ToolOptionsArgumentsTest.cs b/source/Nuke.Tooling.Tests/ToolOptionsArgumentsTest.cs
@@ -137,6 +137,7 @@ public void TestList()
         Assert<ListToolOptions>(new { SimpleList = new[] { "a", "b" } }, ["--param", "a", "--param", "b"]);
         Assert<ListToolOptions>(new { SeparatorList = new[] { "a", "b" } }, ["--param", "a+b"]);
         Assert<ListToolOptions>(new { WhitespaceList = new[] { "a", "b" } }, ["--param", "a", "b"]);
+        Assert<ListToolOptions>(new { QuotedList = new[] { "a", "b" } }, ["--param:\"a b\""]);
         Assert<ListToolOptions>(new { FormattedList = new[] { "true", "false" } }, ["--param=TRUE", "--param=FALSE"]);
     }
 
@@ -145,7 +146,8 @@ private class ListToolOptions : ToolOptions
     {
         [Argument(Format = "--param {value}")] public IReadOnlyList<string> SimpleList => Get<List<string>>(() => SimpleList);
         [Argument(Format = "--param {value}", Separator = "+")] public IReadOnlyList<string> SeparatorList => Get<List<string>>(() => SeparatorList);
-        [Argument(Format = "--param {value}", Separator = " ")] public IReadOnlyList<string> WhitespaceList => Get<List<string>>(() => SeparatorList);
+        [Argument(Format = "--param {value}", Separator = " ")] public IReadOnlyList<string> WhitespaceList => Get<List<string>>(() => WhitespaceList);
+        [Argument(Format = "--param:{value}", Separator = " ", QuoteMultiple = true)] public IReadOnlyList<string> QuotedList => Get<List<string>>(() => QuotedList);
         [Argument(Format = "--param={value}", FormatterMethod = nameof(Format))] public IReadOnlyList<bool> FormattedList => Get<List<bool>>(() => FormattedList);
 
         private string Format(bool value, PropertyInfo property) => value.ToString().ToUpperInvariant();

diff --git a/source/Nuke.Tooling/New/ToolOptions.Arguments.cs b/source/Nuke.Tooling/New/ToolOptions.Arguments.cs
@@ -37,6 +37,7 @@ public class ArgumentAttribute : Attribute
     public string FormatterMethod { get; set; }
 
     public string Separator { get; set; }
+    public bool QuoteMultiple { get; set; }
 }
 
 public class BuilderAttribute : Attribute

diff --git a/source/Nuke.Tooling/NuGetToolPathResolver.cs b/source/Nuke.Tooling/NuGetToolPathResolver.cs
@@ -67,8 +67,8 @@ static string GetPackageExecutable(IEnumerable<string> executables)
         if (frameworks.Count == 1)
             return GetPackageExecutable(frameworks.Single());
 
-        framework ??= Assembly.GetEntryAssembly().NotNull().GetCustomAttribute<TargetFrameworkAttribute>()
-            .FrameworkDisplayName.Replace(".NET ", "net");
+        framework ??= (Assembly.GetEntryAssembly()?.GetCustomAttribute<TargetFrameworkAttribute>()
+            ?.FrameworkDisplayName?.Replace(".NET ", "net")).NotNull();
         var sortedFrameworks = frameworks.Select(x => x.Key)
             .OrderBy(x => x == framework)
             .ThenBy(x => x.Contains("."))