Merge branch 'dev'
This commit is contained in:
Коммит
c2647873ba
|
@ -57,7 +57,7 @@ export class NavMenu extends Component {
|
|||
rx="100%"
|
||||
fill="#1B1817" /><path fill="#fff" d="M335 499c14 0 12 17 12 17H165s-2-17 12-17c13 0 16-6 16-12l-1-50c-71 16-86-28-86-28-12-30-28-37-28-37-24-16 1-16 1-16 26 2 40 26 40 26 22 39 59 28 74 22 2-17 9-28 16-35-57-6-116-28-116-126 0-28 10-51 26-69-3-6-11-32 3-67 0 0 21-7 70 26 42-12 86-12 128 0 49-33 70-26 70-26 14 35 6 61 3 67 16 18 26 41 26 69 0 98-60 120-117 126 10 8 18 24 18 48l-1 70c0 6 3 12 16 12z" />
|
||||
</svg>
|
||||
Github</a></li>
|
||||
GitHub</a></li>
|
||||
|
||||
<li><a href="https://github.com/SteeltoeOSS/initializr/issues/new?assignees=&labels=feedback%2C+question&template=feedback-or-question.md&title=%5BFeedback%5D" rel="noreferrer noopener" target="_blank" tabIndex="-1">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
|
||||
|
|
|
@ -87,7 +87,7 @@ Get project:
|
|||
result.Append(GetHorizontalBorder(fieldWidths));
|
||||
foreach (var dep in dependencies)
|
||||
{
|
||||
result.Append(GetRow(dep.Name, dep.Description.Replace("Steeltoe: ", ""), fieldWidths));
|
||||
result.Append(GetRow(dep.Name, dep.Description.Replace("Steeltoe: ", string.Empty), fieldWidths));
|
||||
}
|
||||
|
||||
result.Append(GetHorizontalBorder(fieldWidths));
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace Steeltoe.Initializr.Controllers
|
|||
[HttpGet]
|
||||
public Task<ActionResult> GenerateProjectGet([FromQuery] GeneratorModel model)
|
||||
{
|
||||
return GenerateProject(model);
|
||||
return GenerateProject(model);
|
||||
}
|
||||
|
||||
[Route("dependencies")]
|
||||
|
@ -82,7 +82,14 @@ namespace Steeltoe.Initializr.Controllers
|
|||
catch (Exception ex)
|
||||
{
|
||||
HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest;
|
||||
return Content(ex.Message);
|
||||
|
||||
var message = ex.Message;
|
||||
if (model.TargetFrameworkVersion == "netcoreapp3.1" && model.SteeltoeVersion == "2.3.0")
|
||||
{
|
||||
message = "2.4.0 is the lowest version of Steeltoe that works with netcoreapp3.1\n";
|
||||
}
|
||||
|
||||
return Content(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче