From f53b7c02eb52c14e4f062d5e225f5e79d02b51e5 Mon Sep 17 00:00:00 2001
From: DotDeveloper95 <supercupid95@outlook.com>
Date: Thu, 19 Jan 2017 11:41:53 -0800
Subject: [PATCH] Resolve RuntimeFrameworkVersion from version of
 Microsoft.NETCore.App, not TFM

Workaround dotnet/sdk#686

Also, fix casing of the serviceable assembly attribute
---
 .../build/GenerateAssemblyInfo.targets        |  2 +-
 .../build/Internal.AspNetCore.Sdk.targets     |  1 +
 .../build/Workarounds.targets                 | 35 +++++++++++++++++++
 .../project.json                              | 24 -------------
 4 files changed, 37 insertions(+), 25 deletions(-)
 create mode 100644 src/Internal.AspNetCore.Sdk/build/Workarounds.targets
 delete mode 100644 src/Microsoft.AspNetCore.BuildTools.ApiCheck/project.json

diff --git a/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets b/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets
index 3726049..308ba97 100644
--- a/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets
+++ b/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets
@@ -26,7 +26,7 @@ Generates assembly attributes for ASP.NET Core binaries
       <_InternalAspNetCoreAttributes Remove="@(_InternalAspNetCoreAttributes)" />
       <_InternalAspNetCoreAttributes Include="System.Reflection.AssemblyMetadata" Condition="'$(Serviceable)'!='false'">
         <_Parameter1>Serviceable</_Parameter1>
-        <_Parameter2>true</_Parameter2>
+        <_Parameter2>True</_Parameter2>
       </_InternalAspNetCoreAttributes>
       <!-- TODO embed commit hash -->
     </ItemGroup>
diff --git a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets b/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets
index 52bbb23..9dfd897 100644
--- a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets
+++ b/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets
@@ -5,4 +5,5 @@ for use outside of Microsoft.
 <Project ToolsVersion="15.0">
   <Import Project="$(MSBuildThisFileDirectory)..\targets\BuildNumber.targets" />
   <Import Project="$(MSBuildThisFileDirectory)GenerateAssemblyInfo.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)Workarounds.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Internal.AspNetCore.Sdk/build/Workarounds.targets b/src/Internal.AspNetCore.Sdk/build/Workarounds.targets
new file mode 100644
index 0000000..2985112
--- /dev/null
+++ b/src/Internal.AspNetCore.Sdk/build/Workarounds.targets
@@ -0,0 +1,35 @@
+<!--
+WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
+for use outside of Microsoft.
+
+This file is dedicated to working around issues in Microsoft.NET.Sdk
+-->
+<Project ToolsVersion="15.0">
+  <!-- workaround https://github.com/dotnet/sdk/issues/686 -->
+  <Target Name="SetRuntimeFrameworkVersionToPackageVersion"
+          Condition="'$(OutputType)'=='Exe' AND '$(TargetFrameworkIdentifier)'=='.NETCoreApp'"
+          DependsOnTargets="_DefaultMicrosoftNETPlatformLibrary"
+          BeforeTargets="GenerateBuildRuntimeConfigurationFiles">
+
+      <ResolvePackageDependencies
+        ProjectPath="$(MSBuildProjectFullPath)"
+        ProjectAssetsFile="$(ProjectAssetsFile)"
+        ProjectLanguage="$(Language)">
+
+        <Output TaskParameter="PackageDefinitions" ItemName="_PackageDefinitions" />
+      </ResolvePackageDependencies>
+
+      <ItemGroup>
+        <_FilteredDefinitions Remove="@(_FilteredDefinitions)" />
+        <_FilteredDefinitions Include="@(_PackageDefinitions)" Condition="'%(_PackageDefinitions.Name)'=='$(MicrosoftNETPlatformLibrary)'" />
+      </ItemGroup>
+
+      <PropertyGroup Condition="'@(_FilteredDefinitions->Count())' == 1">
+        <_ResolvedNetCoreAppVersion>@(_FilteredDefinitions -> '%(Version)')</_ResolvedNetCoreAppVersion>
+        <RuntimeFrameworkVersion Condition="'$(_ResolvedNetCoreAppVersion)'!=''">$(_ResolvedNetCoreAppVersion)</RuntimeFrameworkVersion>
+      </PropertyGroup>
+
+      <Message Importance="normal" Text="[$(TargetFramework)] resolved RuntimeFrameworkVersion to '$(RuntimeFrameworkVersion)'" />
+  </Target>
+  <!-- end workaround -->
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/project.json b/src/Microsoft.AspNetCore.BuildTools.ApiCheck/project.json
deleted file mode 100644
index 538a8cc..0000000
--- a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "version": "1.0.1-*",
-  "buildOptions": {
-    "emitEntryPoint": true
-  },
-
-  "dependencies": {
-    "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-    "Microsoft.Extensions.CommandLineUtils": "1.0.0",
-    "Newtonsoft.Json": "9.0.1"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0"
-        },
-        "System.Runtime.Loader": "4.0.0"
-      }
-    },
-    "net451": { }
-  }
-}
\ No newline at end of file