From 84ead820370137ed9c66fffb2b8863e53a2636a4 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 00:00:36 -0800
Subject: [PATCH 1/5] RootProject property

---
 build/InputFiles.props | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 build/InputFiles.props

diff --git a/build/InputFiles.props b/build/InputFiles.props
new file mode 100644
index 000000000..aa7a87ea2
--- /dev/null
+++ b/build/InputFiles.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <RootProject>$(SrcDirectory)/redist/redist.csproj</RootProject>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

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 2/5] 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"

From 1ed6c2cdac575e4c185ae601da2f9eecc62baae3 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 00:54:01 -0800
Subject: [PATCH 3/5] Fix spacing

---
 build/Compile.targets | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/build/Compile.targets b/build/Compile.targets
index 010407c50..f5518155d 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -16,25 +16,25 @@
                                            GetNuGetPackagesArchive;" />
 
   <Target Name="CompileCLI">
-      <ItemGroup>
-        <SharedFramework Remove="*" />
-        <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
+    <ItemGroup>
+      <SharedFramework Remove="*" />
+      <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
 
-        <RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
-        <RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
+      <RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
+      <RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
 
-        <RuntimeAssetsToRemoveFromDeps Remove="*" />
-        <RuntimeAssetsToRemoveFromDeps Include="redist" />
-        <RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
-        <RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
-      </ItemGroup>
+      <RuntimeAssetsToRemoveFromDeps Remove="*" />
+      <RuntimeAssetsToRemoveFromDeps Include="redist" />
+      <RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
+      <RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
+    </ItemGroup>
 
-      <RemoveDir Directories="$(StageDirectory)" />
-      <MakeDir Directories="$(StageDirectory)"/>
+    <RemoveDir Directories="$(StageDirectory)" />
+    <MakeDir Directories="$(StageDirectory)"/>
 
-      <!-- CopySharedFramework -->
-      <Copy SourceFiles="@(SharedFramework)"
-            DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+    <!-- CopySharedFramework -->
+    <Copy SourceFiles="@(SharedFramework)"
+          DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
 
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"

From b81a00cfe36fd0f04ffdc801e1b46fca506c1737 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 00:56:29 -0800
Subject: [PATCH 4/5] add back Roslyn tasks

---
 src/tool_roslyn/tool_roslyn.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj
index 9923c16ae..c0ebe5e95 100644
--- a/src/tool_roslyn/tool_roslyn.csproj
+++ b/src/tool_roslyn/tool_roslyn.csproj
@@ -12,7 +12,7 @@
     <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)">
-      <IncludeAssets>ContentFiles</IncludeAssets>
+      <IncludeAssets>ContentFiles;Compile</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Net.Compilers.netcore" Version="$(CLI_Roslyn_Version)" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.4.1" />

From 4d0dbdbb7f578dedcf7254024636f497902708e7 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 17:05:49 -0800
Subject: [PATCH 5/5] Cleanup

---
 build/InputFiles.props               | 5 -----
 src/redist/redist.csproj             | 4 +---
 src/tool_msbuild/tool_msbuild.csproj | 6 ++----
 src/tool_roslyn/tool_roslyn.csproj   | 4 +---
 4 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 build/InputFiles.props

diff --git a/build/InputFiles.props b/build/InputFiles.props
deleted file mode 100644
index aa7a87ea2..000000000
--- a/build/InputFiles.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RootProject>$(SrcDirectory)/redist/redist.csproj</RootProject>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 91aedd23c..4cb38d156 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -15,9 +15,7 @@
     <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)">
-      <IncludeAssets>ContentFiles</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" />
     <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 80dc8a3d6..54bd40c4c 100644
--- a/src/tool_msbuild/tool_msbuild.csproj
+++ b/src/tool_msbuild/tool_msbuild.csproj
@@ -7,8 +7,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)">
-      <IncludeAssets>ContentFiles</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj
index c0ebe5e95..001f554ad 100644
--- a/src/tool_roslyn/tool_roslyn.csproj
+++ b/src/tool_roslyn/tool_roslyn.csproj
@@ -11,9 +11,7 @@
   <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)">
-      <IncludeAssets>ContentFiles;Compile</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" Version="$(CLI_Roslyn_Version)" />
     <PackageReference Include="Microsoft.Net.Compilers.netcore" Version="$(CLI_Roslyn_Version)" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.4.1" />
   </ItemGroup>