From 20052c3fb4c96febbf086b63ca739c251cc6bd7f Mon Sep 17 00:00:00 2001 From: Herwin Date: Fri, 24 May 2024 00:08:50 +0200 Subject: [PATCH] Added .net 7 and .net 8 targets, Fixed bug in args parsing, Removed debug builds & drone config, Updated dependencies Update .drone.yml, .gitignore, and 4 more files... --- .drone.yml | 18 ------------------ .gitignore | 3 +++ ComPortWatcher.sln | 4 ---- .../NibblePoker.Application.ListComPort.csproj | 14 ++++++++------ NibblePoker.Application.ListComPort/Program.cs | 14 +++++++------- .../NibblePoker.Library.ComPortHelpers.csproj | 2 ++ 6 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 5d0954d..0000000 --- a/.drone.yml +++ /dev/null @@ -1,18 +0,0 @@ -# Documentation: -# * https://docs.drone.io/quickstart/docker/ -# * https://docs.drone.io/pipeline/docker/examples/languages/csharp/ -# * https://discourse.drone.io/t/builds-are-stuck-in-pending-status/4437 - -kind: pipeline -type: docker -name: default - -platform: - os: linux - arch: arm64 - -steps: - - name: test - image: mcr.microsoft.com/dotnet/sdk:6.0-alpine - commands: - - dotnet build "./NibblePoker.Application.ListComPort/NibblePoker.Application.ListComPort.csproj" diff --git a/.gitignore b/.gitignore index f2a31dc..f4fcf1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ +# IDEs .idea/ .vs/ +# Build Artifacts Builds/any/ Builds/arm*/ Builds/x*/ @@ -25,4 +27,5 @@ Packages/ *.wixobj *.wixpdb +# Misc notes.txt diff --git a/ComPortWatcher.sln b/ComPortWatcher.sln index a8ee3ef..d2616d1 100644 --- a/ComPortWatcher.sln +++ b/ComPortWatcher.sln @@ -10,12 +10,8 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2E9CEFC2-66A8-4A03-84FB-C28F752F522C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E9CEFC2-66A8-4A03-84FB-C28F752F522C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E9CEFC2-66A8-4A03-84FB-C28F752F522C}.Release|Any CPU.ActiveCfg = Release|Any CPU {2E9CEFC2-66A8-4A03-84FB-C28F752F522C}.Release|Any CPU.Build.0 = Release|Any CPU - {0E6E464E-8497-4752-8281-24A64E5E8A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E6E464E-8497-4752-8281-24A64E5E8A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E6E464E-8497-4752-8281-24A64E5E8A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E6E464E-8497-4752-8281-24A64E5E8A9D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/NibblePoker.Application.ListComPort/NibblePoker.Application.ListComPort.csproj b/NibblePoker.Application.ListComPort/NibblePoker.Application.ListComPort.csproj index a23ed3f..5022d56 100644 --- a/NibblePoker.Application.ListComPort/NibblePoker.Application.ListComPort.csproj +++ b/NibblePoker.Application.ListComPort/NibblePoker.Application.ListComPort.csproj @@ -2,18 +2,20 @@ Exe - net6.0-windows - enable + net6.0-windows;net7.0-windows;net8.0-windows + disable enable NibblePoker.Application.ListComPort NibblePoker.Application.ListComPort - 3.0.0 - 3.0.0 - 3.0.0 + 4.0.0 + 4.0.0 + 4.0.0 en-001 false Herwin Bozet (@NibblePoker) ..\NibblePoker.Packaging.ListComPort\Icons\lscom-v2-text-01.ico + Release + AnyCPU @@ -21,7 +23,7 @@ - + diff --git a/NibblePoker.Application.ListComPort/Program.cs b/NibblePoker.Application.ListComPort/Program.cs index e91798a..c9bdf2b 100644 --- a/NibblePoker.Application.ListComPort/Program.cs +++ b/NibblePoker.Application.ListComPort/Program.cs @@ -7,7 +7,7 @@ using NibblePoker.Library.ComPortWatcher; namespace NibblePoker.Application.ListComPort; internal static class Program { - private const string Version = "3.0.0"; + private const string Version = "4.0.0"; private static readonly Verb RootVerb = new Verb(""); @@ -51,8 +51,8 @@ internal static class Program { .RegisterOption(OptionShowNameRaw).RegisterOption(OptionNoPretty).RegisterOption(OptionSort) .RegisterOption(OptionSortReverse).RegisterOption(OptionTabPadding).RegisterOption(OptionVersion) .RegisterOption(OptionVersionOnly), args); - } catch(ArgumentException) { - Console.Error.Write("Failed to parse the launch arguments, default options will be used."); + } catch(Exceptions.ArgumentsException) { + Console.Error.WriteLine("Failed to parse the launch arguments, default options will be used."); _exitCode = ErrorCodes.ArgumentParsingFailure; RootVerb.Clear(); } @@ -85,7 +85,7 @@ internal static class Program { Console.WriteLine("NibblePoker.Application.ListComPort (lscom) v" + Version); Console.WriteLine(""); Console.WriteLine("Dependencies:"); - Console.WriteLine("├─> NibblePoker.Library.Arguments v1.1.0"); + Console.WriteLine("├─> NibblePoker.Library.Arguments v2.0.0"); Console.WriteLine("├─> NibblePoker.Library.ComPortHelpers v" + Version); Console.WriteLine("└─> NibblePoker.Library.RegistryHelpers v0.0.1"); Console.WriteLine(""); @@ -94,7 +94,7 @@ internal static class Program { Console.WriteLine("├─> https://github.com/aziascreations/DotNet-ListComPort"); Console.WriteLine("└─> https://github.com/aziascreations/DotNet-RegistryHelpers"); Console.WriteLine(""); - Console.WriteLine("This software and all its libraries are licensed under the MIT license."); + Console.WriteLine("This software and all its libraries are released in the public domain under the CC0-1.0 license."); return ErrorCodes.NoError; } @@ -191,7 +191,7 @@ internal static class Program { _exitCode = ErrorCodes.NoComPorts; } - // Allows the program to be ran from a shortcut without closing the console instantly. + // Allows the program to be run from a shortcut without closing the console instantly. if(IsProgramRunDirectly()) { Console.Write("\nPress any key to continue..."); Console.ReadKey(); @@ -200,7 +200,7 @@ internal static class Program { return _exitCode; } - // Imports "GetConsoleProcessList(...)" in order to know if the program was ran via a shortcut or CLI. + // Imports "GetConsoleProcessList(...)" in order to know if the program was run via a shortcut or CLI. // See: https://learn.microsoft.com/en-us/windows/console/getconsoleprocesslist [System.Runtime.InteropServices.DllImport("kernel32.dll")] private static extern int GetConsoleProcessList(int[] buffer, int size); diff --git a/NibblePoker.Library.ComPortHelpers/NibblePoker.Library.ComPortHelpers.csproj b/NibblePoker.Library.ComPortHelpers/NibblePoker.Library.ComPortHelpers.csproj index 6979cd3..b37d009 100644 --- a/NibblePoker.Library.ComPortHelpers/NibblePoker.Library.ComPortHelpers.csproj +++ b/NibblePoker.Library.ComPortHelpers/NibblePoker.Library.ComPortHelpers.csproj @@ -6,6 +6,8 @@ enable NibblePoker.Library.ComPortWatcher NibblePoker.Library.ComPortHelpers + Release + AnyCPU