From 6f35aaa8e98eb1a76b06bd9783dda3a364019d62 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 18 Oct 2022 09:50:01 -0700
Subject: [PATCH 1/2] Disable some tests that are failing because of a nuget
 issue on linuxportable

---
 test/EndToEnd/EndToEnd.Tests.csproj          | 1 +
 test/EndToEnd/GivenFrameworkDependentApps.cs | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/test/EndToEnd/EndToEnd.Tests.csproj b/test/EndToEnd/EndToEnd.Tests.csproj
index 56776d61d..278ac08fd 100644
--- a/test/EndToEnd/EndToEnd.Tests.csproj
+++ b/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>
diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs
index 9e9b6c420..1950ea5b0 100644
--- a/test/EndToEnd/GivenFrameworkDependentApps.cs
+++ b/test/EndToEnd/GivenFrameworkDependentApps.cs
@@ -47,6 +47,11 @@ namespace EndToEnd
 
         internal void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion)
         {
+            // https://github.com/NuGet/Home/issues/8571
+            #if LINUX_PORTABLE
+                return;
+            #endif
+
             var testProjectCreator = new TestProjectCreator()
             {
                 PackageName = packageName,

From c6adb9e4b169eedeb1deb4bfb94587bed62207d9 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 19 Oct 2022 11:02:33 -0700
Subject: [PATCH 2/2] Move the whole method into the else to fix the linux
 build.

---
 test/EndToEnd/GivenFrameworkDependentApps.cs | 68 ++++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs
index 1950ea5b0..80a955657 100644
--- a/test/EndToEnd/GivenFrameworkDependentApps.cs
+++ b/test/EndToEnd/GivenFrameworkDependentApps.cs
@@ -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)