Improvements

Author: Youssef1313

Directory.Packages.props

@@ -1,9 +1,10 @@
 <Project>
-
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-
   <ItemGroup>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <PackageVersion Include="System.CommandLine" Version="2.0.1" />
+  </ItemGroup>
+</Project>

src/DotNetProjectStarter/DotNetProjectStarter.csproj

@@ -7,4 +7,8 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.CommandLine" />
+  </ItemGroup>
+
 </Project>

src/DotNetProjectStarter/LibraryTemplateConstants.cs

@@ -143,9 +143,6 @@
             if: |
               (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) ||
               (github.event_name == 'workflow_dispatch' && inputs.publish-to-nuget == true)
-            environment:
-              name: nuget.org
-              url: https://www.nuget.org/packages/{0}
 
             steps:
               - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -167,7 +164,7 @@
                 uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544 # v1.1.0
                 id: nugetlogin
                 with:
-                  user: {1}
+                  user: {0}
 
               - name: Push to NuGet.org
                 run: dotnet nuget push "./packages/**/*.nupkg" --api-key "${{ steps.nugetlogin.outputs.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate
@@ -210,6 +207,18 @@
 
         """;
 
+    public const string ProjectFileWithExplicitPackageId = """
+        <Project Sdk="Microsoft.NET.Sdk">
+
+          <PropertyGroup>
+            <TargetFrameworks>net462;net8.0</TargetFrameworks>
+            <PackageId>{0}</PackageId>
+          </PropertyGroup>
+
+        </Project>
+
+        """;
+
     public const string TestDirectoryBuildProps = """
         <Project>
 

src/DotNetProjectStarter/LibraryTemplateGenerator.cs

@@ -22,11 +22,18 @@ public bool Generate(TemplateGenerationOptions options)
         var githubWorkflowsPath = Path.Combine(outputDirectory, ".github", "workflows");
         Directory.CreateDirectory(githubWorkflowsPath);
         File.WriteAllText(Path.Combine(githubWorkflowsPath, "ci.yml"), LibraryTemplateConstants.LibraryTemplateCIYML);
-        File.WriteAllText(Path.Combine(githubWorkflowsPath, "release.yml"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.ReleaseYML, packageName ?? "PACKAGE_NAME_GOES_HERE", nugetUsername ?? "NUGET_USERNAME_GOES_HERE"));
+        File.WriteAllText(Path.Combine(githubWorkflowsPath, "release.yml"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.ReleaseYML, nugetUsername ?? "NUGET_USERNAME_GOES_HERE"));
 
         var srcProjectDirectory = Path.Combine(outputDirectory, "src", projectName);
         Directory.CreateDirectory(srcProjectDirectory);
-        File.WriteAllText(Path.Combine(srcProjectDirectory, $"{projectName}.csproj"), LibraryTemplateConstants.ProjectFile);
+        if (packageName is not null && packageName != projectName)
+        {
+            File.WriteAllText(Path.Combine(srcProjectDirectory, $"{projectName}.csproj"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.ProjectFileWithExplicitPackageId, packageName));
+        }
+        else
+        {
+            File.WriteAllText(Path.Combine(srcProjectDirectory, $"{projectName}.csproj"), LibraryTemplateConstants.ProjectFile);
+        }
 
         var testsDirectory = Path.Combine(outputDirectory, "tests");
         var testsProjectDirectory = Path.Combine(testsDirectory, $"{projectName}.Tests");
@@ -55,7 +62,6 @@ public bool Generate(TemplateGenerationOptions options)
             Console.WriteLine("- Update Directory.Build.props with package author.");
             Console.WriteLine("- Update .github/workflows/release.yml with NuGet username.");
         }
-        Console.WriteLine("- Update .github/workflows/release.yml with NuGet package name.");
         Console.WriteLine("- Update LICENSE with license copyright holder.");
         Console.WriteLine("- Login to nuget.org with your account and set up trusted publishing via <https://www.nuget.org/account/trustedpublishing>. Set the Workflow File to 'release.yml'.");
         return true;

src/DotNetProjectStarter/Program.cs

@@ -1,38 +1,44 @@
-using System;
+using System.CommandLine;
 
-string? name = null;
-string? outputDirectory = null;
-string? nugetPackageName = null;
-string? nugetUsername = null;
+args = ["--name"];
 
-// TODO: Use System.CommandLine, or at least write a better parser if adding a dependency is problematic.
-for (int i = 0; i < args.Length; i++)
+var nameOption = new Option<string>("--name")
 {
-    if (args[i] == "--name")
-    {
-        name = GetArgumentValue(i, args);
-    }
-    else if (args[i] == "--output-directory")
-    {
-        outputDirectory = GetArgumentValue(i, args);
-    }
-    else if (args[i] == "--nuget-username")
-    {
-        nugetUsername = GetArgumentValue(i, args);
-    }
-}
+    Description = "The name of the project to create",
+    Arity = ArgumentArity.ExactlyOne,
+};
 
-var options = new TemplateGenerationOptions(name, outputDirectory, nugetPackageName, nugetUsername);
+var outputDirectoryOption = new Option<string>("--output-directory")
+{
+    Description = "The directory where the project will be created",
+    Arity = ArgumentArity.ExactlyOne,
+};
 
-var generator = new LibraryTemplateGenerator();
-generator.Generate(options);
+var nugetPackageNameOption = new Option<string>("--nuget-package-name")
+{
+    Description = "The name of the NuGet package for package publishing",
+    Arity = ArgumentArity.ExactlyOne,
+};
 
-static string GetArgumentValue(int i, string[] args)
+var nugetUsernameOption = new Option<string>("--nuget-username")
 {
-    if (args.Length < i + 2 || args[i + 1].StartsWith("--", StringComparison.Ordinal))
-    {
-        throw new InvalidOperationException($"A value for '{args[i]}' was not provided.");
-    }
+    Description = "The NuGet username for package publishing",
+    Arity = ArgumentArity.ExactlyOne,
+};
+
+var rootCommand = new RootCommand("Creates a new .NET project template");
+rootCommand.Options.Add(nameOption);
+rootCommand.Options.Add(outputDirectoryOption);
+rootCommand.Options.Add(nugetPackageNameOption);
+rootCommand.Options.Add(nugetUsernameOption);
 
-    return args[i + 1];
-}
+var parseResult = rootCommand.Parse(args);
+var name = parseResult.GetValue(nameOption);
+var outputDirectory = parseResult.GetValue(outputDirectoryOption);
+var nugetPackageName = parseResult.GetValue(nugetPackageNameOption);
+var nugetUsername = parseResult.GetValue(nugetUsernameOption);
+
+var options = new TemplateGenerationOptions(name, outputDirectory, nugetPackageName, nugetUsername);
+
+var generator = new LibraryTemplateGenerator();
+generator.Generate(options);