From 280a84906063d4fef2efab426b069c57a1f883af Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 24 Apr 2017 15:41:28 -0700
Subject: [PATCH] Move the target files to the correct location in .nupkg

---
 build/repo.targets                                            | 2 +-
 src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj  | 4 ++--
 .../Microsoft.AspNetCore.All.targets                          | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Microsoft.AspNetCore.All/build/{netstandard1.6 => netcoreapp2.0}/Microsoft.AspNetCore.All.targets (100%)

diff --git a/build/repo.targets b/build/repo.targets
index 9f7e31a399..d0f0df1dd6 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -93,7 +93,7 @@
 
     <Copy SourceFiles="@(MetaPackageNupkg)" DestinationFolder="$(ArtifactsDir)" />
     <UnzipArchive File="$(ArtifactsDir)%(MetaPackageNupkg.FileName)%(MetaPackageNupkg.Extension)" Destination="@(MetaPackageNupkg->'$(TempDir)%(Filename)')" />
-    <Copy SourceFiles="@(ManifestFiles)" DestinationFolder="@(MetaPackageNupkg->'$(TempDir)%(Filename)\content\build\')" />
+    <Copy SourceFiles="@(ManifestFiles)" DestinationFolder="@(MetaPackageNupkg->'$(TempDir)%(Filename)\build\')" />
 
     <ItemGroup>
       <ArchiveFiles Include="$(TempDir)%(MetaPackageNupkg.Filename)\**\*" />
diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index 80069f3af9..5e2d6cb395 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -14,8 +14,8 @@
    <PackageReference Include="@(FullMetaPackagePackageReference)" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="build\**\*.xml" Package="true" />
-    <Content Include="build\**\*.targets" Package="true" />
+    <Content Include="build\**\*.xml" PackagePath="%(Identity)" />
+    <Content Include="build\**\*.targets" PackagePath="%(Identity)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.All/build/netstandard1.6/Microsoft.AspNetCore.All.targets b/src/Microsoft.AspNetCore.All/build/netcoreapp2.0/Microsoft.AspNetCore.All.targets
similarity index 100%
rename from src/Microsoft.AspNetCore.All/build/netstandard1.6/Microsoft.AspNetCore.All.targets
rename to src/Microsoft.AspNetCore.All/build/netcoreapp2.0/Microsoft.AspNetCore.All.targets