From 77eb0e0319b84ecaa8490d84f7e76f9c64a4cb96 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 24 Jun 2025 10:31:18 +0000 Subject: [PATCH 1/2] Clean-up files in repo --- Directory.Build.props | 12 ++++----- Directory.Build.targets | 4 +-- Directory.Packages.props | 17 +++---------- NuGet.config | 4 --- System.CommandLine.v3.ncrunchsolution | 12 --------- repack.ps1 | 11 -------- ....CommandLine.ApiCompatibility.Tests.csproj | 3 +-- .../System.CommandLine.Benchmarks.csproj | 25 ++----------------- .../EndToEndTestApp/EndToEndTestApp.csproj | 2 +- .../dotnet-suggest.Tests.csproj | 2 +- .../dotnet-suggest.csproj | 8 +++--- .../System.CommandLine.Tests.csproj | 3 +-- .../TestApps/NativeAOT/NativeAOT.csproj | 2 +- .../TestApps/Trimming/Trimming.csproj | 2 +- .../System.CommandLine.csproj | 11 +++----- 15 files changed, 25 insertions(+), 93 deletions(-) delete mode 100644 System.CommandLine.v3.ncrunchsolution delete mode 100644 repack.ps1 diff --git a/Directory.Build.props b/Directory.Build.props index 9d99dd8141..4ba572b9cf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,19 +1,17 @@ - + - $(NoWarn);NU5125;CS0618 MIT - 13.0 https://github.com/dotnet/command-line-api + latest + true - $(NetCurrent) - net8.0 + $(NetCurrent) + net472 diff --git a/Directory.Build.targets b/Directory.Build.targets index d85abd78da..5b6cc9e1ea 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,8 +1,6 @@ - + $(DefaultExcludesInProjectFolder);TestResults\** diff --git a/Directory.Packages.props b/Directory.Packages.props index 66cde42f3c..0efd501b78 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,36 +2,27 @@ true - false + true $(NoWarn);NU1507 - - - - - - - - - - + - - + + diff --git a/NuGet.config b/NuGet.config index f8db482476..7d005347e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,15 +1,11 @@ - - - - diff --git a/System.CommandLine.v3.ncrunchsolution b/System.CommandLine.v3.ncrunchsolution deleted file mode 100644 index ed49d122c2..0000000000 --- a/System.CommandLine.v3.ncrunchsolution +++ /dev/null @@ -1,12 +0,0 @@ - - - True - - TargetFrameworks = net8.0 - TargetFramework = net8.0 - - False - True - True - - \ No newline at end of file diff --git a/repack.ps1 b/repack.ps1 deleted file mode 100644 index 9297374748..0000000000 --- a/repack.ps1 +++ /dev/null @@ -1,11 +0,0 @@ - -# clean up the previously-cached NuGet packages -Remove-Item -Recurse ~\.nuget\packages\System.CommandLine* -Force - -# build and pack dotnet-interactive -dotnet clean -dotnet pack /p:PackageVersion=2.0.0-dev - -# copy the dotnet-interactive packages to the temp directory -Get-ChildItem -Recurse -Filter *.nupkg | Copy-Item -Destination c:\temp -Force - diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj index 186c83d619..6f1488383c 100644 --- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj +++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj @@ -1,8 +1,7 @@ - $(TargetFrameworkForNETSDK) - $(NoWarn);IDE1006 + $(NetMinimum) diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj index c8f464cf2b..2fb608e5a7 100644 --- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj +++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj @@ -1,34 +1,13 @@ + $(NetMinimum) Exe - AnyCPU - - - false - - - $(TargetFrameworkForNETSDK) - - - False - - - True - 4 - - false - - - - - PreserveNewest - + diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj index 58294950a3..29cd1aea8f 100644 --- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj +++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj @@ -1,8 +1,8 @@ + $(NetMinimum) Exe - $(TargetFrameworkForNETSDK) win-x64;linux-x64;osx-x64;osx-arm64 true diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj index e5908e644e..8126970172 100644 --- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj +++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj @@ -1,7 +1,7 @@ - $(TargetFrameworkForNETSDK) + $(NetMinimum) $(DefaultExcludesInProjectFolder);EndToEndTestApp\** diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj index 3b48db33f3..48946b2898 100644 --- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj +++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj @@ -1,8 +1,9 @@  + $(NetMinimum) + Major Exe - $(TargetFrameworkForNETSDK) true true dotnet-suggest @@ -10,10 +11,9 @@ win-x64;win-x86;osx-x64;osx-arm64;linux-x64 $(OutputPath) - .1 - .$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay) - 1.1$(DotnetSuggestBuildNumber) + 1.1.1 + $(NoWarn);NU5110;NU5111 diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj index 9aaa6f4b20..29b661c36f 100644 --- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj +++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj @@ -1,11 +1,10 @@  - $(TargetFrameworkForNETSDK);$(NetFrameworkCurrent) + $(NetMinimum);$(NetFrameworkMinimum) false $(DefaultExcludesInProjectFolder);TestApps\** $(NoWarn);CS8632 - $(NoWarn);IDE1006 diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj index f9be440211..3ef3b324d4 100644 --- a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj +++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj @@ -1,8 +1,8 @@ + $(NetMinimum) Exe - $(TargetFrameworkForNETSDK) false true diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj index a94aa65be8..a3b4bc4a79 100644 --- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj +++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj @@ -1,8 +1,8 @@ + $(NetMinimum) Exe - $(TargetFrameworkForNETSDK) enable enable true diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj index 1511556a0c..09fd8f326a 100644 --- a/src/System.CommandLine/System.CommandLine.csproj +++ b/src/System.CommandLine/System.CommandLine.csproj @@ -1,25 +1,20 @@ + $(NetMinimum);netstandard2.0 true - System.CommandLine - $(TargetFrameworkForNETSDK);netstandard2.0 enable - latest Support for parsing command lines, supporting both POSIX and Windows conventions and shell-agnostic command line completions. true + portable - + true true true - - portable - - From cb08076d3216fe43229d328cc1f1abf9ee0cf913 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 25 Jun 2025 18:16:19 +0200 Subject: [PATCH 2/2] Update Directory.Build.props --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 4ba572b9cf..78322aac0e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,7 @@ MIT https://github.com/dotnet/command-line-api latest - true + true