From 61c1e3e1047d4f2fb7906397603d2678c31f0d07 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Mon, 27 Feb 2017 11:06:44 -0800
Subject: [PATCH] Remove duplicate properties

---
 build/Compile.targets                         | 14 ++++----
 build/OutputDirectories.props                 | 16 ++++-----
 build/Signing.proj                            | 34 +++++++++----------
 build/Test.targets                            | 14 ++++----
 build/compile/LzmaArchive.targets             | 12 +++----
 build/package/Installer.DEB.targets           | 17 ++++------
 build/package/Layout.targets                  | 10 +++---
 build/package/Nupkg.targets                   |  2 +-
 .../InvokeWithStage0.proj                     |  4 +--
 src/redist/redist.csproj                      |  4 +--
 src/tool_roslyn/tool_roslyn.csproj            |  2 +-
 11 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/build/Compile.targets b/build/Compile.targets
index 221c49624..a4b23c597 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -8,7 +8,7 @@
     <LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
     <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
     <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
-    <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
+    <SharedFrameworkNameVersionPath>$(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,8 +24,8 @@
                                            GetNuGetPackagesArchive;" />
 
   <Target Name="CompileCLI">
-    <RemoveDir Directories="$(StageDirectory)" />
-    <MakeDir Directories="$(StageDirectory)"/>
+    <RemoveDir Directories="$(OutputDirectory)" />
+    <MakeDir Directories="$(OutputDirectory)"/>
 
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
@@ -135,18 +135,18 @@
             DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
 
       <ItemGroup>
-        <FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
+        <FilesToClean Include="$(OutputDirectory)/sdk/**/vbc.exe" />
       </ItemGroup>
 
       <Delete Files="@(FilesToClean)" />
 
       <ItemGroup>
-        <FilesToCopy Include="$(StageDirectory)/**/*" />
-        <PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
+        <FilesToCopy Include="$(OutputDirectory)/**/*" />
+        <PdbsToClean Include="$(OutputDirectory)/sdk/**/*.pdb" />
       </ItemGroup>
 
       <Copy SourceFiles="@(FilesToCopy)"
-          DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
+          DestinationFiles="@(FilesToCopy->'$(SymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
 
       <Delete Files="@(PdbsToClean)" />
   </Target>
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index 07f70c2af..467b64964 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -1,19 +1,15 @@
 <Project>
   <PropertyGroup>
       <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
-      <Stage2Directory>$(BaseOutputDirectory)/stage2</Stage2Directory>
-      <Stage2SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</Stage2SymbolsDirectory>
-      <Stage2SdkDirectory>$(Stage2Directory)/sdk/$(SdkVersion)</Stage2SdkDirectory>
-      <Stage2RoslynDirectory>$(Stage2SdkDirectory)/Roslyn</Stage2RoslynDirectory>
-      <DotnetStage2>$(Stage2Directory)/dotnet$(ExeExtension)</DotnetStage2>
-      <OutputDirectory>$(Stage2Directory)/</OutputDirectory>
-      <Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
-      <StageDirectory>$(Stage2Directory)</StageDirectory>
-      <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
-      <SdkOutputDirectory>$(Stage2SdkDirectory)</SdkOutputDirectory>
+      <OutputDirectory>$(BaseOutputDirectory)/stage2</OutputDirectory>
+      <SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
+      <SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</SymbolsDirectory>
+      <RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory>
+      <CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</CompilationDirectory>
       <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
       <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
       <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
+      <DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory>
   </PropertyGroup>
 </Project>
diff --git a/build/Signing.proj b/build/Signing.proj
index 06581504a..267f0c975 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -15,8 +15,8 @@
     <Error Condition="'$(Rid)' == ''" Text="Missing required property 'Rid'." />
     <PropertyGroup>
       <BaseOutputDirectory Condition="'$(BaseOutputDirectory)' == ''">$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
-      <Stage2Directory Condition="'$(Stage2Directory)' == ''">$(BaseOutputDirectory)/stage2</Stage2Directory>
-      <Stage2CompilationDirectory Condition="'$(Stage2CompilationDirectory)' == ''">$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
+      <OutputDirectory Condition="'$(OutputDirectory)' == ''">$(BaseOutputDirectory)/stage2</OutputDirectory>
+      <CompilationDirectory Condition="'$(CompilationDirectory)' == ''">$(BaseOutputDirectory)/stage2compilation</CompilationDirectory>
       <PackagesDirectory Condition="'$(PackagesDirectory)' == ''">$(BaseOutputDirectory)/packages</PackagesDirectory>
 
       <!-- The OutDir and IntermediateOutputPath properties are required by MicroBuild. MicroBuild only
@@ -31,27 +31,27 @@
   <Target Name="GetPostCompileSignFiles">
     <ItemGroup>
       <!-- External files -->
-      <FilesToSign Include="$(Stage2Directory)/sdk/**/Newtonsoft.Json.dll;
-                            $(Stage2Directory)/shared/**/libuv.dll">
+      <FilesToSign Include="$(OutputDirectory)/sdk/**/Newtonsoft.Json.dll;
+                            $(OutputDirectory)/shared/**/libuv.dll">
         <Authenticode>$(ExternalCertificateId)</Authenticode>
       </FilesToSign>
       <!-- Built binaries -->
-      <FilesToSign Include="$(Stage2Directory)/sdk/**/csc.exe;
-                            $(Stage2Directory)/sdk/**/csc.dll;
-                            $(Stage2Directory)/sdk/**/dotnet.dll;
-                            $(Stage2Directory)/sdk/**/System.*.dll;
-                            $(Stage2Directory)/sdk/**/Microsoft.*.dll;
-                            $(Stage2Directory)/sdk/**/NuGet*.dll;
-                            $(Stage2Directory)/sdk/**/datacollector.dll;
-                            $(Stage2Directory)/sdk/**/MSBuild.dll;
-                            $(Stage2Directory)/sdk/**/testhost.dll;
-                            $(Stage2Directory)/sdk/**/vstest.console.dll">
+      <FilesToSign Include="$(OutputDirectory)/sdk/**/csc.exe;
+                            $(OutputDirectory)/sdk/**/csc.dll;
+                            $(OutputDirectory)/sdk/**/dotnet.dll;
+                            $(OutputDirectory)/sdk/**/System.*.dll;
+                            $(OutputDirectory)/sdk/**/Microsoft.*.dll;
+                            $(OutputDirectory)/sdk/**/NuGet*.dll;
+                            $(OutputDirectory)/sdk/**/datacollector.dll;
+                            $(OutputDirectory)/sdk/**/MSBuild.dll;
+                            $(OutputDirectory)/sdk/**/testhost.dll;
+                            $(OutputDirectory)/sdk/**/vstest.console.dll">
         <Authenticode>$(InternalCertificateId)</Authenticode>
       </FilesToSign>
       <!-- Built files for the packages -->
-      <FilesToSign Include="$(Stage2CompilationDirectory)/forPackaging/**/*dotnet*.dll;
-                            $(Stage2CompilationDirectory)/forPackaging/**/Microsoft.Extensions.DependencyModel.dll;
-                            $(Stage2CompilationDirectory)/forPackaging/**/Microsoft.Extensions.Testing.Abstractions.dll">
+      <FilesToSign Include="$(CompilationDirectory)/forPackaging/**/*dotnet*.dll;
+                            $(CompilationDirectory)/forPackaging/**/Microsoft.Extensions.DependencyModel.dll;
+                            $(CompilationDirectory)/forPackaging/**/Microsoft.Extensions.Testing.Abstractions.dll">
         <Authenticode>$(InternalCertificateId)</Authenticode>
       </FilesToSign>
     </ItemGroup>
diff --git a/build/Test.targets b/build/Test.targets
index 5f49cd97a..f7346d9d7 100644
--- a/build/Test.targets
+++ b/build/Test.targets
@@ -5,8 +5,8 @@
   <PropertyGroup>
     <PathListSeparator>:</PathListSeparator>
     <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
-    <ExecPath>$(Stage2Directory)$(PathListSeparator)$(PATH)</ExecPath>
-    <ExecPath Condition=" '$(OSName)' == 'win' ">$(Stage2Directory)</ExecPath>
+    <ExecPath>$(OutputDirectory)$(PathListSeparator)$(PATH)</ExecPath>
+    <ExecPath Condition=" '$(OSName)' == 'win' ">$(OutputDirectory)</ExecPath>
     <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
     <TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
     <TestResultXmlDir>$(TestOutputDir)/results/</TestResultXmlDir>
@@ -28,13 +28,13 @@
     <ItemGroup>
       <ProjectsToTest Include="build/test/RunTest.proj">
         <Properties>
-          CLIBuildDll=$(CLIBuildDll); 
+          CLIBuildDll=$(CLIBuildDll);
           Configuration=$(Configuration);
           EnvironmentVariables=$(RunTestEnvironmentVariables);
           TestProject=%(TestProjects.Identity);
           TestResultXmlDir=$(TestResultXmlDir);
-          ToolPath=$(Stage2Directory);
-          WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity))) 
+          ToolPath=$(OutputDirectory);
+          WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity)))
         </Properties>
       </ProjectsToTest>
     </ItemGroup>
@@ -73,7 +73,7 @@
           DependsOnTargets="SetupTestPackageProjectData;"
           Outputs="%(TestPackageProject.Identity)">
 
-    <DotNetRestore ToolPath="$(Stage2Directory)"
+    <DotNetRestore ToolPath="$(OutputDirectory)"
                    WorkingDirectory="$([System.IO.Directory]::GetParent('%(TestPackageProject.ProjectPath)'))"
                    ProjectPath="%(TestPackageProject.ProjectPath)" />
  
@@ -87,7 +87,7 @@
   </Target>
 
   <Target Name="EnsureStageSeparation">
-    <DotNetMSBuild Arguments="/v:diag $(RepoRoot)/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj /p:Stage2Directory=&quot;$(Stage2Directory)&quot;"
+    <DotNetMSBuild Arguments="/v:diag $(RepoRoot)/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj /p:OutputDirectory=&quot;$(OutputDirectory)&quot;"
                    ToolPath="$(Stage0Directory)" />
   </Target>
 </Project>
diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index ad985a06c..61c22c8b5 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -16,7 +16,7 @@
       <LZMANuGetConfigFilePath>$(NuGetPackagesArchiveProject)/Nuget.config</LZMANuGetConfigFilePath>
       <ToolsOutputDirectory>$(BaseOutputDirectory)/tools</ToolsOutputDirectory>
       <ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
-      <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
+      <FinalArchive>$(SdkOutputDirectory)/nuGetPackagesArchive.lzma</FinalArchive>
     </PropertyGroup>
 
     <Target Name="GetNuGetPackagesArchive"
@@ -89,12 +89,12 @@
                         File="$(LZMANuGetConfigFilePath)" 
                         Lines="$(NuGetConfigContent)" />
 
-      <DotNetNew ToolPath="$(Stage2Directory)"
+      <DotNetNew ToolPath="$(OutputDirectory)"
                  TemplateType="console"
                  TemplateArgs="--debug:ephemeral-hive"
                  WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" />
 
-      <DotNetRestore ToolPath="$(Stage2Directory)"
+      <DotNetRestore ToolPath="$(OutputDirectory)"
                      Packages="$(NuGetPackagesArchiveFolder)"
                      SkipInvalidConfigurations="True"
                      WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" />
@@ -103,17 +103,17 @@
 
       <Message Text="Publishing Archiver" />
 
-      <DotNetPublish ToolPath="$(Stage2Directory)"
+      <DotNetPublish ToolPath="$(OutputDirectory)"
                      WorkingDirectory="$(RepoRoot)/tools/Archiver"
                      Output="$(ToolsOutputDirectory)"
                      Configuration="$(Configuration)" />
 
-      <Exec Command="$(DotnetStage2) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
+      <Exec Command="$(DotnetInOutputDirectory) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
     </Target>
 
     <Target Name="SetupNuGetPackagesArchiveInputsOutputs"
             DependsOnTargets="Prepare">
-      <GenerateNuGetPackagesArchiveVersion ToolPath="$(Stage2Directory)">
+      <GenerateNuGetPackagesArchiveVersion ToolPath="$(OutputDirectory)">
         <Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion"/>
       </GenerateNuGetPackagesArchiveVersion>
       <PropertyGroup>
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index 1c116f00f..5a3443c9d 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
-    <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
+    <SdkDebianPackageName>dotnet-dev-$(SdkVersion)</SdkDebianPackageName>
   </PropertyGroup>
 
   <!-- dotnet deb-tool -->
@@ -27,19 +26,15 @@
 
   <!-- Package Identities -->
   <PropertyGroup>
-    <SharedFxDebianPackageVersion>$(SharedFrameworkVersion)</SharedFxDebianPackageVersion>
-    <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
+    <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkVersion)</SharedFxDebianPackageName>
     <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
-    <HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
-    <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
+    <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageName>
     <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
     <HostDebianPackageName>dotnet-host</HostDebianPackageName>
 
-    <AdditionalSharedFxDebianPackageVersion>$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageVersion>
-    <AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion)</AdditionalSharedFxDebianPackageName>
+    <AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageName>
     <AdditionalSharedFxDebianPackageName>$(AdditionalSharedFxDebianPackageName.ToLower())</AdditionalSharedFxDebianPackageName>
-    <AdditionalHostFxrDebianPackageVersion>$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageVersion>
-    <AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion)</AdditionalHostFxrDebianPackageName>
+    <AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageName>
     <AdditionalHostFxrDebianPackageName>$(AdditionalHostFxrDebianPackageName.ToLower())</AdditionalHostFxrDebianPackageName>
   </PropertyGroup>
 
@@ -47,7 +42,7 @@
   <PropertyGroup>
     <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
     <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
-    <CLISdkRoot>$(Stage2Directory)/sdk</CLISdkRoot>
+    <CLISdkRoot>$(OutputDirectory)/sdk</CLISdkRoot>
   </PropertyGroup>
 
   <!-- Output Directories -->
diff --git a/build/package/Layout.targets b/build/package/Layout.targets
index ff65dfade..cdbb5b13d 100644
--- a/build/package/Layout.targets
+++ b/build/package/Layout.targets
@@ -10,29 +10,29 @@
     <!-- Set up Items with Layout Input Files -->
     <ItemGroup>
       <SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
-      <SdkDebugLayoutInput Include="$(Stage2SymbolsDirectory)/sdk/**/*" />
+      <SdkDebugLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
       <CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
       <CombinedFrameworkSdkInput Include="$(OutputDirectory)/shared/**/*" />
       <CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" />
     </ItemGroup>
 
     <MakeRelative
-      Path1="$(OutputDirectory)"
+      Path1="$(OutputDirectory)/"
       Path2="%(SdkLayoutInput.Identity)" >
       <Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" />
     </MakeRelative>
     <MakeRelative
-      Path1="$(Stage2SymbolsDirectory)"
+      Path1="$(SymbolsDirectory)"
       Path2="%(SdkDebugLayoutInput.Identity)" >
       <Output TaskParameter="RelativePath" ItemName="SdkDebugRelativeOutputFiles" />
     </MakeRelative>
     <MakeRelative
-      Path1="$(OutputDirectory)"
+      Path1="$(OutputDirectory)/"
       Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" >
       <Output TaskParameter="RelativePath" ItemName="CombinedHostHostFxrFrameworkSdkRelativeOutputFiles" />
     </MakeRelative>
     <MakeRelative
-      Path1="$(OutputDirectory)"
+      Path1="$(OutputDirectory)/"
       Path2="%(CombinedFrameworkSdkInput.Identity)" >
       <Output TaskParameter="RelativePath" ItemName="CombinedFrameworkSdkOutputFiles" />
     </MakeRelative>
diff --git a/build/package/Nupkg.targets b/build/package/Nupkg.targets
index 86ffdcecb..b1570c596 100644
--- a/build/package/Nupkg.targets
+++ b/build/package/Nupkg.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PackagingBuildBasePath>$(Stage2CompilationDirectory)/forPackaging</PackagingBuildBasePath>
+    <PackagingBuildBasePath>$(CompilationDirectory)/forPackaging</PackagingBuildBasePath>
     <NupkgOutputDirectory>$(PackagesDirectory)</NupkgOutputDirectory>
   </PropertyGroup>
 
diff --git a/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj b/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj
index 4175b21fc..6a85183ca 100644
--- a/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj
+++ b/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj
@@ -3,7 +3,7 @@
     <Import Project="$(RepoRoot)/build/Microsoft.DotNet.Cli.tasks" />
     
     <Target Name="RunValidation">
-        <DotNetMSBuild Arguments="  /v:diag $(MSBuildThisFileDirectory)/InvokeWithStage2.proj /p:ToolPath=&quot;$(Stage2Directory)&quot;"
-                       ToolPath="$(Stage2Directory)" />
+        <DotNetMSBuild Arguments="  /v:diag $(MSBuildThisFileDirectory)/InvokeWithStage2.proj /p:ToolPath=&quot;$(OutputDirectory)&quot;"
+                       ToolPath="$(OutputDirectory)" />
     </Target>
 </Project>
\ No newline at end of file
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index fcd5c6848..f51c1fea4 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -9,7 +9,7 @@
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4</PackageTargetFallback>
-    <PublishDir>$(Stage2SdkDirectory)</PublishDir>
+    <PublishDir>$(SdkOutputDirectory)</PublishDir>
     <VersionSuffix>$(CommitCount)</VersionSuffix>
   </PropertyGroup>
 
@@ -42,7 +42,7 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(SharedFramework)"
-          DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+          DestinationFiles="@(SharedFramework->'$(OutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
   <Target Name="PublishVersionFile"
diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj
index 66a54522f..a33ff9b17 100644
--- a/src/tool_roslyn/tool_roslyn.csproj
+++ b/src/tool_roslyn/tool_roslyn.csproj
@@ -7,7 +7,7 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <PublishDir>$(Stage2RoslynDirectory)</PublishDir>
+    <PublishDir>$(RoslynDirectory)</PublishDir>
     <VersionSuffix>$(CommitCount)</VersionSuffix>
   </PropertyGroup>