mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix merge issues with templates

Browse source
This commit is contained in:
Nick Guerrera 2020-02-19 15:43:20 -08:00
parent 03963a5788
commit c6b041e78c
3 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs
View file

@ -9,10 +9,10 @@ namespace EndToEnd
[Fact]
public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds()
{
var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev");
var result = CalculateTemplateVersions.Calculate("3.1.0", "dev");
result.Should()
.Be(("3.1.1.014885", "3.1.1", "3.1"),
.Be(("3.1.1", "3.1", "3.1.1"),
"the patch is 1 higher than aspnetTemplateVersion " +
"due to https://github.com/dotnet/core-sdk/issues/6243");
}
@ -20,19 +20,19 @@ namespace EndToEnd
[Fact]
public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds()
{
var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "014885", "dev");
var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "dev");
result.Should()
.Be(("3.0.1.014885", "3.0.1-dev", "3.0"));
.Be(("3.0.1-dev", "3.0", "3.0.1"));
}
[Fact]
public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds()
{
var result = CalculateTemplateVersions.Calculate("5.1.0", "014885", "dev");
var result = CalculateTemplateVersions.Calculate("5.1.0", "dev");
result.Should()
.Be(("5.1.0.014885", "5.1.0", "5.1"),
.Be(("5.1.0", "5.1", "5.1.0"),
"the patch align with AspNetCoreTemplateMajorVersion again, " +
"since there is no non-deterministic existing ComponentId under Major version 5.");
}
@ -40,10 +40,10 @@ namespace EndToEnd
[Fact]
public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds()
{
var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev");
var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "dev");
result.Should()
.Be(("5.0.0.014885", "5.0.0-dev", "5.0"));
.Be(("5.0.0-dev", "5.0", "5.0.0"));
}
}
}