From 43266d2d9ab6900f26989962455dd9f442986d84 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Thu, 23 Feb 2017 02:13:04 -0800
Subject: [PATCH] Move publishing static MSBuildExtensions to redist.csproj

---
 Microsoft.DotNet.Cli.sln      | 1 +
 build/Compile.targets         | 1 -
 build/MSBuildExtensions.props | 5 +++++
 dir.props                     | 1 +
 src/redist/redist.csproj      | 7 +++++++
 5 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 build/MSBuildExtensions.props

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 9f45a0657..499deeca1 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -43,6 +43,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\InitRepo.targets = build\InitRepo.targets
 		build\InputDirectories.props = build\InputDirectories.props
 		build\InstallerInfo.props = build\InstallerInfo.props
+		build\MSBuildExtensions.props = build\MSBuildExtensions.props
 		build\ProjectsToPublish.props = build\ProjectsToPublish.props
 		build\OutputDirectories.props = build\OutputDirectories.props
 		build\Package.targets = build\Package.targets
diff --git a/build/Compile.targets b/build/Compile.targets
index a4b23c597..2278a55b9 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
-    <MSBuildImportsContent Include="$(MSBuildImportsDir)/**/*" /> 
   </ItemGroup>
 
   <Target Name="Compile" DependsOnTargets="Prepare;
diff --git a/build/MSBuildExtensions.props b/build/MSBuildExtensions.props
new file mode 100644
index 000000000..4cfed5ad9
--- /dev/null
+++ b/build/MSBuildExtensions.props
@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <MSBuildExtensionsContent Include="$(MSBuildImportsDir)/**/*" />
+  </ItemGroup>
+</Project>
diff --git a/dir.props b/dir.props
index 44c03f7e7..859114d3e 100644
--- a/dir.props
+++ b/dir.props
@@ -26,6 +26,7 @@
 
   <Import Project="build/FileExtensions.props" />
   <Import Project="build/InputDirectories.props" />
+  <Import Project="build/MSBuildExtensions.props" />
   <Import Project="build/ProjectsToPublish.props" />
   <Import Project="build/OutputDirectories.props" />
   <Import Project="build/BuildDefaults.props" />
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index f51c1fea4..ccf66b081 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -73,4 +73,11 @@
           DepsFile="$(SdkOutputDirectory)/%(BundledTools.Identity).deps.json"
           NewName="%(BundledTools.Identity).deps.json" />
   </Target>
+
+  <Target Name="PublishMSBuildExtensions"
+          AfterTargets="Publish">
+    
+      <Copy SourceFiles="@(MSBuildExtensionsContent)"
+            DestinationFolder="$(SdkOutputDirectory)/%(RecursiveDir)" />
+  </Target>
 </Project>