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

Merge upstream changes

Browse source
This commit is contained in:
Daniel Plaisted 2020-03-25 09:13:14 -07:00
commit a199c488d7
17 changed files with 282 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/EndToEnd/GivenSelfContainedAppsRollForward.cs
View file

@ -120,7 +120,7 @@ namespace EndToEnd
.Element(ns + "TargetFramework")
.Value;
TargetFrameworkHelper.GetNetAppTargetFrameworks(SupportedNetCoreAppVersions.Versions)
SupportedNetCoreAppVersions.TargetFrameworkShortFolderVersion
.Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " +
"of .NET Core created by \"dotnet new\"");
}

22
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -30,6 +30,27 @@ namespace EndToEnd
"3.1",
"5.0"
};
public static IEnumerable<string> TargetFrameworkShortFolderVersion
{
get
{
var targetFrameworkShortFolderVersion = new List<string>();
foreach (var v in Versions)
{
if (Version.Parse(v).Major >= 5)
{
targetFrameworkShortFolderVersion.Add($"net{v}");
}
else
{
targetFrameworkShortFolderVersion.Add($"netcoreapp{v}");
}
}
return targetFrameworkShortFolderVersion;
}
}
}
public class SupportedAspNetCoreVersions : IEnumerable<object[]>
@ -50,3 +71,4 @@ namespace EndToEnd
SupportedAspNetCoreVersions.Versions.Where(v => new Version(v).Major < 3);
}
}