From 5a89b0145926c7c74a923785bd9b81e0dc7fa273 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 00:46:59 -0800
Subject: [PATCH] Remove HackFilesToCopy

---
 build/Compile.targets                | 10 ----------
 src/redist/redist.csproj             |  4 +++-
 src/tool_msbuild/tool_msbuild.csproj |  4 +++-
 src/tool_roslyn/tool_roslyn.csproj   | 15 +++------------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/build/Compile.targets b/build/Compile.targets
index ef6b9c35f..010407c50 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -36,16 +36,6 @@
       <Copy SourceFiles="@(SharedFramework)"
             DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
 
-    <!-- Workaround for https://github.com/dotnet/sdk/issues/115 -->
-    <ItemGroup>
-      <HackFilesToCopy Include="$(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.0\**;
-                                $(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.1\**;
-                                $(NuGetPackagesDir)\microsoft.codeanalysis.build.tasks\$(CLI_Roslyn_Version)\contentFiles\any\any\**;
-                                $(NuGetPackagesDir)\microsoft.testplatform.cli\$(CLI_TestPlatform_Version)\contentFiles\any\any\**" />
-    </ItemGroup>
-    <Copy SourceFiles="@(HackFilesToCopy)"
-          DestinationFiles="@(HackFilesToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
                    Configuration="$(Configuration)"
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 4cb38d156..91aedd23c 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -15,7 +15,9 @@
     <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
     <PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="NuGet.Build.Tasks" Version="$(CLI_NuGet_Version)" />
-    <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" />
+    <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)">
+      <IncludeAssets>ContentFiles</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.TestPlatform.Build" Version="$(CLI_TestPlatform_Version)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj
index af6b13ecb..80dc8a3d6 100644
--- a/src/tool_msbuild/tool_msbuild.csproj
+++ b/src/tool_msbuild/tool_msbuild.csproj
@@ -7,6 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)" />
+    <PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)">
+      <IncludeAssets>ContentFiles</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj
index 75a94c454..9923c16ae 100644
--- a/src/tool_roslyn/tool_roslyn.csproj
+++ b/src/tool_roslyn/tool_roslyn.csproj
@@ -11,7 +11,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CLI_Roslyn_Version)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" Version="$(CLI_Roslyn_Version)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" Version="$(CLI_Roslyn_Version)">
+      <IncludeAssets>ContentFiles</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Net.Compilers.netcore" Version="$(CLI_Roslyn_Version)" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.4.1" />
   </ItemGroup>
@@ -22,17 +24,6 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
-  
-  <Target Name="AddHackFilesToPublish" 
-          AfterTargets="ComputeFilesToPublish">
-    <ItemGroup>
-      <!-- Workaround for https://github.com/dotnet/sdk/issues/115 -->
-      <HackFilesToCopy Include="$(NuGetPackagesDir)\microsoft.codeanalysis.build.tasks\$(CLI_Roslyn_Version)\contentFiles\any\any\**;" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(HackFilesToCopy)"
-        DestinationFiles="@(HackFilesToCopy->'$(PublishDir)/%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
 
   <Target Name="MakeCscRunnableAndMoveToPublishDir"
           AfterTargets="Publish"