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

Merge pull request #14969 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx

Browse source 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
This commit is contained in:
Marc Paine 2022-11-11 16:03:48 -08:00 committed by GitHub
commit 9b1077847c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/EndToEnd/EndToEnd.Tests.csproj
View file

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework> <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
<DefineConstants Condition="'$(IslinuxPortable)' == 'true'">$(DefineConstants);LINUX_PORTABLE</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

5
test/EndToEnd/GivenFrameworkDependentApps.cs
View file

@ -47,6 +47,10 @@ namespace EndToEnd
internal void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion) internal void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion)
{ {
// https://github.com/NuGet/Home/issues/8571
#if LINUX_PORTABLE
return;
#else
var testProjectCreator = new TestProjectCreator() var testProjectCreator = new TestProjectCreator()
{ {
PackageName = packageName, PackageName = packageName,
@ -80,6 +84,7 @@ namespace EndToEnd
} }
versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion)); versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion));
#endif
} }
private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName) private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName)