From 68f3765e6d677bd30383f97799133167045a9f22 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Mon, 16 Sep 2019 15:17:32 -0700
Subject: [PATCH] Fix packing on *nix systems (dotnet/extensions#2344)

- Without this fix, the nupkg will be missing files if packed on *nix systems\n\nCommit migrated from https://github.com/dotnet/extensions/commit/51e8af72d5bb14b970dde12caa089d7357631614
---
 .../src/Microsoft.Extensions.FileProviders.Embedded.csproj  | 4 +---
 ...oft.Extensions.FileProviders.Embedded.multitarget.nuspec | 6 +++---
 ...soft.Extensions.FileProviders.Embedded.netcoreapp.nuspec | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
index dc49b3fd75..3d5fe3cf54 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
@@ -27,9 +27,7 @@
 
   <ItemGroup>
     <NuspecProperty Include="AssemblyName=$(AssemblyName)" />
-    <NuspecProperty Include="OutputBinary=$(OutputPath)**\$(AssemblyName).dll" />
-    <NuspecProperty Include="OutputSymbol=$(OutputPath)**\$(AssemblyName).pdb" />
-    <NuspecProperty Include="OutputDocumentation=$(OutputPath)**\$(AssemblyName).xml" />
+    <NuspecProperty Include="OutputPath=$(OutputPath)" />
     <NuspecProperty Include="TaskAssemblyNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll"/>
     <NuspecProperty Include="TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb" Condition="'$(DebugType)'!='embedded'"/>
   </ItemGroup>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
index 59a0e89b7f..a11c9c591e 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
@@ -13,9 +13,9 @@
   </metadata>
 
   <files>
-    <file src="$OutputBinary$" target="lib\" />
-    <file src="$OutputSymbol$" target="lib\" />
-    <file src="$OutputDocumentation$" target="lib\" />
+    <file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
+    <file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
+    <file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
     <file src="build\**\*" target="build\" />
     <file src="buildMultiTargeting\**\*" target="buildMultiTargeting\" />
     <file src="$TaskAssemblyNetStandard$" target="tasks\netstandard2.0\$AssemblyName$.Manifest.Task.dll" />
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
index b0e9df4875..3033cff8c9 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
@@ -10,9 +10,9 @@
   </metadata>
 
   <files>
-    <file src="$OutputBinary$" target="lib\" />
-    <file src="$OutputSymbol$" target="lib\" />
-    <file src="$OutputDocumentation$" target="lib\" />
+    <file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
+    <file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
+    <file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
     <file src="build\**\*" target="build\" />
     <file src="buildMultiTargeting\**\*" target="buildMultiTargeting\" />
     <file src="$TaskAssemblyNetStandard$" target="tasks\netstandard2.0\$AssemblyName$.Manifest.Task.dll" />