Handle OutDir when building in msbuild instead of VS. (#130)

Author: StephenMolloy

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets

@@ -1,6 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.Extensions.targets"/>
 
+  <PropertyGroup>
+    <RoslynCopyToOutDir>true</RoslynCopyToOutDir>
+  </PropertyGroup>
+
   <Target Name="SetRoslynCompilerFiles" DependsOnTargets="LocateRoslynCompilerFiles">
     <Message Text="Using Roslyn from '$(RoslynToolPath)' folder" />
     <ItemGroup>
@@ -21,14 +25,20 @@
   </Target>
 
   <Target Name="LocateRoslynToolsDestinationFolder" Condition=" '$(RoslynToolsDestinationFolder)' == '' ">
-    <PropertyGroup>
-      <RoslynToolsDestinationFolder>$(WebProjectOutputDir)\bin\roslyn</RoslynToolsDestinationFolder>
-      <RoslynToolsDestinationFolder Condition=" '$(WebProjectOutputDir)' == '' ">$(OutputPath)\roslyn</RoslynToolsDestinationFolder>
-    </PropertyGroup>
+    <!-- Choose one of WebProjectOutputDir or OutputPath -->
+    <!-- But when OutDir is specified given and is different from that choice, also include it without 'bin' -->
+    <ItemGroup Condition="'$(WebProjectOutputDir)' != ''">
+      <RoslynToolsDestinations Include="$(WebProjectOutputDir)\bin\roslyn" />
+      <RoslynToolsDestinations Condition="'$(RoslynCopyToOutDir)' == 'true' AND '$(OutDir)' != '$(WebProjectOutputDir)'" Include="$(OutDir)\roslyn" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(WebProjectOutputDir)' == ''">
+      <RoslynToolsDestinations Include="$(OutputPath)\bin\roslyn" />
+      <RoslynToolsDestinations Condition="'$(RoslynCopyToOutDir)' == 'true' AND '$(OutDir)' != '$(OutputPath)'" Include="$(OutDir)\roslyn" />
+    </ItemGroup>
   </Target>
 
   <Target Name="CopyRoslynCompilerFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory" DependsOnTargets="LocateRoslynToolsDestinationFolder;SetRoslynCompilerFiles">
-    <Copy SourceFiles="@(RoslynCompilerFiles)" DestinationFolder="$(RoslynToolsDestinationFolder)" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
+    <Copy SourceFiles="@(RoslynCompilerFiles)" DestinationFolder="%(RoslynToolsDestinations.FullPath)" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
     <ItemGroup  Condition="'$(MSBuildLastTaskResult)' == 'True'" >
       <FileWrites Include="$(RoslynToolsDestinationFolder)\*" />
     </ItemGroup>