From cb389fe9b0065c09806913733ed07eeaf253378d Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 5 Jun 2017 17:30:13 -0700
Subject: [PATCH 1/2] Display info for dotnet used to create runtime store and
 deps files

---
 build/repo.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/repo.targets b/build/repo.targets
index b267de7f01..36ebc010bb 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -56,6 +56,9 @@
 
     <Error Text="Please specify the platform for the runtime package store via PACKAGE_CACHE_PLATFORM: {x64|x86}." Condition="'$(PACKAGE_CACHE_PLATFORM)' == ''"/>
 
+    <!-- Display dotnet info -->
+    <Exec Command="dotnet --info" />
+
     <PropertyGroup>
       <OutputZipSufix Condition="'$(OSPlatform)' == 'Windows'">win$(PACKAGE_CACHE_PLATFORM)</OutputZipSufix>
       <OutputZipSufix Condition="'$(OSPlatform)' == 'Linux'">linux</OutputZipSufix>

From cde593c0e063d109597cdae409004dbe5bffec76 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Mon, 5 Jun 2017 18:18:13 -0700
Subject: [PATCH 2/2] Allow overriding RuntimeFrameworkVersion used for deps
 generation.

---
 .../Microsoft.AspNetCore.HostingStartup.Template.csproj   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj b/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj
index c3e6a50687..00df34bd07 100644
--- a/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj
+++ b/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj
@@ -14,9 +14,11 @@
 
   <Target Name="CollectDeps">
     <PropertyGroup>
-      <DestinationDepsFile>$(DepsOutputPath)\$(HostingStartupPackageName)\shared\Microsoft.NETCore.App\$(RuntimeFrameworkVersion)\$(HostingStartupPackageName).deps.json</DestinationDepsFile>
+      <CurrentRuntimeFrameworkVersion Condition="'$(CurrentRuntimeFrameworkVersion)' == ''">$(RuntimeFrameworkVersion)</CurrentRuntimeFrameworkVersion>
+      <DestinationDepsFile>$(DepsOutputPath)\$(HostingStartupPackageName)\shared\Microsoft.NETCore.App\$(CurrentRuntimeFrameworkVersion)\$(HostingStartupPackageName).deps.json</DestinationDepsFile>
     </PropertyGroup>
-      <Copy SourceFiles="$(ProjectDepsFilePath)" DestinationFiles="$(DestinationDepsFile)" />
-      <Exec Command="dotnet run --framework netcoreapp2.0 $([System.IO.Path]::GetFullPath('$(DestinationDepsFile)'))" WorkingDirectory="../TrimDeps/"/>
+
+    <Copy SourceFiles="$(ProjectDepsFilePath)" DestinationFiles="$(DestinationDepsFile)" />
+    <Exec Command="dotnet run --framework netcoreapp2.0 $([System.IO.Path]::GetFullPath('$(DestinationDepsFile)'))" WorkingDirectory="../TrimDeps/"/>
   </Target>
 </Project>