Move publishing static MSBuildExtensions to redist.csproj

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

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;

build/MSBuildExtensions.props

@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <MSBuildExtensionsContent Include="$(MSBuildImportsDir)/**/*" />
+  </ItemGroup>
+</Project>

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" />

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>