Fixed CS0436 compiler error and used GeneratedCode sub-namespace

- Fixed "CS0436 : The type 'CliServiceProviderExtensions' in ..." compiler error when project is referenced by another project.
- Generated Builder classes will be put in GeneratedCode sub-namespace of the definition class's namespace to prevent namespace pollution.
  Global GeneratedCode namespace was already being used by delegate-model, now class-based model will use GeneratedCode sub-namespace.

Author: calacayir

src/Directory.Build.props

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

src/DotMake.CommandLine.SourceGeneration.Embedded/CliServiceCollectionExtensions.cs

@@ -1,5 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
 using System;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DotMake.CommandLine
 {
@@ -10,7 +10,7 @@ namespace DotMake.CommandLine
     /// <br/>Default implementation <see cref="ServiceCollection"/> is in <c>Microsoft.Extensions.DependencyInjection</c> assembly.
     /// </para>
     /// </summary>
-    public static class CliServiceCollectionExtensions
+    internal static class CliServiceCollectionExtensions
     {
         private static readonly IServiceCollection ServiceCollection = new ServiceCollection();
         private static IServiceProvider serviceProvider;

src/DotMake.CommandLine.SourceGeneration.Embedded/CliServiceProviderExtensions.cs

@@ -11,7 +11,7 @@ namespace DotMake.CommandLine
     /// used class <see cref="ActivatorUtilities"/> is in <c>Microsoft.Extensions.DependencyInjection.Abstractions</c> assembly.
     /// </para>
     /// </summary>
-    public static class CliServiceProviderExtensions
+    internal static class CliServiceProviderExtensions
     {
         private static IServiceProvider serviceProvider;
 

src/DotMake.CommandLine.SourceGeneration/CliCommandAsDelegateInfo.cs

@@ -55,7 +55,7 @@ public CliCommandAsDelegateInfo(ISymbol symbol, SyntaxNode syntaxNode, SemanticM
 
             Hash = GenerateHash();
             GeneratedClassName = "CliCommandAsDelegate_" + Hash;
-            GeneratedClassNamespace = "GeneratedCode";
+            GeneratedClassNamespace = CliCommandInfo.GeneratedSubNamespace;
             GeneratedClassFullName = string.IsNullOrEmpty(GeneratedClassNamespace)
                 ? GeneratedClassName
                 : GeneratedClassNamespace + "." + GeneratedClassName;

src/DotMake.CommandLine.SourceGeneration/CliCommandInfo.cs

@@ -15,6 +15,7 @@ public class CliCommandInfo : CliSymbolInfo, IEquatable<CliCommandInfo>
         public const string CommandClassName = "CliCommand";
         public const string CommandClassNamespace = "System.CommandLine";
         public const string DiagnosticName = "CLI command";
+        public const string GeneratedSubNamespace = "GeneratedCode";
         public const string GeneratedClassSuffix = "Builder";
         public static readonly string CommandBuilderFullName = "DotMake.CommandLine.CliCommandBuilder";
         public static readonly Dictionary<string, string> PropertyMappings = new Dictionary<string, string>
@@ -45,15 +46,13 @@ public CliCommandInfo(ISymbol symbol, SyntaxNode syntaxNode, AttributeData attri
             IsExternalChild = (parent == null) && (Settings.ParentSymbol != null);
 
             GeneratedClassName = symbol.Name + GeneratedClassSuffix;
-            GeneratedClassNamespace = Settings.IsParentContaining
-                ? Settings.GetContainingTypeFullName(GeneratedClassSuffix)
-                : (symbol.ContainingNamespace == null || symbol.ContainingNamespace.IsGlobalNamespace)
-                    ? string.Empty
-                    : symbol.ContainingNamespace.ToReferenceString();
-            GeneratedClassFullName = string.IsNullOrEmpty(GeneratedClassNamespace)
-                ? GeneratedClassName
-                : GeneratedClassNamespace + "." + GeneratedClassName;
-
+            GeneratedClassNamespace = symbol.GetNamespaceOrEmpty();
+            if (!GeneratedClassNamespace.EndsWith(GeneratedSubNamespace))
+                GeneratedClassNamespace = SymbolExtensions.CombineNameParts(GeneratedClassNamespace, GeneratedSubNamespace);
+            GeneratedClassFullName = Settings.IsParentContaining
+                ? SymbolExtensions.CombineNameParts(Settings.GetContainingTypeFullName(GeneratedSubNamespace, GeneratedClassSuffix), GeneratedClassName)
+                : SymbolExtensions.CombineNameParts(GeneratedClassNamespace, GeneratedClassName);
+            
             ReferenceDependantInfo = (parent != null)
                 ? parent.ReferenceDependantInfo
                 : new ReferenceDependantInfo(semanticModel.Compilation);

src/DotMake.CommandLine.SourceGeneration/CliCommandSettings.cs

@@ -63,14 +63,27 @@ public IEnumerable<CliCommandSettings> GetParentTree()
             }
         }
 
-        public string GetContainingTypeFullName(string classSuffix)
+        public string GetContainingTypeFullName(string subNamespace, string classSuffix)
         {
             var parentTree = GetParentTree()
                 .Prepend(this) //to include first ParentSymbol
                 .TakeWhile(s => s.IsParentContaining)
                 .Reverse()
                 .Select((s, i) =>
-                    ((i == 0) ? s.ParentSymbol.ToReferenceString() : s.ParentSymbol.Name) + classSuffix);
+                {
+                    var className = s.ParentSymbol.Name + classSuffix;
+                    
+                    if (i == 0)
+                    {
+                        var classNamespace = ParentSymbol.GetNamespaceOrEmpty();
+                        if (!classNamespace.EndsWith(classSuffix))
+                            classNamespace = SymbolExtensions.CombineNameParts(classNamespace, subNamespace);
+
+                        return SymbolExtensions.CombineNameParts(classNamespace, className);
+                    }
+
+                    return className;
+                });
 
             return string.Join(".", parentTree);
         }

src/DotMake.CommandLine.SourceGeneration/SymbolExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 using System.Linq;
@@ -126,5 +125,17 @@ public static IEnumerable<ISymbol> GetAllMembers(this ITypeSymbol type)
                 }
             }
         }
+
+        public static string GetNamespaceOrEmpty(this ISymbol symbol)
+        {
+            return (symbol.ContainingNamespace == null || symbol.ContainingNamespace.IsGlobalNamespace)
+                ? string.Empty
+                : symbol.ContainingNamespace.ToReferenceString();
+        }
+
+        public static string CombineNameParts(params string[] nameParts)
+        {
+            return string.Join(".", nameParts.Where(n => !string.IsNullOrEmpty(n)));
+        }
     }
 }

src/DotMake.CommandLine/DotMake.CommandLine.csproj

@@ -20,11 +20,9 @@
     <Description>Declarative syntax for System.CommandLine via attributes for easy, fast, strongly-typed (no reflection) usage. Includes a source generator which automagically converts your classes to CLI commands and properties to CLI options or CLI arguments.</Description>
     <PackageTags>command-line CLI console System.CommandLine declarative attributes parsing command argument option generator</PackageTags>
     <PackageReleaseNotes>
-      - Updated to latest daily build `2.0.0-beta4.24123.1` of System.CommandLine.
-      - Better error message when a passed class does not have a `[CliCommand]` attribute ot it's a nested class and one of its parents
-        does not have a `[CliCommand]` attribute.
-      - On Windows platform, backslash + double quote (`\&quot;`) at the end of an argument,
-        is usually a path separator and not an escape for double quote, so it will be trimmed to prevent unnecessary path errors.
+      - Fixed "CS0436 : The type 'CliServiceProviderExtensions' in ..." compiler error when project is referenced by another project.
+      - Generated Builder classes will be put in GeneratedCode sub-namespace of the definition class's namespace to prevent namespace pollution.
+        Global GeneratedCode namespace was already being used by delegate-model, now class-based model will use GeneratedCode sub-namespace.
     </PackageReleaseNotes>
   </PropertyGroup>
 

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

@@ -1,5 +1,5 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v1.8.2.0
+// Generated by DotMake.CommandLine.SourceGeneration v1.8.3.0
 // Roslyn (Microsoft.CodeAnalysis) v4.900.24.8111
 // Generation: 1
 

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

@@ -1,5 +1,5 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v1.8.2.0
+// Generated by DotMake.CommandLine.SourceGeneration v1.8.3.0
 // Roslyn (Microsoft.CodeAnalysis) v4.900.24.8111
 // Generation: 1