Skip to content

Commit 323beca

Browse files
committed
Remove StartKit specific code path, not that we only have 1.
1 parent dd1b026 commit 323beca

File tree

1 file changed

+5
-37
lines changed

1 file changed

+5
-37
lines changed

Source/v2/Meadow.CLI/Commands/Current/Project/ProjectNewCommand.cs

+5-37
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ public class ProjectNewCommand : BaseCommand<ProjectNewCommand>
1818
[CommandOption('l', Description = Strings.ProjectTemplates.CommandOptionSupportedLanguagesDescription, IsRequired = false)]
1919
public string Language { get; private set; } = "C#";
2020

21-
private const string StartKit = "startkit";
22-
private const string StartKitAll = "startkit-all";
23-
2421
public ProjectNewCommand(ILoggerFactory loggerFactory)
2522
: base(loggerFactory)
2623
{
@@ -101,25 +98,9 @@ private async Task GenerateProjectsAndSolutionsFromSelectedTemplates(string proj
10198
AnsiConsole.MarkupLine($"[green]{Strings.ProjectTemplates.CreatingProject}[/]", selectedTemplate.Name);
10299

103100
var outputPath = string.Empty;
104-
if (selectedTemplate.Name.Contains(StartKit))
105-
{
106-
if (!selectedTemplate.Name.EndsWith(StartKitAll))
107-
{
108-
var regexBracketText = new Regex(@"\((.*?)\)");
109-
var match = regexBracketText.Match(selectedTemplate.Name);
110-
if (match.Success)
111-
{
112-
outputPath = Path.Combine(OutputPath!, $"{OutputPath}.{match.Groups[1].Value}");
113-
outputPathArgument = "--output " + outputPath;
114-
}
115-
}
116-
}
117-
else
118-
{
119-
outputPath = Path.Combine(OutputPath!, $"{OutputPath}.{selectedTemplate.ShortName}");
120-
outputPathArgument = "--output " + outputPath;
121-
generatedProjectName = $"{projectName}.{selectedTemplate.ShortName}";
122-
}
101+
outputPath = Path.Combine(OutputPath!, $"{OutputPath}.{selectedTemplate.ShortName}");
102+
outputPathArgument = "--output " + outputPath;
103+
generatedProjectName = $"{projectName}.{selectedTemplate.ShortName}";
123104

124105
_ = await AppTools.RunDotNetCommand("dotnet", $"new {selectedTemplate.ShortName} --name {generatedProjectName} {outputPathArgument} --language {Language} --force", CancellationToken);
125106
}
@@ -184,21 +165,8 @@ private async Task GenerateSolution(string projectName)
184165
var longName = segments[0].Trim();
185166
var shortName = segments[1].Trim();
186167
var languages = segments[2].Replace("[", string.Empty).Replace("]", string.Empty).Trim();
187-
if (longName.Contains(StartKit))
188-
{
189-
if (longName.EndsWith(StartKitAll))
190-
{
191-
startKitGroup = new MeadowTemplate(longName, shortName);
192-
}
193-
else
194-
{
195-
startKitTemplates.Add(new MeadowTemplate($"{longName} ({languages})", shortName));
196-
}
197-
}
198-
else
199-
{
200-
templateNameList.Add(new MeadowTemplate($"{longName} ({languages})", shortName));
201-
}
168+
169+
templateNameList.Add(new MeadowTemplate($"{longName} ({languages})", shortName));
202170
}
203171
}
204172

0 commit comments

Comments
 (0)