From 3ce497f20db7496414d7af6d9741aad87c76369e Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 17 Jan 2020 10:35:11 -0800
Subject: [PATCH] Avoid restoring RID specific packs that don't exist.
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/182696308614677297a22affe249ca7af954048c

---
 .../AppWithPackageAndP2PReferenceAndRID.csproj              | 6 ++++++
 src/Razor/test/testassets/Directory.Build.targets           | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
index d657733943..c6d44d95f5 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
@@ -14,6 +14,12 @@
   <ItemGroup>
     <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
     <FrameworkReference Remove="Microsoft.AspNetCore.App" />
+
+    <!-- RID specific installs attempts to restore runtime packs which cause cyclical dependencies .-->
+    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
+    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
+    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
+    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets
index c2b36add81..1c03be36fc 100644
--- a/src/Razor/test/testassets/Directory.Build.targets
+++ b/src/Razor/test/testassets/Directory.Build.targets
@@ -2,11 +2,7 @@
   <Import Project="RazorTest.Introspection.targets" />
 
   <PropertyGroup>
-    <!--
-      The runtime version is only useful to restore and compile test projects, and not used to run tests.
-      We'll keep it pinned to a version that has already been shipped.
-     -->
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreApp50PackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>