From f6fa111333f4014bac6bde9f7cfcc386eac260d6 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 2 Oct 2017 19:18:12 -0700
Subject: [PATCH] Another attempt

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

diff --git a/build/RuntimeStore.targets b/build/RuntimeStore.targets
index 599882ca5e..6888bd3106 100644
--- a/build/RuntimeStore.targets
+++ b/build/RuntimeStore.targets
@@ -40,7 +40,7 @@
     <!-- Restore and pack-->
     <MSBuild Projects="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj"
       Targets="Restore;Pack"
-      Properties="Configuration=$(Configuration)" />
+      Properties="Configuration=$(Configuration);AdditionalImports=$(GeneratedRestoreSourcesPropsPath)" />
 
     <!-- Copy to output directory -->
     <ItemGroup>
diff --git a/build/common.props b/build/common.props
index 3c035106e3..f7b678dcf2 100644
--- a/build/common.props
+++ b/build/common.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\version.props" />
   <Import Project="dependencies.props" />
-  <Import Project="$(IntermediateDir)sources.props" Condition="Exists('$(IntermediateDir)sources.props')" />
 
   <PropertyGroup>
     <Product>Microsoft ASP.NET Core</Product>
diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index bdbf65814c..79df5e1ea1 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\build\common.props" />
+  <Import Project="$(AdditionalImports)" Condition="'$(AdditionalImports)'!=''" />
 
   <PropertyGroup>
     <IncludeBuildOutput>false</IncludeBuildOutput>