From 6fcf83fe22c07bb1266c2f7c316c40dd9459e3d2 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 2 Jun 2017 10:47:54 -0700
Subject: [PATCH 1/2] React to logging in DI change

---
 src/Microsoft.AspNetCore/WebHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.AspNetCore/WebHost.cs b/src/Microsoft.AspNetCore/WebHost.cs
index 10917099dc..c7f0549601 100644
--- a/src/Microsoft.AspNetCore/WebHost.cs
+++ b/src/Microsoft.AspNetCore/WebHost.cs
@@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore
                 })
                 .ConfigureLogging((hostingContext, logging) =>
                 {
-                    logging.UseConfiguration(hostingContext.Configuration.GetSection("Logging"));
+                    logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     logging.AddConsole();
                     logging.AddDebug();
                 })

From 2625e2a7682cebaf8835ec178dd8ae86d68acee1 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Thu, 1 Jun 2017 17:21:16 -0700
Subject: [PATCH 2/2] Consolidate runtime store dependencies into one package

---
 build/repo.targets                            | 21 ++++++++++++++++++-
 .../Microsoft.AspNetCore.RuntimeStore.csproj  |  2 +-
 .../Build.RuntimeStore.References.csproj      | 13 ++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj

diff --git a/build/repo.targets b/build/repo.targets
index 0eb7b0e245..b267de7f01 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -32,6 +32,8 @@
     <TempDir>$(ArtifactsDir)temp\</TempDir>
     <ToolsDir>$(RepositoryRoot)tools\</ToolsDir>
     <DependencyBuildDirectory>$(RepositoryRoot).deps\build\</DependencyBuildDirectory>
+    <RuntimeStoreReferenceDirectory>$(ToolsDir)Build.RuntimeStore.References\</RuntimeStoreReferenceDirectory>
+    <RuntimeStoreReferencePackageDirectory>$(RuntimeStoreReferenceDirectory)bin\Release\</RuntimeStoreReferencePackageDirectory>
     <PrepareDependsOn>
       $(PrepareDependsOn);
       UpdateNuGetConfig
@@ -52,6 +54,8 @@
       <Output TaskParameter="PlatformName" PropertyName="OSPlatform" />
     </GetOSPlatform>
 
+    <Error Text="Please specify the platform for the runtime package store via PACKAGE_CACHE_PLATFORM: {x64|x86}." Condition="'$(PACKAGE_CACHE_PLATFORM)' == ''"/>
+
     <PropertyGroup>
       <OutputZipSufix Condition="'$(OSPlatform)' == 'Windows'">win$(PACKAGE_CACHE_PLATFORM)</OutputZipSufix>
       <OutputZipSufix Condition="'$(OSPlatform)' == 'Linux'">linux</OutputZipSufix>
@@ -64,10 +68,25 @@
       <OutputZipNoTimestamp>$(ArtifactsDir)Build.RS.$(OutputZipSufix).zip</OutputZipNoTimestamp>
     </PropertyGroup>
 
+    <!-- Build reference package -->
+    <Exec Command="dotnet restore" WorkingDirectory="$(RuntimeStoreReferenceDirectory)" />
+    <MSBuild Projects="$(RuntimeStoreReferenceDirectory)\Build.RuntimeStore.References.csproj"
+      Targets="Pack"
+      Properties="Configuration=Release" />
+
+    <UpdatePackageSource
+      NuGetConfigPath="$(RepositoryRoot)NuGet.config"
+      SourceName="RuntimeStoreReference"
+      SourceUri="$(RuntimeStoreReferencePackageDirectory)"
+      Condition="Exists('$(RuntimeStoreReferencePackageDirectory)')" />
+
+    <!-- Build runtime store -->
     <RemoveDir Directories="$(PackageCacheOutputPath)" />
     <RemoveDir Directories="$(WorkingDirectory)" />
-    <Exec Command="dotnet store --manifest $(MetaPackageFile) --framework netcoreapp2.0 --runtime $(RID) --output $(PackageCacheOutputPath) --framework-version 2.0.0-* --working-dir $(WorkingDirectory) --skip-symbols" />
 
+    <Exec Command="dotnet store -m $(MetaPackageFile) -f netcoreapp2.0 -r $(RID) -o $(PackageCacheOutputPath) --framework-version 2.0.0-* -w $(WorkingDirectory) --skip-symbols" />
+
+    <!-- Create deps files for hosting startup -->
     <Exec Command="dotnet restore" WorkingDirectory="$(RepositoryRoot)tools\TrimDeps" />
     <Exec Command="dotnet restore" WorkingDirectory="$(HostingStartupTemplatePath)" />
 
diff --git a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj
index 3cce763f2b..0e7105f770 100644
--- a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj
+++ b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj
@@ -7,6 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-   <PackageReference Include="@(RuntimeStorePackageReference)" />
+   <PackageReference Include="Build.RuntimeStore.References" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 </Project>
diff --git a/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj b/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj
new file mode 100644
index 0000000000..4a3a2eaaec
--- /dev/null
+++ b/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\build\common.props" />
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+   <PackageReference Include="@(RuntimeStorePackageReference)" />
+  </ItemGroup>
+</Project>