From 12fde69e868145d3ae58fbbdd45025c4f435a655 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 1 Mar 2017 00:30:02 -0800
Subject: [PATCH] Move remaining Publish actions to redist.csproj

---
 build/Compile.targets             | 51 +------------------------------
 build/Prepare.targets             |  2 --
 build/compile/LzmaArchive.targets |  3 +-
 dir.props                         |  2 ++
 src/redist/redist.csproj          | 50 ++++++++++++++++++++++++++++--
 5 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/build/Compile.targets b/build/Compile.targets
index 56bd6d433..d48bc1ff6 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="compile/LzmaArchive.targets" />
-
-  <ItemGroup>
-    <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
-  </ItemGroup>
 
   <Target Name="Compile" DependsOnTargets="Prepare;
                                            CompileCLI;
-                                           PublishSdks;
-                                           PublishTemplates;
-                                           BuildProjectsForNuGetPackages;
-                                           GetNuGetPackagesArchive;" />
+                                           BuildProjectsForNuGetPackages;" />
 
   <Target Name="CompileCLI">
     <RemoveDir Directories="$(OutputDirectory)" />
@@ -21,46 +13,5 @@
     <DotNetPublish ToolPath="$(Stage0Directory)"
                    Configuration="$(Configuration)"
                    ProjectPath="$(RootProject)" />
-
-  </Target>
-
-  <Target Name="PublishSdks"
-          DependsOnTargets="Prepare">
-    <ItemGroup>
-      <SdksToBundle Include="build/BundledSdks.proj">
-        <Properties>
-          CLIBuildDll=$(CLIBuildDll);
-          NuGetPackagesDir=$(NuGetPackagesDir);
-          SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
-          SdkPackageName=%(BundledSdk.Identity);
-          SdkPackageVersion=%(BundledSdk.Version);
-          Stage0Directory=$(Stage0Directory)
-        </Properties>
-      </SdksToBundle>
-    </ItemGroup>
-
-    <MSBuild
-      BuildInParallel="False"
-      Projects="@(SdksToBundle)">
-    </MSBuild>
-  </Target>
-
-  <Target Name="PublishTemplates"
-          DependsOnTargets="Prepare">
-    <ItemGroup>
-      <TemplatesToBundle Include="build/BundledTemplates.proj">
-        <Properties>
-          TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
-          TemplatePackageName=%(BundledTemplate.Identity);
-          TemplatePackageVersion=%(BundledTemplate.Version);
-          Stage0Directory=$(Stage0Directory)
-        </Properties>
-      </TemplatesToBundle>
-    </ItemGroup>
-
-    <MSBuild
-      BuildInParallel="False"
-      Projects="@(TemplatesToBundle)">
-    </MSBuild>
   </Target>
 </Project>
diff --git a/build/Prepare.targets b/build/Prepare.targets
index b29d8737d..22212ab6e 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -2,8 +2,6 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Microsoft.DotNet.Cli.tasks" />
   <Import Project="prepare/CheckPrereqs.targets" />
-  <Import Project="BundledSdks.props" />
-  <Import Project="BundledTemplates.props" />
 
   <Target Name="Prepare"
           DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages" />
diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index 61c22c8b5..77155e5da 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -111,8 +111,7 @@
       <Exec Command="$(DotnetInOutputDirectory) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
     </Target>
 
-    <Target Name="SetupNuGetPackagesArchiveInputsOutputs"
-            DependsOnTargets="Prepare">
+    <Target Name="SetupNuGetPackagesArchiveInputsOutputs">
       <GenerateNuGetPackagesArchiveVersion ToolPath="$(OutputDirectory)">
         <Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion"/>
       </GenerateNuGetPackagesArchiveVersion>
diff --git a/dir.props b/dir.props
index 1c28a15e9..8d31ff867 100644
--- a/dir.props
+++ b/dir.props
@@ -20,6 +20,8 @@
   <Import Project="build/BranchInfo.props" />
 
   <Import Project="build/BundledTools.props" />
+  <Import Project="build/BundledSdks.props" />
+  <Import Project="build/BundledTemplates.props" />
   <Import Project="build/DependencyVersions.props" />
   <Import Project="build/Version.props" />
   <Import Project="build/Branding.props" />
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 1de45e8b8..9dd47bb28 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
-  
+  <Import Project="$(RepoRoot)/build/compile/LzmaArchive.targets" />
+
   <PropertyGroup>
     <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -110,6 +111,51 @@
                                    AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" />
   </Target>
 
+  <Target Name="PublishSdks"
+          AfterTargets="Publish">
+    <ItemGroup>
+      <SdksToBundle Include="$(RepoRoot)/build/BundledSdks.proj">
+        <Properties>
+          CLIBuildDll=$(CLIBuildDll);
+          NuGetPackagesDir=$(NuGetPackagesDir);
+          SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
+          SdkPackageName=%(BundledSdk.Identity);
+          SdkPackageVersion=%(BundledSdk.Version);
+          Stage0Directory=$(Stage0Directory);
+        </Properties>
+      </SdksToBundle>
+    </ItemGroup>
+
+    <MSBuild
+      BuildInParallel="False"
+      Projects="@(SdksToBundle)">
+    </MSBuild>
+  </Target>
+
+  <Target Name="PublishTemplates"
+          AfterTargets="Publish">
+    <ItemGroup>
+      <TemplatesToBundle Include="$(RepoRoot)/build/BundledTemplates.proj">
+        <Properties>
+          TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
+          TemplatePackageName=%(BundledTemplate.Identity);
+          TemplatePackageVersion=%(BundledTemplate.Version);
+          Stage0Directory=$(Stage0Directory);
+        </Properties>
+      </TemplatesToBundle>
+    </ItemGroup>
+
+    <MSBuild
+      BuildInParallel="False"
+      Projects="@(TemplatesToBundle)">
+    </MSBuild>
+  </Target>
+
+  <Target Name="PublishLzmaArchive"
+          DependsOnTargets="GetNuGetPackagesArchive"
+          AfterTargets="Publish">
+  </Target>
+
   <Target Name="CrossgenPublishDir"
           Condition=" '$(DISABLE_CROSSGEN)' == '' "
           AfterTargets="PublishMSBuildExtensions">
@@ -164,7 +210,7 @@
   <Target Name="RemoveVbc"
           AfterTargets="CrossgenPublishDir">
     <ItemGroup>
-      <_VbcPath Include="$(PublishDir)/sdk/**/vbc.exe" />
+      <_VbcPath Include="$(PublishDir)/**/vbc.exe" />
     </ItemGroup>
 
     <Delete Files="@(_VbcPath)" />