Skip to content

Commit 6f029da

Browse files
authored
Update CommandLineUtils and adapt API (#27)
1 parent c721ba1 commit 6f029da

29 files changed

+148
-48
lines changed

build/config.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<NuGetPackageVersion>6.12.1</NuGetPackageVersion>
55
<NuGetTestHelpersVersion>2.1.38</NuGetTestHelpersVersion>
6-
<CommandLineUtilsVersion>2.0.0</CommandLineUtilsVersion>
6+
<CommandLineUtilsVersion>4.1.1</CommandLineUtilsVersion>
77
<FileSystemGlobbingVersion>2.0.0</FileSystemGlobbingVersion>
88
</PropertyGroup>
99

src/NupkgWrench/Commands/CompressCommand.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ internal static class CompressCommand
1212
{
1313
public static void Register(CommandLineApplication cmdApp, ILogger log)
1414
{
15-
cmdApp.Command("compress", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
15+
cmdApp.Command("compress", cmd =>
16+
{
17+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
18+
Run(cmd, log);
19+
});
1620
}
1721

1822
private static void Run(CommandLineApplication cmd, ILogger log)

src/NupkgWrench/Commands/ExtractCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ internal static class ExtractCommand
1111
{
1212
public static void Register(CommandLineApplication cmdApp, ILogger log)
1313
{
14-
cmdApp.Command("extract", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
14+
cmdApp.Command("extract", cmd =>
15+
{
16+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
17+
Run(cmd, log);
18+
});
1519
}
1620

1721
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -46,7 +50,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
4650
}
4751
}
4852

49-
var inputs = argRoot.Values;
53+
var inputs = new List<string>(argRoot.Values);
5054

5155
if (inputs.Count < 1)
5256
{

src/NupkgWrench/Commands/IdCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ internal static class IdCommand
99
{
1010
public static void Register(CommandLineApplication cmdApp, ILogger log)
1111
{
12-
cmdApp.Command("id", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
12+
cmdApp.Command("id", cmd =>
13+
{
14+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
15+
Run(cmd, log);
16+
});
1317
}
1418

1519
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -28,7 +32,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
2832

2933
cmd.OnExecute(() =>
3034
{
31-
var inputs = argRoot.Values;
35+
var inputs = new List<string>(argRoot.Values);
3236

3337
if (inputs.Count < 1)
3438
{

src/NupkgWrench/Commands/ListCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ internal static class ListCommand
99
{
1010
public static void Register(CommandLineApplication cmdApp, ILogger log)
1111
{
12-
cmdApp.Command("list", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
12+
cmdApp.Command("list", cmd =>
13+
{
14+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
15+
Run(cmd, log);
16+
});
1317
}
1418

1519
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -32,7 +36,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
3236
{
3337
try
3438
{
35-
var inputs = argRoot.Values;
39+
var inputs = new List<string>(argRoot.Values);
3640

3741
if (inputs.Count < 1)
3842
{

src/NupkgWrench/Commands/ReleaseCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ internal static class ReleaseCommand
1515
{
1616
public static void Register(CommandLineApplication cmdApp, ILogger log)
1717
{
18-
cmdApp.Command("release", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
18+
cmdApp.Command("release", cmd =>
19+
{
20+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
21+
Run(cmd, log);
22+
});
1923
}
2024

2125
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -71,7 +75,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
7175
throw new ArgumentException($"Invalid option combination. Specify only one of the following options: {stable.LongName}, {newVersion.LongName}, {label.LongName}, {fourParts.LongName}.");
7276
}
7377

74-
var inputs = argRoot.Values;
78+
var inputs = new List<string>(argRoot.Values);
7579

7680
if (inputs.Count < 1)
7781
{

src/NupkgWrench/Commands/UpdateFileNameCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ internal static class UpdateFileNameCommand
1111
{
1212
public static void Register(CommandLineApplication cmdApp, ILogger log)
1313
{
14-
cmdApp.Command("updatefilename", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
14+
cmdApp.Command("updatefilename", cmd =>
15+
{
16+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
17+
Run(cmd, log);
18+
});
1519
}
1620

1721
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -31,7 +35,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
3135

3236
cmd.OnExecute(() =>
3337
{
34-
var inputs = argRoot.Values;
38+
var inputs = new List<string>(argRoot.Values);
3539

3640
if (inputs.Count < 1)
3741
{

src/NupkgWrench/Commands/ValidateCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ internal static class ValidateCommand
1111
{
1212
public static void Register(CommandLineApplication cmdApp, ILogger log)
1313
{
14-
cmdApp.Command("validate", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
14+
cmdApp.Command("validate", cmd =>
15+
{
16+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
17+
Run(cmd, log);
18+
});
1519
}
1620

1721
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -34,7 +38,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
3438
{
3539
try
3640
{
37-
var inputs = argRoot.Values;
41+
var inputs = new List<string>(argRoot.Values);
3842

3943
if (inputs.Count < 1)
4044
{

src/NupkgWrench/Commands/VersionCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ internal static class VersionCommand
99
{
1010
public static void Register(CommandLineApplication cmdApp, ILogger log)
1111
{
12-
cmdApp.Command("version", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
12+
cmdApp.Command("version", cmd =>
13+
{
14+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
15+
Run(cmd, log);
16+
});
1317
}
1418

1519
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -30,7 +34,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
3034

3135
cmd.OnExecute(() =>
3236
{
33-
var inputs = argRoot.Values;
37+
var inputs = new List<string>(argRoot.Values);
3438

3539
if (inputs.Count < 1)
3640
{

src/NupkgWrench/FilesCommands/AddFilesCommand.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ internal static class AddFilesCommand
1010
{
1111
public static void Register(CommandLineApplication cmdApp, ILogger log)
1212
{
13-
cmdApp.Command("add", (cmd) => Run(cmd, log), throwOnUnexpectedArg: true);
13+
cmdApp.Command("add", cmd =>
14+
{
15+
cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
16+
Run(cmd, log);
17+
});
1418
}
1519

1620
private static void Run(CommandLineApplication cmd, ILogger log)
@@ -38,7 +42,7 @@ private static void Run(CommandLineApplication cmd, ILogger log)
3842

3943
cmd.OnExecute(() =>
4044
{
41-
var inputs = argRoot.Values;
45+
var inputs = new List<string>(argRoot.Values);
4246

4347
if (inputs.Count < 1)
4448
{

0 commit comments

Comments
 (0)