Skip to content

Commit 53b13d8

Browse files
committed
Adjust
1 parent 893f190 commit 53b13d8

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

src/DotNetProjectStarter/LibraryTemplateGenerator.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public bool Generate(TemplateGenerationOptions options)
88
{
99
var projectName = options.Name ?? "LibraryProject";
1010
var outputDirectory = options.OutputDirectory ?? Directory.GetCurrentDirectory();
11-
var packageName = options.NuGetPackageName;
1211
var nugetUsername = options.NuGetUserName;
1312

1413
outputDirectory = Path.Combine(outputDirectory, projectName);
@@ -26,14 +25,7 @@ public bool Generate(TemplateGenerationOptions options)
2625

2726
var srcProjectDirectory = Path.Combine(outputDirectory, "src", projectName);
2827
Directory.CreateDirectory(srcProjectDirectory);
29-
if (packageName is not null && packageName != projectName)
30-
{
31-
File.WriteAllText(Path.Combine(srcProjectDirectory, $"{projectName}.csproj"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.ProjectFileWithExplicitPackageId, packageName));
32-
}
33-
else
34-
{
35-
File.WriteAllText(Path.Combine(srcProjectDirectory, $"{projectName}.csproj"), LibraryTemplateConstants.ProjectFile);
36-
}
28+
File.WriteAllText(Path.Combine(srcProjectDirectory, $"{projectName}.csproj"), LibraryTemplateConstants.ProjectFile);
3729

3830
var testsDirectory = Path.Combine(outputDirectory, "tests");
3931
var testsProjectDirectory = Path.Combine(testsDirectory, $"{projectName}.Tests");
@@ -49,7 +41,7 @@ public bool Generate(TemplateGenerationOptions options)
4941
File.WriteAllText(Path.Combine(outputDirectory, "Directory.Build.props"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.DirectoryBuildPropsFile, options.NuGetUserName ?? "ADD_PACKAGE_AUTHOR_HERE"));
5042
File.WriteAllText(Path.Combine(outputDirectory, "Directory.Packages.props"), LibraryTemplateConstants.DirectoryPackagesPropsFile);
5143
File.WriteAllText(Path.Combine(outputDirectory, "LICENSE"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.LicenseFile, "ADD_COPYRIGHT_HOLDER_HERE"));
52-
File.WriteAllText(Path.Combine(outputDirectory, "README.md"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.ReadmeFile, packageName ?? projectName));
44+
File.WriteAllText(Path.Combine(outputDirectory, "README.md"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.ReadmeFile, projectName));
5345
File.WriteAllText(Path.Combine(outputDirectory, $"{projectName}.slnx"), string.Format(CultureInfo.InvariantCulture, LibraryTemplateConstants.SlnxFile, projectName));
5446
File.WriteAllText(Path.Combine(outputDirectory, "global.json"), LibraryTemplateConstants.GlobalJsonFile);
5547
File.WriteAllText(Path.Combine(outputDirectory, "nuget.config"), LibraryTemplateConstants.NuGetConfigFile);

src/DotNetProjectStarter/Program.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
Arity = ArgumentArity.ExactlyOne,
1313
};
1414

15-
var nugetPackageNameOption = new Option<string>("--nuget-package-name")
16-
{
17-
Description = "The name of the NuGet package for package publishing",
18-
Arity = ArgumentArity.ExactlyOne,
19-
};
20-
2115
var nugetUsernameOption = new Option<string>("--nuget-username")
2216
{
2317
Description = "The NuGet username for package publishing",
@@ -27,16 +21,14 @@
2721
var rootCommand = new RootCommand("Creates a new .NET project template");
2822
rootCommand.Options.Add(nameOption);
2923
rootCommand.Options.Add(outputDirectoryOption);
30-
rootCommand.Options.Add(nugetPackageNameOption);
3124
rootCommand.Options.Add(nugetUsernameOption);
3225

3326
var parseResult = rootCommand.Parse(args);
3427
var name = parseResult.GetValue(nameOption);
3528
var outputDirectory = parseResult.GetValue(outputDirectoryOption);
36-
var nugetPackageName = parseResult.GetValue(nugetPackageNameOption);
3729
var nugetUsername = parseResult.GetValue(nugetUsernameOption);
3830

39-
var options = new TemplateGenerationOptions(name, outputDirectory, nugetPackageName, nugetUsername);
31+
var options = new TemplateGenerationOptions(name, outputDirectory, nugetUsername);
4032

4133
var generator = new LibraryTemplateGenerator();
4234
generator.Generate(options);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
internal sealed record TemplateGenerationOptions(string? Name, string? OutputDirectory, string? NuGetPackageName, string? NuGetUserName);
1+
internal sealed record TemplateGenerationOptions(string? Name, string? OutputDirectory, string? NuGetUserName);

0 commit comments

Comments
 (0)