From 7664b8b24589327ef6dad4aebf1e55bfb7de6a94 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 17 Apr 2017 17:31:33 -0700
Subject: [PATCH] Feedback

---
 .../Microsoft.AspNetCore.All.csproj           |  4 +--
 ...ublishWithAspNetCoreTargetManifest.targets | 25 +++++++++----------
 .../Microsoft.AspNetCore.All.targets          |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index 12516fb..82eddee 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" PackagePath="%(Identity)" />
-    <Content Include="build\**\*.targets" PackagePath="%(Identity)" />
+    <Content Include="build\**\*.xml" Package="true" />
+    <Content Include="build\**\*.targets" Package="true" />
   </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 c20d8c0..5fdccb6 100644
--- a/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets
+++ b/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
   <PropertyGroup>
     <PublishWithAspNetCoreTargetManifest Condition="'$(PublishWithAspNetCoreTargetManifest)'==''">true</PublishWithAspNetCoreTargetManifest>
@@ -18,19 +18,19 @@ Append the default ASP.NET Core runtime package store manifest during publish
 
     <PropertyGroup>
       <ManifestRuntimeIdentifier>$(AspNetCoreTargetManifestRuntimeIdentifier)</ManifestRuntimeIdentifier>
-      <ManifestRuntimeIdentifier Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
-          and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''">
+      <ManifestRuntimeIdentifier
+        Condition="'$([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)))'
+        Condition="'$([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>
+        Condition="'$([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>
+        Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">linux-x64</ManifestRuntimeIdentifier>
     </PropertyGroup>
 
     <Error
@@ -39,11 +39,10 @@ Append the default ASP.NET Core runtime package store manifest during publish
 
     <Message
       Text="Appending default ASP.NET Core runtime package store manifest for use during publish based for the runtime $(ManifestRuntimeIdentifier)."
-      Importance="normal"
-      Condition="'$(ManifestRuntimeIdentifier)'!=''" />
+      Importance="low" />
 
     <PropertyGroup>
-      <TargetManifest Condition="'$(ManifestRuntimeIdentifier)'!=''">$(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ManifestRuntimeIdentifier).xml</TargetManifest>
+      <TargetManifest>$(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ManifestRuntimeIdentifier).xml</TargetManifest>
     </PropertyGroup>
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Microsoft.AspNetCore.All/build/netstandard1.6/Microsoft.AspNetCore.All.targets b/src/Microsoft.AspNetCore.All/build/netstandard1.6/Microsoft.AspNetCore.All.targets
index de54a33..37dd143 100644
--- a/src/Microsoft.AspNetCore.All/build/netstandard1.6/Microsoft.AspNetCore.All.targets
+++ b/src/Microsoft.AspNetCore.All/build/netstandard1.6/Microsoft.AspNetCore.All.targets
@@ -1,3 +1,3 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <Import Project="$(MSBuildThisFileDirectory)..\PublishWithAspNetCoreTargetManifest.targets" />
 </Project>
\ No newline at end of file