From 8d1ac47d9f06ee03a15edf4fff17d66039a64095 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 24 Apr 2017 17:11:43 -0700
Subject: [PATCH] Remove cyclic dependency on self

---
 build/common.props                                     | 10 ++++++++--
 .../Microsoft.AspNetCore.All.csproj                    |  2 ++
 .../Microsoft.AspNetCore.RuntimeStore.csproj           |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build/common.props b/build/common.props
index df19991dbf..3e91ed6fb1 100644
--- a/build/common.props
+++ b/build/common.props
@@ -46,8 +46,6 @@
 
   <ItemGroup>
     <FullMetaPackagePackageReference Include="@(MetaPackagePackageReference)" />
-    <FullMetaPackagePackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
-    <FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
@@ -174,6 +172,10 @@
     <FullMetaPackagePackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FullMetaPackageProjectReference Include="../Microsoft.AspNetCore/Microsoft.AspNetCore.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <RuntimeStorePackageReference Include="@(FullMetaPackagePackageReference)" />
     <RuntimeStorePackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
@@ -181,4 +183,8 @@
     <RuntimeStorePackageReference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <RuntimeStorePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
   </ItemGroup>
+
+  <ItemGroup>
+    <RuntimeStoreProjectReference Include="@(FullMetaPackageProjectReference)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index 5e2d6cb395..9607a4186a 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -12,7 +12,9 @@
 
   <ItemGroup>
    <PackageReference Include="@(FullMetaPackagePackageReference)" />
+   <ProjectReference Include="@(FullMetaPackageProjectReference)" />
   </ItemGroup>
+
   <ItemGroup>
     <Content Include="build\**\*.xml" PackagePath="%(Identity)" />
     <Content Include="build\**\*.targets" PackagePath="%(Identity)" />
diff --git a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj
index 23c1cf58ee..8c2f6817ed 100644
--- a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj
+++ b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
    <PackageReference Include="@(RuntimeStorePackageReference)" />
+   <ProjectReference Include="@(RuntimeStoreProjectReference)" />
   </ItemGroup>
 
   <Target Name="CollectDeps" DependsOnTargets="Restore;RunResolvePackageDependencies">