Merge in 'release/6.0.3xx' changes

test/EndToEnd/EndToEnd.Tests.csproj

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

test/EndToEnd/GivenFrameworkDependentApps.cs

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