Move the whole method into the else to fix the linux build.
This commit is contained in:
parent
6f35aaa8e9
commit
c6adb9e4b1
1 changed files with 34 additions and 34 deletions
|
@ -50,41 +50,41 @@ namespace EndToEnd
|
|||
// https://github.com/NuGet/Home/issues/8571
|
||||
#if LINUX_PORTABLE
|
||||
return;
|
||||
#else
|
||||
var testProjectCreator = new TestProjectCreator()
|
||||
{
|
||||
PackageName = packageName,
|
||||
MinorVersion = minorVersion,
|
||||
};
|
||||
|
||||
var _testInstance = testProjectCreator.Create();
|
||||
|
||||
string projectDirectory = _testInstance.Root.FullName;
|
||||
|
||||
string projectPath = Path.Combine(projectDirectory, "TestAppSimple.csproj");
|
||||
|
||||
// Get the resolved version of .NET Core
|
||||
new RestoreCommand()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.Execute()
|
||||
.Should().Pass();
|
||||
|
||||
string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
|
||||
var assetsFile = new LockFileFormat().Read(assetsFilePath);
|
||||
|
||||
var versionInAssertsJson = GetPackageVersion(assetsFile, packageName);
|
||||
versionInAssertsJson.Should().NotBeNull();
|
||||
|
||||
if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0)
|
||||
{
|
||||
// if the bundled version is, for example, a prerelease of
|
||||
// .NET Core 2.1.1, that we don't roll forward to that prerelease
|
||||
// version for framework-dependent deployments.
|
||||
return;
|
||||
}
|
||||
|
||||
versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion));
|
||||
#endif
|
||||
|
||||
var testProjectCreator = new TestProjectCreator()
|
||||
{
|
||||
PackageName = packageName,
|
||||
MinorVersion = minorVersion,
|
||||
};
|
||||
|
||||
var _testInstance = testProjectCreator.Create();
|
||||
|
||||
string projectDirectory = _testInstance.Root.FullName;
|
||||
|
||||
string projectPath = Path.Combine(projectDirectory, "TestAppSimple.csproj");
|
||||
|
||||
// Get the resolved version of .NET Core
|
||||
new RestoreCommand()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.Execute()
|
||||
.Should().Pass();
|
||||
|
||||
string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
|
||||
var assetsFile = new LockFileFormat().Read(assetsFilePath);
|
||||
|
||||
var versionInAssertsJson = GetPackageVersion(assetsFile, packageName);
|
||||
versionInAssertsJson.Should().NotBeNull();
|
||||
|
||||
if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0)
|
||||
{
|
||||
// if the bundled version is, for example, a prerelease of
|
||||
// .NET Core 2.1.1, that we don't roll forward to that prerelease
|
||||
// version for framework-dependent deployments.
|
||||
return;
|
||||
}
|
||||
|
||||
versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion));
|
||||
}
|
||||
|
||||
private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue