Some fixes to the previous 'Drop support for 4.5' and 'Treat non-web apps as first class' PRs (#133)

Author: StephenMolloy

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuproj

@@ -65,6 +65,12 @@
     <NuGetContent Include="build\net472\*">
       <Destination>build\net472</Destination>
     </NuGetContent>
+    <NuGetContent Include="tools\*.ps1" Condition="'$(SignAssembly)' != 'true'">
+      <Destination>tools</Destination>
+    </NuGetContent>
+    <NuGetContent Include="tools\signed\*.ps1" Condition="'$(SignAssembly)' == 'true'">
+      <Destination>tools</Destination>
+    </NuGetContent>
     <NuGetContent Include="tools\$(LocalRoslyn46FolderName)\*">
       <Destination>tools\$(LocalRoslyn46FolderName)</Destination>
     </NuGetContent>

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

@@ -26,22 +26,27 @@
 
   <Target Name="LocateRoslynToolsDestinationFolder" Condition=" '$(RoslynToolsDestinationFolder)' == '' ">
     <!-- Choose one of WebProjectOutputDir or OutputPath -->
-    <!-- But when OutDir is specified given and is different from the above, copy to OutDir as well -->
-    <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)\roslyn" />
-      <RoslynToolsDestinations Condition="'$(RoslynCopyToOutDir)' == 'true' AND '$(OutDir)' != '$(OutputPath)'" Include="$(OutDir)\roslyn" />
-    </ItemGroup>
+    <PropertyGroup>
+      <RoslynToolsDestinationFolder>$(WebProjectOutputDir)\bin\roslyn</RoslynToolsDestinationFolder>
+      <RoslynToolsDestinationFolder Condition=" '$(WebProjectOutputDir)' == '' ">$(OutputPath)\roslyn</RoslynToolsDestinationFolder>
+    </PropertyGroup>
+    
+    <!-- But when OutDir is specified there as well -->
+    <PropertyGroup Condition="'$(OutDir)' != ''">
+      <RoslynToolsOutDirFolder>$(OutDir)\bin\roslyn</RoslynToolsOutDirFolder>
+      <RoslynToolsOutDirFolder Condition=" '$(WebProjectOutputDir)' == '' ">$(OutDir)\roslyn</RoslynToolsOutDirFolder>
+    </PropertyGroup>
   </Target>
 
   <Target Name="CopyRoslynCompilerFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory" DependsOnTargets="LocateRoslynToolsDestinationFolder;SetRoslynCompilerFiles">
-    <Copy SourceFiles="@(RoslynCompilerFiles)" DestinationFolder="%(RoslynToolsDestinations.FullPath)" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
+    <Copy SourceFiles="@(RoslynCompilerFiles)" DestinationFolder="$(RoslynToolsDestinationFolder)" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
     <ItemGroup  Condition="'$(MSBuildLastTaskResult)' == 'True'" >
       <FileWrites Include="$(RoslynToolsDestinationFolder)\*" />
     </ItemGroup>
+    <Copy SourceFiles="@(RoslynCompilerFiles)" DestinationFolder="$(RoslynToolsOutDirFolder)" Condition="'$(RoslynToolsOutDirFolder)' != '$(RoslynToolsDestinationFolder)'" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
+    <ItemGroup  Condition="'$(RoslynToolsOutDirFolder)' != '$(RoslynToolsDestinationFolder)' AND '$(MSBuildLastTaskResult)' == 'True'" >
+      <FileWrites Include="$(RoslynToolsOutDirFolder)\*" />
+    </ItemGroup>
   </Target>
 
   <Target Name="CheckIfShouldKillVBCSCompiler" DependsOnTargets="LocateRoslynCompilerFiles;LocateRoslynToolsDestinationFolder">

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/tools/install.ps1

@@ -15,7 +15,7 @@ if ($project -eq $null) {
     $project = Get-Project
 }
 
-$libDirectory = Join-Path $installPath 'lib\net46'
+$libDirectory = Join-Path $installPath 'lib\net462'
 $projectRoot = $project.Properties.Item('FullPath').Value
 $projectTargetFramework = $project.Properties.Item('TargetFrameworkMoniker').Value
 $binDirectory = Join-Path $projectRoot 'bin'
@@ -68,17 +68,17 @@ $vbCodeDomProvider = [CodeDomProviderDescription]@{
 InstallCodeDomProvider $vbCodeDomProvider
 
 
-# We need to copy the provider assembly into the bin\ folder, otherwise
-# Microsoft.VisualStudio.Web.Host.exe cannot find the assembly.
-# However, users will see the error after they clean solutions.
-New-Item $binDirectory -type directory -force | Out-Null
-Copy-Item $libDirectory\* $binDirectory -force | Out-Null
-
 # For Web Site, we need to copy the Roslyn toolset into
 # the applicaiton's bin folder. 
 # For Web Applicaiton project, this is done in csproj.
 if ($project.Type -eq 'Web Site') {
 
+    # We need to copy the provider assembly into the bin\ folder, otherwise
+    # Microsoft.VisualStudio.Web.Host.exe cannot find the assembly.
+    # However, users will see the error after they clean solutions.
+    New-Item $binDirectory -type directory -force | Out-Null
+    Copy-Item $libDirectory\* $binDirectory -force | Out-Null
+
     if ((Get-Item $compilerPackageDirectory) -isnot [System.IO.DirectoryInfo])
     {
         Write-Host "The install.ps1 cannot find the installation location of package $compilerPackageName, or the pakcage is not installed correctly."