Merge pull request #15092 from jaredpar/fix-build

Build updates

Merge pull request #15092 from jaredpar/fix-build
Build updates
4f55bb58 · Jared Parsons · GitHub · fb5d0b2a · 45de6015 · 4f55bb58
30 changed file
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -2,9 +2,13 @@
  <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->

  <Choose>
-    <When Condition="'$(RoslynProjectType)' == 'ExeCoreClr'">
+    <When Condition="'$(RoslynProjectType)' == 'ExeNonDeployment'">
+      <!-- Some Exes are not designed to be directly runnable.  Typically for size savings in 
+           our build output.  They are made runnable by deployment projects that reference
+           them.  --> 
      <PropertyGroup>
        <_CopyReferences>false</_CopyReferences>
+        <_CopyProjectReferences>false</_CopyProjectReferences>
        <OutDir>$(OutDir)Exes\$(MSBuildProjectName)\</OutDir>
      </PropertyGroup>
    </When>
@@ -28,16 +32,6 @@
        <OutDir>$(OutDir)Exes\</OutDir>
      </PropertyGroup>
    </When>
-    <When Condition="'$(RoslynProjectType)' == 'DeploymentCompilerGeneratorTools'">
-      <PropertyGroup>
-        <OutDir>$(OutDir)CompilerGeneratorTools\</OutDir>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(RoslynProjectType)' == 'Deployment'">
-      <PropertyGroup>
-        <OutDir>$(OutDir)Deployment\$(MSBuildProjectName)\</OutDir>
-      </PropertyGroup>
-    </When>
    <When Condition="'$(RoslynProjectType)' == 'Vsix'">
      <PropertyGroup>
        <_CopyReferences>false</_CopyReferences>

--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -39,7 +39,7 @@
         Microsoft.Common.CurrentVersion.targets to see how it is consumed -->
    <WindowsAppContainer>false</WindowsAppContainer>

-    <CompilerGeneratorToolsDir>$(OutDir)CompilerGeneratorTools\</CompilerGeneratorToolsDir>
+    <CompilerGeneratorToolsDir>$(OutDir)Exes\DeployCompilerGeneratorToolsRuntime\</CompilerGeneratorToolsDir>
    <MSBuildAssemblyNameFragment>Core</MSBuildAssemblyNameFragment>

    <!-- To copy .dll.config and .exe.config files of the referenced projects to the output dir 

--- a/build/Toolset/Toolset.csproj
+++ b/build/Toolset/Toolset.csproj
@@ -9,7 +9,6 @@
    <AssemblyName>Toolset_DoNetUse</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <RoslynProjectType>Deployment</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@@ -25,10 +24,22 @@
      <Project>{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}</Project>
      <Name>MSBuildTask</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">
+      <Project>{1ee8cad3-55f9-4d91-96b2-084641da9a6c}</Project>
+      <Name>CodeAnalysis</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\src\Compilers\CSharp\csc\csc.csproj">
      <Project>{4B45CA0C-03A0-400F-B454-3D4BCB16AF38}</Project>
      <Name>csc</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\src\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
+      <Project>{b501a547-c911-4a05-ac6e-274a50dff30e}</Project>
+      <Name>CSharpCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
+      <Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
+      <Name>BasicCodeAnalysis</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\src\Compilers\VisualBasic\vbc\vbc.csproj">
      <Project>{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}</Project>
      <Name>vbc</Name>
@@ -41,6 +52,14 @@
      <Project>{14118347-ed06-4608-9c45-18228273c712}</Project>
      <Name>csi</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\src\Scripting\Core\Scripting.csproj">
+      <Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>
+      <Name>Scripting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Scripting\CSharp\CSharpScripting.csproj">
+      <Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
+      <Name>CSharpScripting</Name>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="..\Targets\Imports.targets" />
-</Project>
+</Project>
\ No newline at end of file
--- a/build/scripts/check-nuspec.ps1
+++ b/build/scripts/check-nuspec.ps1
@@ -8,7 +8,7 @@ $ErrorActionPreference="Stop"
 try
 {
    write-host "Verifying contents of Micrsoft.Net.Compilers.nuspec"
-    $deploymentPath = join-path $binariesPath "Deployment\Toolset"
+    $deploymentPath = join-path $binariesPath "Exes\Toolset"
    [xml]$x = gc (join-path $sourcePath "src\NuGet\Microsoft.Net.Compilers.nuspec")
    $nuspecAssemblies = 
        $x.package.files.file | 

--- a/cibuild.cmd
+++ b/cibuild.cmd
@@ -64,7 +64,7 @@ msbuild %MSBuildAdditionalCommandLineArgs% /p:UseShippingAssemblyVersion=true /p
 powershell -noprofile -executionPolicy RemoteSigned -file "%RoslynRoot%\build\scripts\check-msbuild.ps1" "%bindir%\Bootstrap.log" || goto :BuildFailed

 if not exist "%bindir%\Bootstrap" mkdir "%bindir%\Bootstrap" || goto :BuildFailed
-move "Binaries\%BuildConfiguration%\Deployment\Toolset\*" "%bindir%\Bootstrap" || goto :BuildFailed
+move "Binaries\%BuildConfiguration%\Exes\Toolset\*" "%bindir%\Bootstrap" || goto :BuildFailed
 copy "build\bootstrap\*" "%bindir%\Bootstrap" || goto :BuildFailed

 REM Clean the previous build

--- a/src/Compilers/CSharp/CscCore/CscCore.csproj
+++ b/src/Compilers/CSharp/CscCore/CscCore.csproj
@@ -20,7 +20,6 @@
    <RuntimeIndentifier>x64</RuntimeIndentifier>
    <NuGetRuntimeIdentifier>$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)</NuGetRuntimeIdentifier>
    <NoStdLib>true</NoStdLib>
-    <RoslynProjectType>ExeCoreClr</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Tools\CommonNetCoreReferences\CommonNetCoreReferences.csproj">
@@ -71,4 +70,4 @@
  </ItemGroup>
  <Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" />
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj
+++ b/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj
@@ -14,6 +14,7 @@
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <ServiceablePackage>true</ServiceablePackage>
    <SyntaxDefinition>$(MSBuildThisFileDirectory)Syntax\Syntax.xml</SyntaxDefinition>
+    <CodeAnalysisRuleSet>..\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj">
@@ -26,31 +27,6 @@
      <Name>CodeAnalysis</Name>
    </ProjectReference>
  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>..\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <CodeAnalysisRuleSet>..\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutDir>..\..\..\..\Binaries\Debug\amd64</OutDir>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutDir>..\..\..\..\Binaries\Release\amd64</OutDir>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
  <ItemGroup>
    <Compile Include="Binder\AliasAndExternAliasDirective.cs" />
    <Compile Include="Binder\AliasAndUsingDirective.cs" />

--- a/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj
+++ b/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj
@@ -10,7 +10,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.UnitTests</RootNamespace>
    <AssemblyName>Roslyn.Compilers.CSharp.Syntax.UnitTests</AssemblyName>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <CSharpSyntaxGeneratorToolPath>$(OutDir)\CSharpSyntaxGenerator.exe</CSharpSyntaxGeneratorToolPath>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>

--- a/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj
+++ b/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj
@@ -71,4 +71,4 @@
  </ItemGroup>
  <Import Project="..\CommandLine\CommandLine.projitems" Label="Shared" />
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj
+++ b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj
@@ -47,30 +47,6 @@
      <Name>BasicCodeAnalysis</Name>
    </ProjectReference>
  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
-    <PlatformTarget>ARM</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
-    <PlatformTarget>ARM</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutDir>..\..\..\..\Binaries\Debug\amd64</OutDir>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutDir>..\..\..\..\Binaries\Release\amd64</OutDir>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Xml" />

--- a/src/Compilers/Core/Portable/CodeAnalysis.csproj
+++ b/src/Compilers/Core/Portable/CodeAnalysis.csproj
@@ -17,22 +17,6 @@
    <CodeAnalysisRuleSet>..\CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
    <NoStdLib>true</NoStdLib>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutDir>..\..\..\..\Binaries\Debug\amd64</OutDir>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutDir>..\..\..\..\Binaries\Release\amd64</OutDir>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
  <ItemGroup>
    <Content Include="$(NuGetPackageRoot)\Microsoft.DiaSymReader.Native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.x86.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -813,4 +797,4 @@
  <Import Project="..\..\..\Dependencies\CodeAnalysis.Metadata\Microsoft.CodeAnalysis.Metadata.projitems" Label="Shared" />
  <Import Project="..\..\..\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems" Label="Shared" />
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Compilers/Server/PortableServer/PortableServer.csproj
+++ b/src/Compilers/Server/PortableServer/PortableServer.csproj
@@ -19,7 +19,7 @@
    <RuntimeIndentifier>x64</RuntimeIndentifier>
    <NuGetRuntimeIdentifier>$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)</NuGetRuntimeIdentifier>
    <NoStdLib>true</NoStdLib>
-    <RoslynProjectType>ExeCoreClr</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Tools\CommonNetCoreReferences\CommonNetCoreReferences.csproj">
@@ -71,4 +71,4 @@
  <Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" />
  <Import Project="..\ServerShared\ServerShared.projitems" Label="Shared" />
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
+++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
@@ -62,30 +62,6 @@
      <Name>CSharpCodeAnalysis</Name>
    </ProjectReference>
  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
-    <PlatformTarget>ARM</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
-    <PlatformTarget>ARM</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutDir>..\..\..\..\Binaries\Debug\amd64</OutDir>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutDir>..\..\..\..\Binaries\Release\amd64</OutDir>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Xml" />

--- a/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj
+++ b/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj
@@ -18,37 +18,6 @@
      <Name>CodeAnalysis</Name>
    </ProjectReference>
  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutDir>..\..\..\..\..\Binaries\Debug\amd64</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutDir>..\..\..\..\..\Binaries\Release\amd64</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <PlatformTarget>ARM</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <PlatformTarget>ARM</PlatformTarget>
-  </PropertyGroup>
  <ItemGroup>
    <Content Include="Analyzers\FaultyAnalyzer.cs" />
    <EmbeddedResource Include="Analyzers\FaultyAnalyzer.dll" />
@@ -427,4 +396,4 @@
    <EmbeddedResource Include="SymbolsTests\nativeCOFFResources.obj" />
  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
@@ -8,7 +8,6 @@
    <ProjectGuid>{91F6F646-4F6E-449A-9AB4-2986348F329D}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AssemblyName>Roslyn.Compilers.VisualBasic.Syntax.UnitTests</AssemblyName>
-    <VBSyntaxGeneratorToolPath>$(OutDir)\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
+++ b/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
@@ -20,7 +20,6 @@
    <RuntimeIndentifier>x64</RuntimeIndentifier>
    <NuGetRuntimeIdentifier>$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)</NuGetRuntimeIdentifier>
    <NoStdLib>true</NoStdLib>
-    <RoslynProjectType>ExeCoreClr</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Tools\CommonNetCoreReferences\CommonNetCoreReferences.csproj">
@@ -71,4 +70,4 @@
  </ItemGroup>
  <Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" />
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
@@ -10,7 +10,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace></RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider</AssemblyName>
-    <VBSyntaxGeneratorToolPath>$(OutDir)..\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
    <CopyNuGetImplementations>false</CopyNuGetImplementations>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
@@ -62,4 +61,4 @@
  <Import Project="..\BasicResultProvider.projitems" Label="Shared" />
  <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
@@ -11,7 +11,6 @@
    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <VBSyntaxGeneratorToolPath>$(OutDir)VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -59,4 +58,4 @@
  <Import Project="..\BasicResultProvider.projitems" Label="Shared" />
  <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Interactive/CsiCore/CsiCore.csproj
+++ b/src/Interactive/CsiCore/CsiCore.csproj
@@ -14,7 +14,7 @@
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <NoStdLib>true</NoStdLib>
-    <RoslynProjectType>ExeCoreClr</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -50,4 +50,4 @@
    <Compile Include="Csi.cs" />
  </ItemGroup>
  <Import Project="..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Interactive/VbiCore/VbiCore.vbproj
+++ b/src/Interactive/VbiCore/VbiCore.vbproj
@@ -15,7 +15,7 @@
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <NoStdLib>true</NoStdLib>
-    <RoslynProjectType>ExeCoreClr</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -51,4 +51,4 @@
    <Compile Include="Vbi.vb" />
  </ItemGroup>
  <Import Project="..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/NuGet/Microsoft.Net.Compilers.nuspec
+++ b/src/NuGet/Microsoft.Net.Compilers.nuspec
@@ -45,34 +45,34 @@ Supported Platforms:
    <file src="Dlls\MSbuildTask\Microsoft.CSharp.Core.targets" target="tools" />
    <file src="Dlls\MSbuildTask\Microsoft.VisualBasic.Core.targets" target="tools" />

-    <!-- The assemblies are not signed by us and any deployed copy can be used.  The Deployment
+    <!-- The assemblies are not signed by us and any deployed copy can be used.  The Exes\Toolset
         directory specifically has all of the assemblies we need -->
-    <file src="Deployment\Toolset\Microsoft.Win32.Primitives.dll" target="tools" />
-    <file src="Deployment\Toolset\System.AppContext.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Console.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Collections.Immutable.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Diagnostics.FileVersionInfo.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Diagnostics.Process.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Diagnostics.StackTrace.dll" target="tools" />
-    <file src="Deployment\Toolset\System.IO.Compression.dll" target="tools" />
-    <file src="Deployment\Toolset\System.IO.FileSystem.dll" target="tools" />
-    <file src="Deployment\Toolset\System.IO.FileSystem.DriveInfo.dll" target="tools" />
-    <file src="Deployment\Toolset\System.IO.FileSystem.Primitives.dll" target="tools" />
-    <file src="Deployment\Toolset\System.IO.Pipes.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Reflection.Metadata.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Runtime.InteropServices.RuntimeInformation.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Security.AccessControl.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Security.Claims.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Security.Cryptography.Algorithms.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Security.Cryptography.Encoding.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Security.Cryptography.Primitives.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Security.Cryptography.X509Certificates.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Security.Principal.Windows.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Text.Encoding.CodePages.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Threading.Thread.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Xml.XmlDocument.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Xml.XPath.dll" target="tools" />
-    <file src="Deployment\Toolset\System.Xml.XPath.XDocument.dll" target="tools" />
-    <file src="Deployment\Toolset\System.ValueTuple.dll" target="tools" />
+    <file src="Exes\Toolset\Microsoft.Win32.Primitives.dll" target="tools" />
+    <file src="Exes\Toolset\System.AppContext.dll" target="tools" />
+    <file src="Exes\Toolset\System.Console.dll" target="tools" />
+    <file src="Exes\Toolset\System.Collections.Immutable.dll" target="tools" />
+    <file src="Exes\Toolset\System.Diagnostics.FileVersionInfo.dll" target="tools" />
+    <file src="Exes\Toolset\System.Diagnostics.Process.dll" target="tools" />
+    <file src="Exes\Toolset\System.Diagnostics.StackTrace.dll" target="tools" />
+    <file src="Exes\Toolset\System.IO.Compression.dll" target="tools" />
+    <file src="Exes\Toolset\System.IO.FileSystem.dll" target="tools" />
+    <file src="Exes\Toolset\System.IO.FileSystem.DriveInfo.dll" target="tools" />
+    <file src="Exes\Toolset\System.IO.FileSystem.Primitives.dll" target="tools" />
+    <file src="Exes\Toolset\System.IO.Pipes.dll" target="tools" />
+    <file src="Exes\Toolset\System.Reflection.Metadata.dll" target="tools" />
+    <file src="Exes\Toolset\System.Runtime.InteropServices.RuntimeInformation.dll" target="tools" />
+    <file src="Exes\Toolset\System.Security.AccessControl.dll" target="tools" />
+    <file src="Exes\Toolset\System.Security.Claims.dll" target="tools" />
+    <file src="Exes\Toolset\System.Security.Cryptography.Algorithms.dll" target="tools" />
+    <file src="Exes\Toolset\System.Security.Cryptography.Encoding.dll" target="tools" />
+    <file src="Exes\Toolset\System.Security.Cryptography.Primitives.dll" target="tools" />
+    <file src="Exes\Toolset\System.Security.Cryptography.X509Certificates.dll" target="tools" />
+    <file src="Exes\Toolset\System.Security.Principal.Windows.dll" target="tools" />
+    <file src="Exes\Toolset\System.Text.Encoding.CodePages.dll" target="tools" />
+    <file src="Exes\Toolset\System.Threading.Thread.dll" target="tools" />
+    <file src="Exes\Toolset\System.Xml.XmlDocument.dll" target="tools" />
+    <file src="Exes\Toolset\System.Xml.XPath.dll" target="tools" />
+    <file src="Exes\Toolset\System.Xml.XPath.XDocument.dll" target="tools" />
+    <file src="Exes\Toolset\System.ValueTuple.dll" target="tools" />
  </files>
 </package>
--- a/src/Tools/BuildBoss/RoslynProjectData.cs
+++ b/src/Tools/BuildBoss/RoslynProjectData.cs
@@ -11,13 +11,10 @@ internal enum RoslynProjectKind
    {
        Dll,
        Exe,
-        ExeCoreClr,
+        ExeNonDeployment,
        UnitTest,
        UnitTestDesktop,
        UnitTestPortable,
-        CompilerGeneratorTool,
-        DeploymentCompilerGeneratorTools,
-        Deployment,
        DeploymentTest,
        Vsix,
        Depedency,
@@ -26,7 +23,6 @@ internal enum RoslynProjectKind

    internal static class RoslynProjectKindUtil
    {
-
        /// <summary>
        /// Convert a declared kind into the correspending enum value.
        /// </summary>
@@ -34,20 +30,14 @@ internal static class RoslynProjectKindUtil
        {
            switch (value)
            {
-                case "ExeCoreClr":
-                    return RoslynProjectKind.Exe;
+                case "ExeNonDeployment":
+                    return RoslynProjectKind.ExeNonDeployment;
                case "UnitTestPortable":
                    return RoslynProjectKind.UnitTestPortable;
                case "UnitTestDesktop":
                    return RoslynProjectKind.UnitTestDesktop;
                case "UnitTest":
                    return RoslynProjectKind.UnitTest;
-                case "CompilerGeneratorTool":
-                    return RoslynProjectKind.CompilerGeneratorTool;
-                case "DeploymentCompilerGeneratorTools":
-                    return RoslynProjectKind.DeploymentCompilerGeneratorTools;
-                case "Deployment":
-                    return RoslynProjectKind.Deployment;
                case "DeploymentTest":
                    return RoslynProjectKind.DeploymentTest;
                case "Vsix":

--- a/src/Tools/CommonCoreClrRuntime/CommonCoreClrRuntime.csproj
+++ b/src/Tools/CommonCoreClrRuntime/CommonCoreClrRuntime.csproj
@@ -16,7 +16,6 @@
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <NoStdLib>true</NoStdLib>
    <NonShipping>true</NonShipping>
-    <RoslynProjectType>Deployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" />
@@ -31,4 +30,4 @@
  <PropertyGroup>
    <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
  </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Tools/CommonNetCoreReferences/CommonNetCoreReferences.csproj
+++ b/src/Tools/CommonNetCoreReferences/CommonNetCoreReferences.csproj
@@ -15,7 +15,6 @@
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <NoStdLib>true</NoStdLib>
-    <RoslynProjectType>Deployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" />
@@ -30,4 +29,4 @@
  <PropertyGroup>
    <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
  </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj
@@ -17,7 +17,6 @@
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <NoStdLib>true</NoStdLib>
    <NonShipping>true</NonShipping>
-    <RoslynProjectType>DeploymentCompilerGeneratorTools</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' " />
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' " />
@@ -54,4 +53,4 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
@@ -8,7 +8,6 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{02459936-CD2C-4F61-B671-5C518F2A3DDC}</ProjectGuid>
    <OutputType>Exe</OutputType>
-    <OutDir>$(CompilerGeneratorToolsDir)</OutDir>
    <RootNamespace>Roslyn.Compilers.Internal.BoundTreeGenerator</RootNamespace>
    <AssemblyName>BoundTreeGenerator</AssemblyName>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
@@ -19,7 +18,7 @@
    <CopyReferencesByDefault>false</CopyReferencesByDefault>
    <NonShipping>true</NonShipping>
    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
-    <RoslynProjectType>CompilerGeneratorTool</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -33,4 +32,4 @@
    <None Include="project.json" />
  </ItemGroup>
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
@@ -7,7 +7,6 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{288089C5-8721-458E-BE3E-78990DAB5E2E}</ProjectGuid>
    <OutputType>Exe</OutputType>
-    <OutDir>$(CompilerGeneratorToolsDir)</OutDir>
    <RootNamespace>Roslyn.Compilers.CSharp.Internal.CSharpErrorFactsGenerator</RootNamespace>
    <AssemblyName>CSharpErrorFactsGenerator</AssemblyName>
    <Nonshipping>true</Nonshipping>
@@ -19,7 +18,7 @@
    <CopyReferencesByDefault>false</CopyReferencesByDefault>
    <NonShipping>true</NonShipping>
    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
-    <RoslynProjectType>CompilerGeneratorTool</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -30,4 +29,4 @@
    <None Include="project.json" />
  </ItemGroup>
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
@@ -6,7 +6,6 @@
    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
    <ProjectGuid>{288089C5-8721-458E-BE3E-78990DAB5E2D}</ProjectGuid>
    <OutputType>Exe</OutputType>
-    <OutDir>$(CompilerGeneratorToolsDir)</OutDir>
    <RootNamespace>Roslyn.Compilers.CSharp.Internal.CSharpSyntaxGenerator</RootNamespace>
    <AssemblyName>CSharpSyntaxGenerator</AssemblyName>
    <Nonshipping>true</Nonshipping>
@@ -18,7 +17,7 @@
    <CopyReferencesByDefault>false</CopyReferencesByDefault>
    <NonShipping>true</NonShipping>
    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
-    <RoslynProjectType>CompilerGeneratorTool</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -46,4 +45,4 @@
    </Content>
  </ItemGroup>
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
@@ -8,7 +8,6 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{909B656F-6095-4AC2-A5AB-C3F032315C45}</ProjectGuid>
    <OutputType>Exe</OutputType>
-    <OutDir>$(CompilerGeneratorToolsDir)</OutDir>
    <StartupObject></StartupObject>
    <RootNamespace>Microsoft.CodeAnalysis.VisualBasic.Internal.VBErrorFactsGenerator</RootNamespace>
    <AssemblyName>VBErrorFactsGenerator</AssemblyName>
@@ -25,7 +24,7 @@
    <CopyReferencesByDefault>false</CopyReferencesByDefault>
    <NonShipping>true</NonShipping>
    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
-    <RoslynProjectType>CompilerGeneratorTool</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -39,4 +38,4 @@
    <Folder Include="My Project\" />
  </ItemGroup>
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
@@ -8,7 +8,6 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}</ProjectGuid>
    <OutputType>Exe</OutputType>
-    <OutDir>$(CompilerGeneratorToolsDir)</OutDir>
    <StartupObject>Microsoft.CodeAnalysis.VisualBasic.Internal.VBSyntaxGenerator.Program</StartupObject>
    <RootNamespace>Microsoft.CodeAnalysis.VisualBasic.Internal.VBSyntaxGenerator</RootNamespace>
    <AssemblyName>VBSyntaxGenerator</AssemblyName>
@@ -23,7 +22,7 @@
    <CopyReferencesByDefault>false</CopyReferencesByDefault>
    <NonShipping>true</NonShipping>
    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
-    <RoslynProjectType>CompilerGeneratorTool</RoslynProjectType>
+    <RoslynProjectType>ExeNonDeployment</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
@@ -70,4 +69,4 @@
    <None Include="project.json" />
  </ItemGroup>
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>