Skip to content

Commit

Permalink
Remove StartKit specific code path, not that we only have 1.
Browse files Browse the repository at this point in the history
  • Loading branch information
CartBlanche committed Jun 17, 2024
1 parent bc94466 commit 09c5677
Showing 1 changed file with 5 additions and 37 deletions.
42 changes: 5 additions & 37 deletions Source/v2/Meadow.CLI/Commands/Current/Project/ProjectNewCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ public class ProjectNewCommand : BaseCommand<ProjectNewCommand>
[CommandOption('l', Description = Strings.ProjectTemplates.CommandOptionSupportedLanguagesDescription, IsRequired = false)]
public string Language { get; private set; } = "C#";

private const string StartKit = "startkit";
private const string StartKitAll = "startkit-all";

public ProjectNewCommand(ILoggerFactory loggerFactory)
: base(loggerFactory)
{
Expand Down Expand Up @@ -101,25 +98,9 @@ private async Task GenerateProjectsAndSolutionsFromSelectedTemplates(string proj
AnsiConsole.MarkupLine($"[green]{Strings.ProjectTemplates.CreatingProject}[/]", selectedTemplate.Name);

var outputPath = string.Empty;
if (selectedTemplate.Name.Contains(StartKit))
{
if (!selectedTemplate.Name.EndsWith(StartKitAll))
{
var regexBracketText = new Regex(@"\((.*?)\)");
var match = regexBracketText.Match(selectedTemplate.Name);
if (match.Success)
{
outputPath = Path.Combine(OutputPath!, $"{OutputPath}.{match.Groups[1].Value}");
outputPathArgument = "--output " + outputPath;
}
}
}
else
{
outputPath = Path.Combine(OutputPath!, $"{OutputPath}.{selectedTemplate.ShortName}");
outputPathArgument = "--output " + outputPath;
generatedProjectName = $"{projectName}.{selectedTemplate.ShortName}";
}
outputPath = Path.Combine(OutputPath!, $"{OutputPath}.{selectedTemplate.ShortName}");
outputPathArgument = "--output " + outputPath;
generatedProjectName = $"{projectName}.{selectedTemplate.ShortName}";

_ = await AppTools.RunDotNetCommand("dotnet", $"new {selectedTemplate.ShortName} --name {generatedProjectName} {outputPathArgument} --language {Language} --force", CancellationToken);
}
Expand Down Expand Up @@ -184,21 +165,8 @@ private async Task GenerateSolution(string projectName)
var longName = segments[0].Trim();
var shortName = segments[1].Trim();
var languages = segments[2].Replace("[", string.Empty).Replace("]", string.Empty).Trim();
if (longName.Contains(StartKit))
{
if (longName.EndsWith(StartKitAll))
{
startKitGroup = new MeadowTemplate(longName, shortName);
}
else
{
startKitTemplates.Add(new MeadowTemplate($"{longName} ({languages})", shortName));
}
}
else
{
templateNameList.Add(new MeadowTemplate($"{longName} ({languages})", shortName));
}

templateNameList.Add(new MeadowTemplate($"{longName} ({languages})", shortName));
}
}

Expand Down

0 comments on commit 09c5677

Please sign in to comment.