From 097c34b025592e2c928338e4061a0d4290d2b418 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 17 Apr 2017 16:59:19 -0700
Subject: [PATCH] Feedback

---
 .../Microsoft.AspNetCore.All.csproj           |  4 +--
 ...ublishWithAspNetCoreTargetManifest.targets | 29 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index 64a2331..12516fb 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -148,8 +148,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="build\**\*.xml" Pack="true" PackagePath="%(Identity)" />
-    <Content Include="build\**\*.targets" Pack="true" PackagePath="%(Identity)" />
+    <Content Include="build\**\*.xml" PackagePath="%(Identity)" />
+    <Content Include="build\**\*.targets" PackagePath="%(Identity)" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets b/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets
index 3bd640b..c20d8c0 100644
--- a/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets
+++ b/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets
@@ -1,7 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!--<Import Project="Microsoft.NET.RuntimeIdentifierInference.targets" />-->
-
   <PropertyGroup>
     <PublishWithAspNetCoreTargetManifest Condition="'$(PublishWithAspNetCoreTargetManifest)'==''">true</PublishWithAspNetCoreTargetManifest>
   </PropertyGroup>
@@ -19,24 +17,33 @@ Append the default ASP.NET Core runtime package store manifest during publish
     Condition="'$(PublishWithAspNetCoreTargetManifest)'=='true' and '$(PublishableProject)'=='true'" >
 
     <PropertyGroup>
-      <ResolvedRuntimeIdentifier>$(AspNetCoreTargetManifestRuntimeIdentifier)</ResolvedRuntimeIdentifier>
-      <ResolvedRuntimeIdentifier Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'=='' and '$(OS)'=='Windows_NT' and '$(PlatformTarget)'!='x86'">win7-x64</ResolvedRuntimeIdentifier>
-      <ResolvedRuntimeIdentifier Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'=='' and '$(OS)'=='Windows_NT' and '$(PlatformTarget)'=='x86'">win7-x86</ResolvedRuntimeIdentifier>
-      <ResolvedRuntimeIdentifier Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'=='' and '$(OS)'=='OSX'">osx.10.12-x64</ResolvedRuntimeIdentifier>
-      <ResolvedRuntimeIdentifier Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'=='' and '$(OS)'=='Unix'">linux-x64</ResolvedRuntimeIdentifier>
+      <ManifestRuntimeIdentifier>$(AspNetCoreTargetManifestRuntimeIdentifier)</ManifestRuntimeIdentifier>
+      <ManifestRuntimeIdentifier Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
+          and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
+          and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">win7-x64</ManifestRuntimeIdentifier>
+      <ManifestRuntimeIdentifier
+        Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
+          and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
+          and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X86'">win7-x86</ManifestRuntimeIdentifier>
+      <ManifestRuntimeIdentifier
+        Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
+          and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))'">osx.10.12-x64</ManifestRuntimeIdentifier>
+      <ManifestRuntimeIdentifier
+        Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
+          and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">linux-x64</ManifestRuntimeIdentifier>
     </PropertyGroup>
 
     <Error
       Text="Could not resolve manifest runtime identifier. Please specify the the runtime identifier via the AspNetCoreTargetManifestRuntimeIdentifier property."
-      Condition="'$(ResolvedRuntimeIdentifier)'==''" />
+      Condition="'$(ManifestRuntimeIdentifier)'==''" />
 
     <Message
-      Text="Appending default ASP.NET Core runtime package store manifest for use during publish based for the runtime $(ResolvedRuntimeIdentifier)."
+      Text="Appending default ASP.NET Core runtime package store manifest for use during publish based for the runtime $(ManifestRuntimeIdentifier)."
       Importance="normal"
-      Condition="'$(ResolvedRuntimeIdentifier)'!=''" />
+      Condition="'$(ManifestRuntimeIdentifier)'!=''" />
 
     <PropertyGroup>
-      <TargetManifest Condition="'$(ResolvedRuntimeIdentifier)'!=''">$(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ResolvedRuntimeIdentifier).xml</TargetManifest>
+      <TargetManifest Condition="'$(ManifestRuntimeIdentifier)'!=''">$(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ManifestRuntimeIdentifier).xml</TargetManifest>
     </PropertyGroup>
   </Target>
 </Project>
\ No newline at end of file