From f661ec4a8b78c35d8178b8a236bfc462eeb0db1f Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 29 Jun 2016 17:17:32 -0700
Subject: [PATCH] Revert "Making CompileStage batch over the different stages
 to avoid msbuild caching of targets."

This reverts commit e100b950d2655609e53c90e51d859c2be7b8f8d0.
---
 build.proj                                 |   6 +-
 build/Microsoft.DotNet.Cli.Compile.targets | 143 ++++++++++++---------
 build/Microsoft.DotNet.Cli.Prepare.targets |   2 +-
 3 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/build.proj b/build.proj
index 0b41aee5e..f0d06e0cc 100644
--- a/build.proj
+++ b/build.proj
@@ -8,7 +8,7 @@
     <PlatformScriptHost Condition=" '$(OS)' != 'Windows_NT' "></PlatformScriptHost>
 
     <PlatformScriptExtension Condition=" '$(OS)' == 'Windows_NT' ">.ps1</PlatformScriptExtension>
-    <PlatformScriptExtension Condition=" '$(OS)' != 'Windows_NT' ">.sh</PlatformScriptExtension>
+    <PlatformScriptExtension Condition=" '$(OS)' != 'Windows_NT' ">.sh</PlatformScriptExtension>    
 
     <NoRunArg Condition=" '$(OS)' == 'Windows_NT' ">-NoRun</NoRunArg>
     <NoRunArg Condition=" '$(OS)' != 'Windows_NT' ">--norun</NoRunArg>
@@ -55,6 +55,10 @@
   <UsingTask TaskName="TestTargets" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="PublishTargets" AssemblyFile="$(CLIBuildDll)" />
 
+  <Target DependsOnTargets="BuildDotnetCliBuildFramework" Name="Prepare">
+    <PrepareTargets />
+  </Target>
+
   <Target DependsOnTargets="BuildDotnetCliBuildFramework" Name="Test">
     <TestTargets />
   </Target>
diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
index c85690d8b..f2fb8b5d0 100644
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Microsoft.DotNet.Cli.Compile.targets
@@ -9,55 +9,47 @@
     <UsingTask TaskName="CrossgenDirectory" AssemblyFile="$(CLIBuildDll)" />    
 
     <Target Name="Compile" DependsOnTargets="BuildDotnetCliBuildFramework;
-                                             Init;
-                                             SetupStage;
-                                             CompileStage;
-                                             BuildProjectsForNuGetPackages;
-                                             GenerateNuGetPackagesArchive">
+                                             CompileStage1;
+                                             CompileStage2">
     </Target>
-  
-    <Target Name="SetupStage">
-        <ItemGroup>
-          <CompileStageInputs Include="$(RepoRoot)/src/**/*.cs" Exclude="$(RepoRoot)/src/**/obj/**/*.cs" />
-          <CompileStageInputs Include="$(RepoRoot)/src/**/project.json;$(RepoRoot)/src/**/project.lock.json" />
 
-          <Stage Include="Stage1">
-              <Inputs>@(CompileStageInputs)</Inputs>
-              <StageDirectory>$(Stage1Directory)</StageDirectory>
-              <StageSymbolsDirectory>$(Stage1SymbolsDirectory)</StageSymbolsDirectory>
-              <DotnetExe>$(Stage0Path)/dotnet.exe</DotnetExe>
-          </Stage>
-          <Stage Include="Stage2">
-              <Inputs>@(CompileStageInputs)</Inputs>
-              <StageDirectory>$(Stage2Directory)</StageDirectory>
-              <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
-              <DotnetExe>$(DotnetStage1)</DotnetExe>
-          </Stage>          
-        </ItemGroup>        
+    <Target Name="CompileStage1"
+            DependsOnTargets="BuildDotnetCliBuildFramework;
+                              Init;
+                              SetupStage1;
+                              CompileStage;
+                              AfterCompileStage">   
+    </Target>
+
+    <Target Name="SetupStage1">
+        <PropertyGroup>
+            <StageDirectory>$(Stage1Directory)</StageDirectory>
+            <StageSymbolsDirectory>$(Stage1SymbolsDirectory)</StageSymbolsDirectory>
+            <DotnetExe>$(Stage0Path)/dotnet.exe</DotnetExe>
+        </PropertyGroup>
     </Target>    
 
-    <Target Name="CompileStage"
-            Inputs="%(Stage.Identity);%(Stage.Inputs)"
-            Outputs="%(StageDirectory)/sdk/$(NugetVersion)/dotnet.dll">
+    <Target Name="CompileStage2"
+            DependsOnTargets="BuildDotnetCliBuildFramework;
+                              Init;
+                              SetupStage2;
+                              CompileStage;
+                              AfterCompileStage;
+                              BuildProjectsForNuGetPackages;
+                              GenerateNuGetPackagesArchive">
+    </Target>
+
+    <Target Name="SetupStage2">
         <PropertyGroup>
-            <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
+            <StageDirectory>$(Stage2Directory)</StageDirectory>
+            <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
+            <DotnetExe>$(DotnetStage1)</DotnetExe>        
+        </PropertyGroup>
+    </Target>
 
-            <ExeSuffix Condition=" '$(OSName)' == 'win' ">.exe</ExeSuffix>
-            <ExeSuffix Condition=" '$(OSName)' != 'win' "></ExeSuffix>
-
-            <DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
-            <DynamicLibPrefix Condition=" '$(OSName)' != 'win' ">lib</DynamicLibPrefix>
-
-            <DynamicLibSuffix Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibSuffix>
-            <DynamicLibSuffix Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibSuffix>
-            <DynamicLibSuffix Condition=" '$(DynamicLibSuffix)' == '' ">.so</DynamicLibSuffix>
-
-            <DotnetHostBaseName>dotnet$(ExeSuffix)</DotnetHostBaseName>
-            <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
-            <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
-
-            <StageDirectory>%(Stage.StageDirectory)</StageDirectory>
-            <StageSymbolsDirectory>%(Stage.StageSymbolsDirectory)</StageSymbolsDirectory>
+    <Target Name="CompileStage"
+            DependsOnTargets="BeforeCompileStage">
+        <PropertyGroup>
             <SdkOutputDirectory>$(StageDirectory)/sdk/$(NugetVersion)</SdkOutputDirectory>            
             <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
             <BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
@@ -65,10 +57,6 @@
         </PropertyGroup>
 
         <ItemGroup>
-            <BinObj Include="$(SrcDirectory)/**/bin/**/*" />
-            <BinObj Include="$(SrcDirectory)/**/obj/**/*" />
-            <FilesToRemoveFromStageDirectory Include="$(StageDirectory)/**/*" />
-
             <SharedFramework Include="$(IntermediateDirectory)/sharedFrameworkPublish/**/*.*" />
 
             <BinariesToRemove Include="csc" />
@@ -81,22 +69,12 @@
             <MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.tasks" />
         </ItemGroup>
 
-        <SharedFrameworkNameVersionPath RootOutputDirectory="$(StageDirectory)">
-            <Output TaskParameter="OutputSharedFrameworkNameVersionPath" PropertyName="SharedFrameworkNameVersionPath" />
-        </SharedFrameworkNameVersionPath>
-
-        <Delete Files="@(BinObj)" />
-
-        <Delete Files="@(FilesToRemoveFromStageDirectory)" />
-        <RemoveDir Directories="$(StageDirectory)" />
-        <MakeDir Directories="$(StageDirectory)"/>
-
         <!-- CopySharedFramework -->
         <Copy SourceFiles="@(SharedFramework)"
               DestinationFiles="@(SharedFramework->'$(StageDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
       
         <!-- Publish DotNet -->
-        <Exec Command="%(Stage.DotnetExe) publish
+        <Exec Command="$(DotnetExe) publish
                        --native-subdirectory
                        --output $(SdkOutputDirectory)
                        --configuration $(Configuration)
@@ -106,7 +84,7 @@
         <!-- Corehostify Binaries -->
         <FixModeFlags Dir="$(SdkOutputDirectory)" />
 
-        <Exec Command="%(Stage.DotnetExe) publish
+        <Exec Command="$(DotnetExe) publish
                        --output $(SdkOutputDirectory)
                        --framework netcoreapp1.0
                        $(SrcDirectory)/compilers" />
@@ -160,13 +138,46 @@
 
         <Copy SourceFiles="@(MSBuildTargetsToCopy)"
               DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </Target>
+
+    <Target Name="BeforeCompileStage">
+        <PropertyGroup>
+            <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
+
+            <ExeSuffix Condition=" '$(OSName)' == 'win' ">.exe</ExeSuffix>
+            <ExeSuffix Condition=" '$(OSName)' != 'win' "></ExeSuffix>
+
+            <DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
+            <DynamicLibPrefix Condition=" '$(OSName)' != 'win' ">lib</DynamicLibPrefix>
+
+            <DynamicLibSuffix Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibSuffix>
+            <DynamicLibSuffix Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibSuffix>
+            <DynamicLibSuffix Condition=" '$(DynamicLibSuffix)' == '' ">.so</DynamicLibSuffix>
+
+            <DotnetHostBaseName>dotnet$(ExeSuffix)</DotnetHostBaseName>
+            <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
+            <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
+        </PropertyGroup>
 
         <ItemGroup>
-            <FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
-        </ItemGroup>
+          <BinObj Include="$(SrcDirectory)/**/bin/**/*" />
+          <BinObj Include="$(SrcDirectory)/**/obj/**/*" />
+          <FilesToRemoveFromStageDirectory Include="$(StageDirectory)/**/*" />
+        </ItemGroup>        
 
-        <Delete Files="@(FilesToClean)" />
+        <SharedFrameworkNameVersionPath RootOutputDirectory="$(StageDirectory)">
+            <Output TaskParameter="OutputSharedFrameworkNameVersionPath" PropertyName="SharedFrameworkNameVersionPath" />
+        </SharedFrameworkNameVersionPath>
 
+        <Delete Files="@(BinObj)" />
+
+        <Delete Files="@(FilesToRemoveFromStageDirectory)" />
+        <RemoveDir Directories="$(StageDirectory)" />
+        <MakeDir Directories="$(StageDirectory)"/>      
+    </Target>
+
+    <Target Name="AfterCompileStage"
+            DependsOnTargets="RemoveUnnecessaryFiles">
         <ItemGroup>
             <FilesToCopy Include="$(StageDirectory)/**/*.*" />
             <PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
@@ -177,4 +188,12 @@
 
         <Delete Files="@(PdbsToClean)" />
     </Target>
+
+    <Target Name="RemoveUnnecessaryFiles">
+        <ItemGroup>
+            <FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
+        </ItemGroup>
+
+        <Delete Files="@(FilesToClean)" />
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index ada5335f2..5b9165115 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -25,7 +25,7 @@
       <Stage0Path Condition=" '$(OSName)' == 'osx' ">$(RepoRoot)/.dotnet_stage0/Darwin</Stage0Path>
       <Stage0Path Condition=" '$(Stage0Path)' == '' ">$(RepoRoot)/.dotnet_stage0/Linux</Stage0Path>
       <DotNetPath>$(Stage0Path)</DotNetPath>
-
+      
       <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
       <ToolsOutputDirectory>$(BaseOutputDirectory)/tools</ToolsOutputDirectory>
       <Stage1Directory>$(BaseOutputDirectory)/stage1</Stage1Directory>