Skip to content

Switch to System.CommandLine for .NET Framework compatibility #402

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

Merged
sensslen merged 7 commits into from
Jan 21, 2026
Merged

Switch to System.CommandLine for .NET Framework compatibility #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd1bdbc
Initial plan
Copilot Jan 21, 2026
49fa88d
Replace McMaster.CommandLine with System.CommandLine
Copilot Jan 21, 2026
561e877
Fix code formatting to match project style
Copilot Jan 21, 2026
1eb5967
Fix typo in file-output option description
Copilot Jan 21, 2026
0f33f32
Final testing and validation complete
Copilot Jan 21, 2026
76259a8
Update to release version of System.CommandLine
sensslen Jan 21, 2026
5b906ce
remove checked in executable
sensslen Jan 21, 2026
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
2 changes: 1 addition & 1 deletion src/NuGetLicense/NuGetLicense.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageReference Include="System.CommandLine" Version="2.0.2" />
<PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.0" />
<PackageReference Include="TestableIO.System.IO.Abstractions.Analyzers" Version="2022.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
397 changes: 216 additions & 181 deletions src/NuGetLicense/Program.cs
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions src/NuGetLicenseCore/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
// Licensed to the projects contributors.
// The license conditions are provided in the LICENSE file located in the project root

using McMaster.Extensions.CommandLineUtils;
using NuGetUtility;
using System.CommandLine;

namespace NuGetLicenseCore
{
public static class Program
{
public static async Task Main(string[] args)
public static async Task<int> Main(string[] args)
{
var lifetime = new AppLifetime();
int returnCode = await CommandLineApplication.ExecuteAsync<NuGetLicense.Program>(args, lifetime.Token);
lifetime.Done(returnCode);
RootCommand rootCommand = NuGetLicense.Program.CreateRootCommand();
ParseResult parseResult = rootCommand.Parse(args);
return await parseResult.InvokeAsync();
}
}
}
11 changes: 5 additions & 6 deletions src/NuGetLicenseFramework/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
// Licensed to the projects contributors.
// The license conditions are provided in the LICENSE file located in the project root

using McMaster.Extensions.CommandLineUtils;
using NuGetUtility;
using System.CommandLine;

namespace NuGetLicenseFramework
{
public static class Program
{
public static async Task Main(string[] args)
public static async Task<int> Main(string[] args)
{
var lifetime = new AppLifetime();
int returnCode = await CommandLineApplication.ExecuteAsync<NuGetLicense.Program>(args, lifetime.Token);
lifetime.Done(returnCode);
RootCommand rootCommand = NuGetLicense.Program.CreateRootCommand();
ParseResult parseResult = rootCommand.Parse(args);
return await parseResult.InvokeAsync();
}
}
}
63 changes: 0 additions & 63 deletions src/NuGetUtility/AppLifetime.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/FileLicenseMatcher.Test/FileLicenseMatcher.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="TUnit" Version="1.12.3" />
<PackageReference Include="TUnit" Version="1.12.15" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion tests/NuGetUtility.UrlToLicenseMapping.Test/NuGetUtility.UrlToLicenseMapping.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="TUnit" Version="1.12.3" />
<PackageReference Include="TUnit" Version="1.12.15" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions tests/targets/PackagesConfigProject/PackagesConfigProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="TinyCsvParser, Version=2.7.1.0, Culture=neutral, PublicKeyToken=d7df35b038077099, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\TinyCsvParser.2.7.1\lib\netstandard2.0\TinyCsvParser.dll</HintPath>
<Reference Include="TinyCsvParser, Version=2.7.2.0, Culture=neutral, PublicKeyToken=d7df35b038077099, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\TinyCsvParser.2.7.2\lib\netstandard2.0\TinyCsvParser.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/targets/PackagesConfigProject/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="TinyCsvParser" version="2.7.1" targetFramework="net472" />
<package id="TinyCsvParser" version="2.7.2" targetFramework="net472" />
</packages>
Loading