Unify Tools and Exes

BuildAndTest.proj

@@ -100,7 +100,7 @@
     <PropertyGroup>
       <CoreRunExe>$(CoreClrTestDirectory)\CoreRun.exe</CoreRunExe>
       <CoreRunArgs>$(CoreClrTestDirectory)\xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -parallel all -xml $(CoreClrTestDirectory)\xUnitResults\TestResults.xml</CoreRunArgs>
-      <RunTestsExe>Binaries\$(Configuration)\Tools\RunTests\RunTests.exe</RunTestsExe>
+      <RunTestsExe>Binaries\$(Configuration)\Exes\RunTests\RunTests.exe</RunTestsExe>
       <RunTestsArgs>$(NuGetPackageRoot)\xunit.runner.console\$(xunitrunnerconsoleVersion)\tools $(RunTestArgs) @(TestAssemblies, ' ')</RunTestsArgs>
     </PropertyGroup>
     

build/config/SignToolData.json

@@ -52,8 +52,8 @@
                 "Exes\\vbccore\\vbc.exe",
                 "Exes\\vbi\\vbi.exe",
                 "Exes\\vbicore\\vbi.exe",
-                "Tools\\Pdb2Xml\\Microsoft.DiaSymReader.PortablePdb.dll",
-                "Tools\\Pdb2Xml\\Pdb2Xml.exe",
+                "Exes\\Pdb2Xml\\Microsoft.DiaSymReader.PortablePdb.dll",
+                "Exes\\Pdb2Xml\\Pdb2Xml.exe",
                 "Vsix\\CompilerExtension\\Roslyn.Compilers.Extension.dll",
                 "Vsix\\Templates\\Roslyn.Templates.dll",
                 "Vsix\\VisualStudioDiagnosticsWindow\\Roslyn.VisualStudio.DiagnosticsWindow.dll",

cibuild.cmd

@@ -119,7 +119,7 @@ call :TerminateBuildProcesses
 
 REM Verify the state of our project.jsons
 echo Running RepoUtil
-.\Binaries\%BuildConfiguration%\Tools\RepoUtil\RepoUtil.exe verify || goto :BuildFailed
+.\Binaries\%BuildConfiguration%\Exes\RepoUtil\RepoUtil.exe verify || goto :BuildFailed
 
 REM Verify the state of our project.jsons
 echo Running BuildBoss

src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj

@@ -8,7 +8,7 @@
     <RootNamespace>Roslyn.BuildDevDivInsertionFiles</RootNamespace>
     <AssemblyName>Roslyn.BuildDevDivInsertionFiles</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   </PropertyGroup>

src/Setup/SetupStep2.proj

@@ -7,7 +7,7 @@
 
     <!-- Build CoreXT packages for insertion into DevDiv (order of the following actions matters) -->
     <MSBuild Projects="DevDivInsertionFiles\DevDivInsertionFiles.sln" />
-    <Exec Command='"$(OutDir)\Tools\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe" "$(OutDir)\" "$(MSBuildThisFileDirectory)\" "$(NuGetPackageRoot)" $(AssemblyVersion)' LogStandardErrorAsError="true" />
+    <Exec Command='"$(OutDir)\Exes\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe" "$(OutDir)\" "$(MSBuildThisFileDirectory)\" "$(NuGetPackageRoot)" $(AssemblyVersion)' LogStandardErrorAsError="true" />
     <MSBuild Projects="DevDivPackages\Roslyn.proj" />
     <MSBuild Projects="DevDivVsix\PortableFacades\PortableFacades.vsmanproj" />
     <MSBuild Projects="DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.vsmanproj" />

src/Tools/BuildBoss/ProjectUtil.cs

@@ -75,7 +75,6 @@ private bool CheckRoslynProjectType(TextWriter textWriter)
             {
                 case "Dll":
                 case "ExeDesktop":
-                case "ToolDesktop":
                 case "ExeCoreClr":
                 case "UnitTest":
                 case "UnitTestNext":
@@ -83,7 +82,6 @@ private bool CheckRoslynProjectType(TextWriter textWriter)
                 case "DeploymentCompilerGeneratorTools":
                 case "Deployment":
                 case "Vsix":
-                case "Ignore":
                 case "Dependency":
                 case "Custom":
                     return true;

src/Tools/ProcessWatchdog/ProcessWatchdog.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>ProcessWatchdog</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

src/Tools/RepoUtil/RepoUtil.csproj

@@ -27,7 +27,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

src/Tools/Source/MetadataVisualizer/MetadataVisualizer.csproj

@@ -13,7 +13,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj

@@ -13,7 +13,7 @@
     <Prefer32Bit>false</Prefer32Bit>
     <LargeAddressAware>true</LargeAddressAware>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

src/Tools/Source/RunTests/RunTests.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>RunTests</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />