From 31f2410b4f99a4983944e921ab54716df308adf9 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 17:33:26 -0800
Subject: [PATCH] Enable Publishing Roslyn with Static Output Path

---
 build/Compile.targets              | 2 --
 build/OutputDirectories.props      | 1 +
 src/tool_roslyn/tool_roslyn.csproj | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/Compile.targets b/build/Compile.targets
index ef6b9c35f..8f85f1763 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -53,9 +53,7 @@
 
     <!-- Publish Roslyn -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
-                   Output="$(SdkOutputDirectory)/Roslyn"
                    Configuration="$(Configuration)"
-                   VersionSuffix="$(CommitCount)"
                    ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
 
       <RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index 7ae248f7f..ecba47bc3 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -8,6 +8,7 @@
       <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>
diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj
index 75a94c454..a252eaebb 100644
--- a/src/tool_roslyn/tool_roslyn.csproj
+++ b/src/tool_roslyn/tool_roslyn.csproj
@@ -7,7 +7,10 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <PublishDir>$(Stage2RoslynDirectory)</PublishDir>
+    <VersionSuffix>$(CommitCount)</VersionSuffix>
   </PropertyGroup>
+  
   <ItemGroup>
     <PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CLI_Roslyn_Version)" />