From 8dfc6a00e5c7aee744bae9ff36502f98a14b5278 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 17 Jul 2017 13:58:49 -0700
Subject: [PATCH] Use installed shared framework version during deps file
 generation

instead of the shared framework version bundled with the SDK
---
 build/dependencies.props           | 1 -
 build/repo.targets                 | 9 ++++++---
 tools/GetSharedFrameworkVersion.sh | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100755 tools/GetSharedFrameworkVersion.sh

diff --git a/build/dependencies.props b/build/dependencies.props
index 00425fd6f5..518d7acf5c 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,7 +3,6 @@
     <AspNetCoreIntegrationTestingVersion>0.4.0-*</AspNetCoreIntegrationTestingVersion>
     <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
     <CoreFxVersion>4.4.0-*</CoreFxVersion>
-    <DepsRuntimeFrameworkVersion>2.0.0-preview3-25514-02</DepsRuntimeFrameworkVersion>
     <DotnetDebToolVersion>2.0.0-preview2-*</DotnetDebToolVersion>
     <InternalAspNetCoreSdkVersion>2.0.1-*</InternalAspNetCoreSdkVersion>
     <MoqVersion>4.7.49</MoqVersion>
diff --git a/build/repo.targets b/build/repo.targets
index 1b6267d0da..d9f6d219b1 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -75,7 +75,7 @@
       Condition="Exists('$(DependencyBuildDirectory)')" />
   </Target>
 
-  <Target Name="BuildPackageCache" DependsOnTargets="UpdateNuGetConfig;AddDiaSymReaderToPath">
+  <Target Name="BuildPackageCache" DependsOnTargets="UpdateNuGetConfig;AddDiaSymReaderToPath;_ResolveCurrentSharedFrameworkVersion">
     <GetOSPlatform>
       <!-- Returns {Linux, macOS, Windows} -->
       <Output TaskParameter="PlatformName" PropertyName="OSPlatform" />
@@ -125,7 +125,7 @@
     <Exec Command="dotnet restore" WorkingDirectory="$(HostingStartupTemplatePath)" />
 
     <!--- MSBuild caches things if you run inproc so have to use Exec -->
-    <Exec Command="dotnet msbuild /t:&quot;Restore;Rebuild;CollectDeps&quot; $(HostingStartupTemplateFile) /p:&quot;DepsOutputPath=$(DepsOutputPath);HostingStartupPackageName=%(HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(Version)&quot;"/>
+    <Exec Command="dotnet msbuild /t:&quot;Restore;Rebuild;CollectDeps&quot; $(HostingStartupTemplateFile) /p:&quot;DepsOutputPath=$(DepsOutputPath);HostingStartupPackageName=%(HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(Version);RuntimeFrameworkVersion=$(SharedFrameworkVersion)&quot;"/>
 
     <ItemGroup>
       <PackageStoreManifestFiles Include="$(RuntimeStoreOutputPath)**\artifact.xml">
@@ -205,7 +205,10 @@
 
   <Target Name="_ResolveCurrentSharedFrameworkVersion">
     <!-- Parse framework version -->
-    <Exec Command="powershell.exe $(ToolsDir)GetSharedFrameworkVersion.ps1" ConsoleToMSBuild="true">
+    <Exec Command="powershell.exe $(ToolsDir)GetSharedFrameworkVersion.ps1" ConsoleToMSBuild="true" Condition="'$(OS)' == 'Windows_NT'">
+      <Output TaskParameter="ConsoleOutput" PropertyName="SharedFrameworkVersion" />
+    </Exec>
+    <Exec Command="bash $(ToolsDir)GetSharedFrameworkVersion.sh" ConsoleToMSBuild="true" Condition="'$(OS)' != 'Windows_NT'">
       <Output TaskParameter="ConsoleOutput" PropertyName="SharedFrameworkVersion" />
     </Exec>
   </Target>
diff --git a/tools/GetSharedFrameworkVersion.sh b/tools/GetSharedFrameworkVersion.sh
new file mode 100755
index 0000000000..1b6e0b4bb0
--- /dev/null
+++ b/tools/GetSharedFrameworkVersion.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+dotnet --info | grep -i version | tail -1 | cut -f 2 -d ":" | tr -d ' '
\ No newline at end of file