Version 3.0.0

- **Improved:** Updated to final version `2.0.0` of `System.CommandLine`.

- **Improved:** Remove `SourceRevisionId` (commit id) from `AssemblyInformationalVersion` (`<InformationalVersion>`)
  so that displayed app version and result of `--version` command is clean and concise.
  For example display `MyApp v2.0.0` instead of `MyApp v2.0.0+b0f34d51fccc69fd334253924abd8d6853fad7aa`.

Author: calacayir

README.md

@@ -124,9 +124,9 @@ if (result.ParseResult.Errors.Count > 0)
 }
 ```
 #### Summary
-- Mark the class with `[CliCommand]` attribute to make it a CLI command (see [CliCommandAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliCommandAttribute.htm) docs for more info).
-- Mark a property with `[CliOption]` attribute to make it a CLI option (see [CliOptionAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliOptionAttribute.htm) docs for more info).
-- Mark a property with `[CliArgument]` attribute to make it a CLI argument (see [CliArgumentAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliArgumentAttribute.htm) docs for more info).
+- Mark the class with `[CliCommand]` attribute to make it a CLI command (see [CliCommandAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliCommandAttribute.html) docs for more info).
+- Mark a property with `[CliOption]` attribute to make it a CLI option (see [CliOptionAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliOptionAttribute.html) docs for more info).
+- Mark a property with `[CliArgument]` attribute to make it a CLI argument (see [CliArgumentAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliArgumentAttribute.html) docs for more info).
 - Add a method with name `Run` or `RunAsync` to make it the handler for the CLI command. The method can have one of the following signatures: 
 
   - 
@@ -167,7 +167,7 @@ if (result.ParseResult.Errors.Count > 0)
   If no handler method is provided, then by default it will show help for the command.
   This can be also controlled manually by `ShowHelp()` method of `CliContext`.
   Other methods `IsEmptyCommand()`, `IsEmpty()`, `ShowValues()` and `ShowHierarchy()` are also useful.
-- Call `Cli.Run<>` or`Cli.RunAsync<>` method with your class name to run your CLI app (see [Cli](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_Cli.htm) docs for more info).
+- Call `Cli.Run<>` or`Cli.RunAsync<>` method with your class name to run your CLI app (see [Cli](https://dotmake.build/command-line/api/DotMake.CommandLine.Cli.html) docs for more info).
 - For best practice, create a subfolder named `Commands` in your project and put your command classes there 
   so that they are easy to locate and maintain in the future.
 
@@ -192,9 +192,9 @@ And that's it! You now have a fully working command-line app.
 #### Summary
 - Pass a delegate (a parenthesized lambda expression or a method reference) which has parameters that represent your options and arguments, to `Cli.Run`.
 - A parameter is by default considered as a CLI option but you can;
-  - Mark a parameter with `[CliArgument]` attribute to make it a CLI argument and specify settings (see [CliArgumentAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliArgumentAttribute.htm) docs for more info).
-  - Mark a parameter with `[CliOption]` attribute to specify CLI option settings (see [CliOptionAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliOptionAttribute.htm) docs for more info).
-  - Mark the delegate itself with `[CliCommand]` attribute to specify CLI command settings (see [CliCommandAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliCommandAttribute.htm) docs for more info).
+  - Mark a parameter with `[CliArgument]` attribute to make it a CLI argument and specify settings (see [CliArgumentAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliArgumentAttribute.html) docs for more info).
+  - Mark a parameter with `[CliOption]` attribute to specify CLI option settings (see [CliOptionAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliOptionAttribute.html) docs for more info).
+  - Mark the delegate itself with `[CliCommand]` attribute to specify CLI command settings (see [CliCommandAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliCommandAttribute.html) docs for more info).
   - Note that for being able to mark a parameter with an attribute in an anonymous lambda function, 
     if your target framework is below net6.0, you also need `<LangVersion>10.0</LangVersion>` tag (minimum) in your .csproj file.
 - Set a default value for a parameter if you want it to be optional (not required to be specified on the command-line).
@@ -889,7 +889,7 @@ public class My2CliCommand : IOptionsGroup1
 ```
 
 ---
-The properties for `[CliCommand]` attribute (see [CliCommandAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliCommandAttribute.htm) docs for more info):
+The properties for `[CliCommand]` attribute (see [CliCommandAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliCommandAttribute.html) docs for more info):
 - Name
 - Description
 - Hidden
@@ -944,7 +944,7 @@ Only the last option can specify an argument.
 Note that if you have an explicit option named "-abc" then it will win over bundled options.
 
 ---
-The properties for `[CliOption]` attribute (see [CliOptionAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliOptionAttribute.htm) docs for more info):
+The properties for `[CliOption]` attribute (see [CliOptionAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliOptionAttribute.html) docs for more info):
 - Name
 - Description
 - Hidden
@@ -1003,7 +1003,7 @@ Quiet
 ```
 
 ---
-The properties for `[CliArgument]` attribute (see [CliArgumentAttribute](https://dotmake.build/command-line/api/html/T_DotMake_CommandLine_CliArgumentAttribute.htm) docs for more info):
+The properties for `[CliArgument]` attribute (see [CliArgumentAttribute](https://dotmake.build/command-line/api/DotMake.CommandLine.CliArgumentAttribute.html) docs for more info):
 - Name
 - Description
 - Hidden

src/Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#generateassemblyinfo -->
-    <VersionPrefix>2.8.2</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <Product>DotMake Command-Line</Product>
     <Company>DotMake</Company>
     <!-- Copyright is also used for NuGet metadata -->

src/DotMake.CommandLine/CliHelpBuilder.cs

@@ -124,17 +124,17 @@ public override void Write(HelpContext helpContext)
         public virtual bool WriteSynopsisSection(HelpContext helpContext)
         {
             ConsoleExtensions.SetColor(theme.SynopsisColor, theme.DefaultColor);
-            helpContext.Output.Write(ExecutableInfo.Product);
-            if (!string.IsNullOrWhiteSpace(ExecutableInfo.Version))
-                helpContext.Output.Write(" v{0}", ExecutableInfo.Version);
+            helpContext.Output.Write(ExecutableInfo.AssemblyInfo.Product);
+            if (!string.IsNullOrWhiteSpace(ExecutableInfo.AssemblyInfo.Version))
+                helpContext.Output.Write(" v{0}", ExecutableInfo.AssemblyInfo.Version);
             helpContext.Output.WriteLine();
-            if (!string.IsNullOrWhiteSpace(ExecutableInfo.Copyright))
-                helpContext.Output.WriteLine(ExecutableInfo.Copyright);
+            if (!string.IsNullOrWhiteSpace(ExecutableInfo.AssemblyInfo.Copyright))
+                helpContext.Output.WriteLine(ExecutableInfo.AssemblyInfo.Copyright);
 
             var isRoot = (helpContext.Command.Parents.FirstOrDefault() == null);
             var name = isRoot ? string.Empty : helpContext.Command.Name;
             var description = helpContext.Command.Description
-                              ?? (isRoot ? ExecutableInfo.Description : string.Empty);
+                              ?? (isRoot ? ExecutableInfo.AssemblyInfo.Description : string.Empty);
             const string separator = ": ";
 
             var hasName = !string.IsNullOrWhiteSpace(name);

src/DotMake.CommandLine/CliParser.cs

@@ -276,7 +276,7 @@ private sealed class VersionOptionAction : SynchronousCommandLineAction
         {
             public override int Invoke(ParseResult parseResult)
             {
-                parseResult.InvocationConfiguration.Output.WriteLine(ExecutableInfo.Version);
+                parseResult.InvocationConfiguration.Output.WriteLine(ExecutableInfo.AssemblyInfo.Version);
                 return 0;
             }
 

src/DotMake.CommandLine/DotMake.CommandLine.csproj

@@ -21,54 +21,20 @@
     <PackageTags>command-line CLI console System.CommandLine declarative attributes parsing command argument option generator</PackageTags>
     <PackageReleaseNotes>
       <![CDATA[
-        - **Fixed:** All types in generated code will now be prefixed with global namespace `global::` to prevent
-          CS0234 errors (namespace and type conflict compile errors) which can happen when user names a namespace part and a class same.
-          Example code to replicate the problem (now fixed), note the `.TestApp`, `.System`, `.DotMake`
-          as the final part of the namespace which triggered the problem:
-          ```c#
-          using DotMake.CommandLine;
-
-          //Generated code should not fail to compile even if user uses some crazy namespaces
-
-          namespace TestApp.Commands.TestApp
-          {
-              [CliCommand]
-              public class TestAppCliCommand
-              {
-                  [CliArgument(Arity = CliArgumentArity.ZeroOrMore)]
-                  public string Arg { get; set; }
-              }
-          }
-
-          namespace TestApp.Commands.System
-          {
-              [CliCommand]
-              public class SystemCliCommand
-              {
-
-              }
-          }
-
-          namespace TestApp.Commands.DotMake
-          {
-              [CliCommand]
-              public class DotMakeCliCommand
-              {
-
-              }
-          }
-          ```
+        - **Improved:** Updated to final version `2.0.0` of `System.CommandLine`.
           
-        - **Improved:** Documentation for `CliContext.IsEmptyCommand()` and `CliContext.IsEmpty()` to emphasize the difference.
+        - **Improved:** Remove `SourceRevisionId` (commit id) from `AssemblyInformationalVersion` (`<InformationalVersion>`)  
+          so that displayed app version and result of `--version` command is clean and concise.  
+          For example display `MyApp v2.0.0` instead of `MyApp v2.0.0+b0f34d51fccc69fd334253924abd8d6853fad7aa`.
       ]]>
      </PackageReleaseNotes>
   </PropertyGroup>
 
   <Import Project="..\DotMake.CommandLine.Shared\DotMake.CommandLine.Shared.projitems" Label="Shared" />
 
   <ItemGroup>
-    <!-- use exact version match with [] for now as future beta versions can break API -->
-    <PackageReference Include="System.CommandLine" Version="[2.0.0-rc.1.25451.107]" />
+    <!-- update: use final 2.0.0 now, old: use exact version match with [] for now as future beta versions can break API -->
+    <PackageReference Include="System.CommandLine" Version="2.0.0" />
 
     <!--
       UPDATE: No longer using this as now 2.0.0-beta5.25306.1 is released to official nuget feed.

src/DotMake.CommandLine/Util/AssemblyInfo.cs

@@ -0,0 +1,54 @@
+using System.Reflection;
+
+namespace DotMake.CommandLine.Util
+{
+    internal class AssemblyInfo
+    {
+        public AssemblyInfo(Assembly assembly)
+        {
+            Assembly = assembly;
+            AssemblyName = assembly.GetName();
+
+            var assemblyInformationalVersion = Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            if (assemblyInformationalVersion != null)
+            {
+                var parts = assemblyInformationalVersion.InformationalVersion.Split('+');
+                Version = parts[0].TrimStart('v');
+                SourceRevisionId = (parts.Length > 1) ?  parts[1].Trim() : "";
+            }
+            else
+            {
+                var assemblyFileVersion = Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
+                if (assemblyFileVersion != null)
+                    Version = assemblyFileVersion.Version;
+                else
+                {
+                    Version = AssemblyName.Version?.ToString() ?? "";
+                }
+            }
+
+            var assemblyProduct = Assembly.GetCustomAttribute<AssemblyProductAttribute>();
+            Product = assemblyProduct != null ? assemblyProduct.Product : AssemblyName.Name;
+
+            var assemblyCopyright = Assembly.GetCustomAttribute<AssemblyCopyrightAttribute>();
+            Copyright = assemblyCopyright != null ? assemblyCopyright.Copyright : "";
+
+            var assemblyDescription = Assembly.GetCustomAttribute<AssemblyDescriptionAttribute>();
+            Description = assemblyDescription != null ? assemblyDescription.Description : "";
+        }
+
+        public Assembly Assembly { get; }
+
+        public AssemblyName AssemblyName { get; }
+
+        public string Product { get; }
+
+        public string Version { get; }
+
+        public string SourceRevisionId { get; }
+
+        public string Copyright { get; }
+
+        public string Description { get; }
+    }
+}

src/DotMake.CommandLine/Util/ExecutableInfo.cs

@@ -8,8 +8,7 @@ internal static class ExecutableInfo
     {
         static ExecutableInfo()
         {
-            Assembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
-            AssemblyName = Assembly.GetName();
+            AssemblyInfo = new AssemblyInfo(Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly());
 
             try
             {
@@ -18,48 +17,15 @@ static ExecutableInfo()
             }
             catch
             {
-                ExecutableName = AssemblyName.Name ?? "app";
+                ExecutableName = AssemblyInfo.AssemblyName.Name ?? "app";
                 ExecutablePath = Path.Combine(AppContext.BaseDirectory, ExecutableName);
             }
 
-            var assemblyInformationalVersion = Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-            if (assemblyInformationalVersion != null)
-                Version = assemblyInformationalVersion.InformationalVersion.TrimStart('v');
-            else
-            {
-                var assemblyFileVersion = Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
-                if (assemblyFileVersion != null)
-                    Version = assemblyFileVersion.Version;
-                else
-                {
-                    Version = AssemblyName.Version?.ToString() ?? "";
-                }
-            }
-
-            var assemblyProduct = Assembly.GetCustomAttribute<AssemblyProductAttribute>();
-            Product = assemblyProduct != null ? assemblyProduct.Product : AssemblyName.Name;
-
-            var assemblyCopyright = Assembly.GetCustomAttribute<AssemblyCopyrightAttribute>();
-            Copyright = assemblyCopyright != null ? assemblyCopyright.Copyright : "";
-
-            var assemblyDescription = Assembly.GetCustomAttribute<AssemblyDescriptionAttribute>();
-            Description = assemblyDescription != null ? assemblyDescription.Description : "";
         }
-
-        public static Assembly Assembly { get; }
-
-        public static AssemblyName AssemblyName { get; }
+        public static AssemblyInfo AssemblyInfo { get; }
 
         public static string ExecutablePath { get; }
 
         public static string ExecutableName { get; }
-
-        public static string Product { get; }
-
-        public static string Version { get; }
-
-        public static string Copyright { get; }
-
-        public static string Description { get; }
     }
 }

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/(ModuleInitializerAttribute).g.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.8.2.0
-// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.41305
+// Generated by DotMake.CommandLine.SourceGeneration v3.0.0.0
+// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.46508
 // Generation: 1
 
 #if !NET5_0_OR_GREATER

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/(RequiredMemberAttribute).g.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.8.2.0
-// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.41305
+// Generated by DotMake.CommandLine.SourceGeneration v3.0.0.0
+// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.46508
 // Generation: 1
 
 // Licensed to the .NET Foundation under one or more agreements.

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/ArgumentConverterCliCommandBuilder-3j0trcm.g.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.8.2.0
-// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.41305
+// Generated by DotMake.CommandLine.SourceGeneration v3.0.0.0
+// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.46508
 // Generation: 1
 
 namespace TestApp.Commands.GeneratedCode