diff --git a/src/redist/targets/GenerateMSBuildExtensions.targets b/src/redist/targets/GenerateMSBuildExtensions.targets
index 2936166f7..38bf5c09c 100644
--- a/src/redist/targets/GenerateMSBuildExtensions.targets
+++ b/src/redist/targets/GenerateMSBuildExtensions.targets
@@ -29,9 +29,14 @@
 
       <!-- Don't include .NET Core MS.NET.Build.Extensions tasks in Full Framework MSBuild layout -->
       <VSMSBuildExtensionsContent Remove="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools\netcoreapp*\**" />
+      <VSMSBuildExtensionsContent Remove="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools\net*.*\**" />
 
       <VSMSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*"
                                   DeploymentSubpath="msbuildExtensions-ver/"/>
+
+      <!-- Don't include .NET Core targets in the Full Framework MSBuild layout-->
+      <VSMSBuildExtensionsContent Remove="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\SolutionFile\**" />
+
       <VSMSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*"
                                   Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
                                   DeploymentSubpath="msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/" />
diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
index 1b92a3b9f..6088040e3 100644
--- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
+++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Xml.Linq;
 using EndToEnd;
 using FluentAssertions;
 using Microsoft.DotNet.Tools.Test.Utilities;
@@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd
             testProjectCreator.AdditionalProperties["OutputType"] = "exe";
             testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid;
 
-            var testInstance = testProjectCreator.Create();
+            // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed
+            static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project)
+            {
+                XNamespace ns = project.Root.Name.Namespace;
+                var target = XElement.Parse(@"  <ItemGroup>
+    <KnownFrameworkReference Update=""@(KnownFrameworkReference)"">
+      <LatestRuntimeFrameworkVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</LatestRuntimeFrameworkVersion>
+    </KnownFrameworkReference>
+
+    <KnownAppHostPack Update=""@(KnownAppHostPack)"">
+      <AppHostPackVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</AppHostPackVersion>
+    </KnownAppHostPack>
+  </ItemGroup>");
+                target.Name = ns + target.Name.LocalName;
+                project.Root.Add(target);
+            }
+            TestFramework.TestAssetInstance testInstance 
+                = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion);
 
             new PublishCommand()
                     .WithWorkingDirectory(testInstance.Root.FullName)