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

Add and enable tests for roll-forward behavior

Browse source
This commit is contained in:
Daniel Plaisted 2018-09-26 18:54:17 -07:00
parent 5ea948bb62
commit 328a3fd9be
4 changed files with 142 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

50
test/EndToEnd/GivenFrameworkDependentApps.cs
View file

@ -17,10 +17,29 @@ namespace EndToEnd
{
[Theory]
[ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItDoesNotRollForwardToTheLatestVersion(string minorVersion)
public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
{
ItDoesNotRollForwardToTheLatestVersion(GivenSelfContainedAppsRollForward.NETCorePackageName, minorVersion);
}
[Theory]
[ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion)
{
ItDoesNotRollForwardToTheLatestVersion(GivenSelfContainedAppsRollForward.AspNetCoreAppPackageName, minorVersion);
}
[Theory]
[ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreAll(string minorVersion)
{
ItDoesNotRollForwardToTheLatestVersion(GivenSelfContainedAppsRollForward.AspNetCoreAllPackageName, minorVersion);
}
public void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion)
{
var _testInstance = TestAssets.Get("TestAppSimple")
.CreateInstance(identifier: minorVersion)
.CreateInstance(identifier: packageName + "_" + minorVersion)
// scope the feed to only dotnet-core feed to avoid flaky when different feed has a newer / lower version
.WithNuGetConfig(new RepoDirectoriesProvider().TestPackages)
.WithSourceFiles();
@ -37,6 +56,13 @@ namespace EndToEnd
.Element(ns + "TargetFramework")
.Value = "netcoreapp" + minorVersion;
if (packageName != GivenSelfContainedAppsRollForward.NETCorePackageName)
{
// Add implicit ASP.NET reference
project.Root.Add(new XElement(ns + "ItemGroup",
new XElement(ns + "PackageReference", new XAttribute("Include", packageName))));
}
project.Save(projectPath);
// Get the resolved version of .NET Core
@ -48,7 +74,7 @@ namespace EndToEnd
string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
var assetsFile = new LockFileFormat().Read(assetsFilePath);
var versionInAssertsJson = GetNetCoreAppVersion(assetsFile);
var versionInAssertsJson = GetPackageVersion(assetsFile, packageName);
versionInAssertsJson.Should().NotBeNull();
if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0)
@ -59,18 +85,18 @@ namespace EndToEnd
return;
}
versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(minorVersion));
versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion));
}
private NuGetVersion GetNetCoreAppVersion(LockFile lockFile)
private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName)
{
return lockFile?.Targets?.SingleOrDefault(t => t.RuntimeIdentifier == null)
?.Libraries?.SingleOrDefault(l =>
string.Compare(l.Name, "Microsoft.NETCore.App", StringComparison.CurrentCultureIgnoreCase) == 0)
string.Compare(l.Name, packageName, StringComparison.CurrentCultureIgnoreCase) == 0)
?.Version;
}
public string GetExpectedVersion(string minorVersion)
public string GetExpectedVersion(string packageName, string minorVersion)
{
if (minorVersion.StartsWith("1.0"))
{
@ -82,6 +108,16 @@ namespace EndToEnd
}
else
{
// ASP.NET 2.1.0 packages had exact version dependencies, which was problematic,
// so the default version for 2.1 apps is 2.1.1.
if (packageName == GivenSelfContainedAppsRollForward.AspNetCoreAppPackageName ||
packageName == GivenSelfContainedAppsRollForward.AspNetCoreAllPackageName)
{
if (minorVersion == "2.1")
{
return "2.1.1";
}
}
var parsed = NuGetVersion.Parse(minorVersion);
return new NuGetVersion(parsed.Major, parsed.Minor, 0).ToNormalizedString();
}