Move all the MSBuild Workspace projects under a single folder. (#76831)

This is a rework of #72226 Now there's Workspaces/MSBuild with three folders: - Core (the main library) - BuildHost - Test
dotnet · Jan 21, 2025 · dd84354 · dd84354
2 parents 8a90906 + c5b1c4c
commit dd84354
Show file tree

Hide file tree

Showing 267 changed files with 127 additions and 181 deletions.
diff --git a/Roslyn.sln b/Roslyn.sln
@@ -119,7 +119,7 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VisualBasicErrorFactsGenera
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.Desktop", "src\Workspaces\Core\Desktop\Microsoft.CodeAnalysis.Workspaces.Desktop.csproj", "{2E87FA96-50BB-4607-8676-46521599F998}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.MSBuild", "src\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj", "{96EB2D3B-F694-48C6-A284-67382841E086}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.MSBuild", "src\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj", "{96EB2D3B-F694-48C6-A284-67382841E086}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.CSharp.Workspaces", "src\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj", "{21B239D0-D144-430F-A394-C066D58EE267}"
 EndProject
@@ -322,7 +322,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Debu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.PooledObjects.Package", "src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.Package.csproj", "{49E7C367-181B-499C-AC2E-8E17C81418D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests", "src\Workspaces\MSBuildTest\Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj", "{037F06F0-3BE8-42D0-801E-2F74FC380AB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests", "src\Workspaces\MSBuild\Test\Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj", "{037F06F0-3BE8-42D0-801E-2F74FC380AB8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteractiveHost64", "src\Interactive\HostProcess\x64\InteractiveHost64.csproj", "{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}"
 EndProject
@@ -533,7 +533,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Exte
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Xaml", "src\Tools\ExternalAccess\Xaml\Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj", "{8988270E-393A-4B92-AC1A-534F903CFD34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost", "src\Workspaces\Core\MSBuild.BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj", "{B1481D94-682E-46EC-ADBE-A16EB46FEEE9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost", "src\Workspaces\MSBuild\BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj", "{B1481D94-682E-46EC-ADBE-A16EB46FEEE9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Copilot", "src\EditorFeatures\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj", "{5E8FB6D6-6C5C-42E6-9220-1EAA7ED9BCAD}"
 EndProject

diff --git a/eng/build.ps1 b/eng/build.ps1
@@ -710,14 +710,6 @@ function Setup-IntegrationTestRun() {
   $env:ROSLYN_LSPEDITOR = "$lspEditor"
 }
 
-function Prepare-TempDir() {
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\global.json") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\Directory.Build.props") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\Directory.Build.targets") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\Directory.Build.rsp") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\NuGet.Config") $TempDir
-}
-
 function List-Processes() {
   Write-Host "Listing running build processes..."
   Get-Process -Name "msbuild" -ErrorAction SilentlyContinue | Out-Host
@@ -746,7 +738,6 @@ try {
 
   if ($ci) {
     List-Processes
-    Prepare-TempDir
     EnablePreviewSdks
     if ($testVsi) {
       Setup-IntegrationTestRun

diff --git a/...Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj b/...Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj
@@ -39,7 +39,7 @@
            subdirectories -->
 
       <!-- HACK: Setting SatelliteResourceLanguages still seems to be bringing satellite resources from other project references along,
-           so we'll filter this in the condition here. --> 
+           so we'll filter this in the condition here. -->
       <TfmSpecificPackageFile Include="@(ReferenceCopyLocalPaths)"
                               PackagePath="tools\$(TargetFramework)\any\%(ReferenceCopyLocalPaths.DestinationSubDirectory)"
                               Condition="'%(ReferenceCopyLocalPaths.DestinationSubDirectory)' == '' and '%(Extension)' != '.pdb' and '%(Extension)' != '.xml'" />
@@ -80,7 +80,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />
     <ProjectReference Include="..\..\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />

diff --git a/...GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj b/...GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj
@@ -20,7 +20,7 @@
     <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />
     <ProjectReference Include="..\..\..\Compilers\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.vbproj" />
     <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />
     <ProjectReference Include="..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />

diff --git a/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -64,7 +64,7 @@
   </ItemDefinitionGroup>
 
   <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
     <ProjectReference Include="..\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
 

diff --git a/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -16,7 +16,7 @@
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
 
     <!--
-      Suppress NuGet warning: 
+      Suppress NuGet warning:
       "The assembly '...' is not inside the 'lib' folder and hence it won't be added as a reference when the package is installed into a project."
     -->
     <NoWarn>$(NoWarn);NU5100</NoWarn>
@@ -48,7 +48,7 @@
     <ProjectReference Include="..\..\VisualStudio\LiveShare\Impl\Microsoft.VisualStudio.LanguageServices.LiveShare.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Workspaces\Core\Desktop\Microsoft.CodeAnalysis.Workspaces.Desktop.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" PrivateAssets="all" />

diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj
@@ -21,7 +21,7 @@
     <ProjectReference Include="..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" />
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-    <ProjectReference Include="..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
     <ProjectReference Include="..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />
     <ProjectReference Include="..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />

diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
@@ -39,7 +39,7 @@
     <ProjectReference Include="..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
     <ProjectReference Include="..\..\Workspaces\CoreTestUtilities\Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj" />
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-    <ProjectReference Include="..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
     <ProjectReference Include="..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
     <ProjectReference Include="..\..\Workspaces\Remote\ServiceHub\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj" />

diff --git a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj
@@ -33,7 +33,7 @@
     <ProjectReference Include="..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" />
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-    <ProjectReference Include="..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
     <ProjectReference Include="..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />
     <ProjectReference Include="..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />

diff --git a/src/Tools/PrepareTests/MinimizeUtil.cs b/src/Tools/PrepareTests/MinimizeUtil.cs
@@ -22,18 +22,10 @@ internal static void Run(string sourceDirectory, string destinationDirectory, bo
         var duplicateDirectory = Path.Combine(destinationDirectory, duplicateDirectoryName);
         Directory.CreateDirectory(duplicateDirectory);
 
-        // https://github.com/dotnet/roslyn/issues/49486
-        // we should avoid copying the files under Resources.
-        Directory.CreateDirectory(Path.Combine(destinationDirectory, "src/Workspaces/MSBuildTest/Resources"));
         var individualFiles = new[]
         {
             "global.json",
             "NuGet.config",
-            "src/Workspaces/MSBuildTest/Resources/global.json",
-            "src/Workspaces/MSBuildTest/Resources/Directory.Build.props",
-            "src/Workspaces/MSBuildTest/Resources/Directory.Build.targets",
-            "src/Workspaces/MSBuildTest/Resources/Directory.Build.rsp",
-            "src/Workspaces/MSBuildTest/Resources/NuGet.Config",
         };
 
         foreach (var individualFile in individualFiles)

diff --git a/src/VisualStudio/IntegrationTest/IntegrationTestBuildProject.csproj b/src/VisualStudio/IntegrationTest/IntegrationTestBuildProject.csproj
@@ -22,7 +22,7 @@
     <ProjectReference Include="..\..\Tools\PrepareTests\PrepareTests.csproj" />
     <ProjectReference Include="..\..\Tools\Source\RunTests\RunTests.csproj" />
     <ProjectReference Include="..\..\Tools\TestDiscoveryWorker\TestDiscoveryWorker.csproj" />
-    <ProjectReference Include="..\..\Workspaces\MSBuildTest\Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj" />
+    <ProjectReference Include="..\..\Workspaces\MSBuild\Test\Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj" />
     <ProjectReference Include="..\Setup.Dependencies\Roslyn.VisualStudio.Setup.Dependencies.csproj" />
     <ProjectReference Include="..\Setup\Roslyn.VisualStudio.Setup.csproj" />
     <ProjectReference Include="..\VisualStudioDiagnosticsToolWindow\Roslyn.VisualStudio.DiagnosticsWindow.csproj" />

diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
@@ -166,7 +166,7 @@
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
       <NgenPriority>1</NgenPriority>
     </ProjectReference>
-    <ProjectReference Include="..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj">
+    <ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj">
       <Name>Workspaces.MSBuild</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>

diff --git a/src/Workspaces/CoreTestUtilities/Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj b/src/Workspaces/CoreTestUtilities/Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />
-    <ProjectReference Include="..\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
     <ProjectReference Include="..\Remote\ServiceHub\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj" />
     <ProjectReference Include="..\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />

diff --git a/...ld.BuildHost/Build/ProjectBuildManager.cs → ...ld/BuildHost/Build/ProjectBuildManager.cs b/...ld.BuildHost/Build/ProjectBuildManager.cs → ...ld/BuildHost/Build/ProjectBuildManager.cs
diff --git a/...paces/Core/MSBuild.BuildHost/BuildHost.cs → ...Workspaces/MSBuild/BuildHost/BuildHost.cs b/...paces/Core/MSBuild.BuildHost/BuildHost.cs → ...Workspaces/MSBuild/BuildHost/BuildHost.cs
diff --git a/...Core/MSBuild.BuildHost/BuildHostLogger.cs → ...aces/MSBuild/BuildHost/BuildHostLogger.cs b/...Core/MSBuild.BuildHost/BuildHostLogger.cs → ...aces/MSBuild/BuildHost/BuildHostLogger.cs
diff --git a/...CSharp/CSharpCommandLineArgumentReader.cs → ...CSharp/CSharpCommandLineArgumentReader.cs b/...CSharp/CSharpCommandLineArgumentReader.cs → ...CSharp/CSharpCommandLineArgumentReader.cs
diff --git a/...dHost/MSBuild/CSharp/CSharpProjectFile.cs → ...dHost/MSBuild/CSharp/CSharpProjectFile.cs b/...dHost/MSBuild/CSharp/CSharpProjectFile.cs → ...dHost/MSBuild/CSharp/CSharpProjectFile.cs
diff --git a/...MSBuild/CSharp/CSharpProjectFileLoader.cs → ...MSBuild/CSharp/CSharpProjectFileLoader.cs b/...MSBuild/CSharp/CSharpProjectFileLoader.cs → ...MSBuild/CSharp/CSharpProjectFileLoader.cs
diff --git a/....BuildHost/MSBuild/Constants/ItemNames.cs → .../BuildHost/MSBuild/Constants/ItemNames.cs b/....BuildHost/MSBuild/Constants/ItemNames.cs → .../BuildHost/MSBuild/Constants/ItemNames.cs
diff --git a/...ldHost/MSBuild/Constants/MetadataNames.cs → ...ldHost/MSBuild/Constants/MetadataNames.cs b/...ldHost/MSBuild/Constants/MetadataNames.cs → ...ldHost/MSBuild/Constants/MetadataNames.cs
diff --git a/...ldHost/MSBuild/Constants/PropertyNames.cs → ...ldHost/MSBuild/Constants/PropertyNames.cs b/...ldHost/MSBuild/Constants/PropertyNames.cs → ...ldHost/MSBuild/Constants/PropertyNames.cs
diff --git a/...dHost/MSBuild/Constants/PropertyValues.cs → ...dHost/MSBuild/Constants/PropertyValues.cs b/...dHost/MSBuild/Constants/PropertyValues.cs → ...dHost/MSBuild/Constants/PropertyValues.cs
diff --git a/...uildHost/MSBuild/Constants/TargetNames.cs → ...uildHost/MSBuild/Constants/TargetNames.cs b/...uildHost/MSBuild/Constants/TargetNames.cs → ...uildHost/MSBuild/Constants/TargetNames.cs
diff --git a/...uildHost/MSBuild/Logging/DiagnosticLog.cs → ...uildHost/MSBuild/Logging/DiagnosticLog.cs b/...uildHost/MSBuild/Logging/DiagnosticLog.cs → ...uildHost/MSBuild/Logging/DiagnosticLog.cs
diff --git a/...Build/Logging/MSBuildDiagnosticLogItem.cs → ...Build/Logging/MSBuildDiagnosticLogItem.cs b/...Build/Logging/MSBuildDiagnosticLogItem.cs → ...Build/Logging/MSBuildDiagnosticLogItem.cs
diff --git a/...SBuild/Logging/MSBuildDiagnosticLogger.cs → ...SBuild/Logging/MSBuildDiagnosticLogger.cs b/...SBuild/Logging/MSBuildDiagnosticLogger.cs → ...SBuild/Logging/MSBuildDiagnosticLogger.cs
diff --git a/.../ProjectFile/CommandLineArgumentReader.cs → .../ProjectFile/CommandLineArgumentReader.cs b/.../ProjectFile/CommandLineArgumentReader.cs → .../ProjectFile/CommandLineArgumentReader.cs
diff --git a/...ldHost/MSBuild/ProjectFile/Conversions.cs → ...ldHost/MSBuild/ProjectFile/Conversions.cs b/...ldHost/MSBuild/ProjectFile/Conversions.cs → ...ldHost/MSBuild/ProjectFile/Conversions.cs
diff --git a/...ildHost/MSBuild/ProjectFile/Extensions.cs → ...ildHost/MSBuild/ProjectFile/Extensions.cs b/...ildHost/MSBuild/ProjectFile/Extensions.cs → ...ildHost/MSBuild/ProjectFile/Extensions.cs
diff --git a/...ldHost/MSBuild/ProjectFile/ProjectFile.cs → ...ldHost/MSBuild/ProjectFile/ProjectFile.cs b/...ldHost/MSBuild/ProjectFile/ProjectFile.cs → ...ldHost/MSBuild/ProjectFile/ProjectFile.cs
diff --git a/.../MSBuild/ProjectFile/ProjectFileLoader.cs → .../MSBuild/ProjectFile/ProjectFileLoader.cs b/.../MSBuild/ProjectFile/ProjectFileLoader.cs → .../MSBuild/ProjectFile/ProjectFileLoader.cs
diff --git a/...c/VisualBasicCommandLineArgumentReader.cs → ...c/VisualBasicCommandLineArgumentReader.cs b/...c/VisualBasicCommandLineArgumentReader.cs → ...c/VisualBasicCommandLineArgumentReader.cs
diff --git a/...ild/VisualBasic/VisualBasicProjectFile.cs → ...ild/VisualBasic/VisualBasicProjectFile.cs b/...ild/VisualBasic/VisualBasicProjectFile.cs → ...ild/VisualBasic/VisualBasicProjectFile.cs
diff --git a/...sualBasic/VisualBasicProjectFileLoader.cs → ...sualBasic/VisualBasicProjectFileLoader.cs b/...sualBasic/VisualBasicProjectFileLoader.cs → ...sualBasic/VisualBasicProjectFileLoader.cs
diff --git a/...lysis.Workspaces.MSBuild.BuildHost.csproj → ...lysis.Workspaces.MSBuild.BuildHost.csproj b/...lysis.Workspaces.MSBuild.BuildHost.csproj → ...lysis.Workspaces.MSBuild.BuildHost.csproj
diff --git a/...kspaces/Core/MSBuild.BuildHost/Program.cs → src/Workspaces/MSBuild/BuildHost/Program.cs b/...kspaces/Core/MSBuild.BuildHost/Program.cs → src/Workspaces/MSBuild/BuildHost/Program.cs
diff --git a/...e/MSBuild.BuildHost/PublicAPI.Shipped.txt → ...s/MSBuild/BuildHost/PublicAPI.Shipped.txt b/...e/MSBuild.BuildHost/PublicAPI.Shipped.txt → ...s/MSBuild/BuildHost/PublicAPI.Shipped.txt
diff --git a/...MSBuild.BuildHost/PublicAPI.Unshipped.txt → ...MSBuild/BuildHost/PublicAPI.Unshipped.txt b/...MSBuild.BuildHost/PublicAPI.Unshipped.txt → ...MSBuild/BuildHost/PublicAPI.Unshipped.txt
diff --git a/...ldHost/Rpc/Contracts/DiagnosticLogItem.cs → ...ldHost/Rpc/Contracts/DiagnosticLogItem.cs b/...ldHost/Rpc/Contracts/DiagnosticLogItem.cs → ...ldHost/Rpc/Contracts/DiagnosticLogItem.cs
diff --git a/...ildHost/Rpc/Contracts/DocumentFileInfo.cs → ...ildHost/Rpc/Contracts/DocumentFileInfo.cs b/...ildHost/Rpc/Contracts/DocumentFileInfo.cs → ...ildHost/Rpc/Contracts/DocumentFileInfo.cs
diff --git a/...uild.BuildHost/Rpc/Contracts/FileGlobs.cs → ...uild/BuildHost/Rpc/Contracts/FileGlobs.cs b/...uild.BuildHost/Rpc/Contracts/FileGlobs.cs → ...uild/BuildHost/Rpc/Contracts/FileGlobs.cs
diff --git a/...ild.BuildHost/Rpc/Contracts/IBuildHost.cs → ...ild/BuildHost/Rpc/Contracts/IBuildHost.cs b/...ild.BuildHost/Rpc/Contracts/IBuildHost.cs → ...ild/BuildHost/Rpc/Contracts/IBuildHost.cs
diff --git a/...d.BuildHost/Rpc/Contracts/IProjectFile.cs → ...d/BuildHost/Rpc/Contracts/IProjectFile.cs b/...d.BuildHost/Rpc/Contracts/IProjectFile.cs → ...d/BuildHost/Rpc/Contracts/IProjectFile.cs
diff --git a/...d.BuildHost/Rpc/Contracts/JsonSettings.cs → ...d/BuildHost/Rpc/Contracts/JsonSettings.cs b/...d.BuildHost/Rpc/Contracts/JsonSettings.cs → ...d/BuildHost/Rpc/Contracts/JsonSettings.cs
diff --git a/...ost/Rpc/Contracts/MonoMSBuildDiscovery.cs → ...ost/Rpc/Contracts/MonoMSBuildDiscovery.cs b/...ost/Rpc/Contracts/MonoMSBuildDiscovery.cs → ...ost/Rpc/Contracts/MonoMSBuildDiscovery.cs
diff --git a/...ildHost/Rpc/Contracts/PackageReference.cs → ...ildHost/Rpc/Contracts/PackageReference.cs b/...ildHost/Rpc/Contracts/PackageReference.cs → ...ildHost/Rpc/Contracts/PackageReference.cs
diff --git a/...uildHost/Rpc/Contracts/ProjectFileInfo.cs → ...uildHost/Rpc/Contracts/ProjectFileInfo.cs b/...uildHost/Rpc/Contracts/ProjectFileInfo.cs → ...uildHost/Rpc/Contracts/ProjectFileInfo.cs
diff --git a/...ost/Rpc/Contracts/ProjectFileReference.cs → ...ost/Rpc/Contracts/ProjectFileReference.cs b/...ost/Rpc/Contracts/ProjectFileReference.cs → ...ost/Rpc/Contracts/ProjectFileReference.cs
diff --git a/...SBuild.BuildHost/Rpc/Contracts/Request.cs → ...SBuild/BuildHost/Rpc/Contracts/Request.cs b/...SBuild.BuildHost/Rpc/Contracts/Request.cs → ...SBuild/BuildHost/Rpc/Contracts/Request.cs
diff --git a/...Build.BuildHost/Rpc/Contracts/Response.cs → ...Build/BuildHost/Rpc/Contracts/Response.cs b/...Build.BuildHost/Rpc/Contracts/Response.cs → ...Build/BuildHost/Rpc/Contracts/Response.cs
diff --git a/...ost/Rpc/Contracts/TextReaderExtensions.cs → ...ost/Rpc/Contracts/TextReaderExtensions.cs b/...ost/Rpc/Contracts/TextReaderExtensions.cs → ...ost/Rpc/Contracts/TextReaderExtensions.cs
diff --git a/...aces/Core/MSBuild.BuildHost/Rpc/Readme.md → ...orkspaces/MSBuild/BuildHost/Rpc/Readme.md b/...aces/Core/MSBuild.BuildHost/Rpc/Readme.md → ...orkspaces/MSBuild/BuildHost/Rpc/Readme.md
diff --git a/...s/Core/MSBuild.BuildHost/Rpc/RpcServer.cs → ...spaces/MSBuild/BuildHost/Rpc/RpcServer.cs b/...s/Core/MSBuild.BuildHost/Rpc/RpcServer.cs → ...spaces/MSBuild/BuildHost/Rpc/RpcServer.cs
diff --git a/...t/WorkspaceMSBuildBuildHostResources.resx → ...t/WorkspaceMSBuildBuildHostResources.resx b/...t/WorkspaceMSBuildBuildHostResources.resx → ...t/WorkspaceMSBuildBuildHostResources.resx
diff --git a/...WorkspaceMSBuildBuildHostResources.cs.xlf → ...WorkspaceMSBuildBuildHostResources.cs.xlf b/...WorkspaceMSBuildBuildHostResources.cs.xlf → ...WorkspaceMSBuildBuildHostResources.cs.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.de.xlf → ...WorkspaceMSBuildBuildHostResources.de.xlf b/...WorkspaceMSBuildBuildHostResources.de.xlf → ...WorkspaceMSBuildBuildHostResources.de.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.es.xlf → ...WorkspaceMSBuildBuildHostResources.es.xlf b/...WorkspaceMSBuildBuildHostResources.es.xlf → ...WorkspaceMSBuildBuildHostResources.es.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.fr.xlf → ...WorkspaceMSBuildBuildHostResources.fr.xlf b/...WorkspaceMSBuildBuildHostResources.fr.xlf → ...WorkspaceMSBuildBuildHostResources.fr.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.it.xlf → ...WorkspaceMSBuildBuildHostResources.it.xlf b/...WorkspaceMSBuildBuildHostResources.it.xlf → ...WorkspaceMSBuildBuildHostResources.it.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.ja.xlf → ...WorkspaceMSBuildBuildHostResources.ja.xlf b/...WorkspaceMSBuildBuildHostResources.ja.xlf → ...WorkspaceMSBuildBuildHostResources.ja.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.ko.xlf → ...WorkspaceMSBuildBuildHostResources.ko.xlf b/...WorkspaceMSBuildBuildHostResources.ko.xlf → ...WorkspaceMSBuildBuildHostResources.ko.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.pl.xlf → ...WorkspaceMSBuildBuildHostResources.pl.xlf b/...WorkspaceMSBuildBuildHostResources.pl.xlf → ...WorkspaceMSBuildBuildHostResources.pl.xlf
diff --git a/...kspaceMSBuildBuildHostResources.pt-BR.xlf → ...kspaceMSBuildBuildHostResources.pt-BR.xlf b/...kspaceMSBuildBuildHostResources.pt-BR.xlf → ...kspaceMSBuildBuildHostResources.pt-BR.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.ru.xlf → ...WorkspaceMSBuildBuildHostResources.ru.xlf b/...WorkspaceMSBuildBuildHostResources.ru.xlf → ...WorkspaceMSBuildBuildHostResources.ru.xlf
diff --git a/...WorkspaceMSBuildBuildHostResources.tr.xlf → ...WorkspaceMSBuildBuildHostResources.tr.xlf b/...WorkspaceMSBuildBuildHostResources.tr.xlf → ...WorkspaceMSBuildBuildHostResources.tr.xlf
diff --git a/...paceMSBuildBuildHostResources.zh-Hans.xlf → ...paceMSBuildBuildHostResources.zh-Hans.xlf b/...paceMSBuildBuildHostResources.zh-Hans.xlf → ...paceMSBuildBuildHostResources.zh-Hans.xlf
diff --git a/...paceMSBuildBuildHostResources.zh-Hant.xlf → ...paceMSBuildBuildHostResources.zh-Hant.xlf b/...paceMSBuildBuildHostResources.zh-Hant.xlf → ...paceMSBuildBuildHostResources.zh-Hant.xlf
diff --git a/...SBuild/Host/Mef/MSBuildMefHostServices.cs → ...d/Core/Host/Mef/MSBuildMefHostServices.cs b/...SBuild/Host/Mef/MSBuildMefHostServices.cs → ...d/Core/Host/Mef/MSBuildMefHostServices.cs
diff --git a/...SBuild/MSBuild/BuildHostProcessManager.cs → ...d/Core/MSBuild/BuildHostProcessManager.cs b/...SBuild/MSBuild/BuildHostProcessManager.cs → ...d/Core/MSBuild/BuildHostProcessManager.cs
diff --git a/...ore/MSBuild/MSBuild/DiagnosticReporter.cs → ...SBuild/Core/MSBuild/DiagnosticReporter.cs b/...ore/MSBuild/MSBuild/DiagnosticReporter.cs → ...SBuild/Core/MSBuild/DiagnosticReporter.cs
diff --git a/...Build/DiagnosticReporterLoggerProvider.cs → ...Build/DiagnosticReporterLoggerProvider.cs b/...Build/DiagnosticReporterLoggerProvider.cs → ...Build/DiagnosticReporterLoggerProvider.cs
diff --git a/...SBuild/MSBuild/DiagnosticReportingMode.cs → ...d/Core/MSBuild/DiagnosticReportingMode.cs b/...SBuild/MSBuild/DiagnosticReportingMode.cs → ...d/Core/MSBuild/DiagnosticReportingMode.cs
diff --git a/...ild/MSBuild/DiagnosticReportingOptions.cs → ...ore/MSBuild/DiagnosticReportingOptions.cs b/...ild/MSBuild/DiagnosticReportingOptions.cs → ...ore/MSBuild/DiagnosticReportingOptions.cs
diff --git a/...uildProjectLoader.SolutionFilterReader.cs → ...uildProjectLoader.SolutionFilterReader.cs b/...uildProjectLoader.SolutionFilterReader.cs → ...uildProjectLoader.SolutionFilterReader.cs
diff --git a/...r.Worker.AnalyzerReferencePathComparer.cs → ...r.Worker.AnalyzerReferencePathComparer.cs b/...r.Worker.AnalyzerReferencePathComparer.cs → ...r.Worker.AnalyzerReferencePathComparer.cs
diff --git a/...ld/MSBuild/MSBuildProjectLoader.Worker.cs → ...re/MSBuild/MSBuildProjectLoader.Worker.cs b/...ld/MSBuild/MSBuildProjectLoader.Worker.cs → ...re/MSBuild/MSBuildProjectLoader.Worker.cs
diff --git a/...ProjectLoader.Worker_ResolveReferences.cs → ...ProjectLoader.Worker_ResolveReferences.cs b/...ProjectLoader.Worker_ResolveReferences.cs → ...ProjectLoader.Worker_ResolveReferences.cs
diff --git a/...e/MSBuild/MSBuild/MSBuildProjectLoader.cs → ...uild/Core/MSBuild/MSBuildProjectLoader.cs b/...e/MSBuild/MSBuild/MSBuildProjectLoader.cs → ...uild/Core/MSBuild/MSBuildProjectLoader.cs
diff --git a/.../Core/MSBuild/MSBuild/MSBuildWorkspace.cs → .../MSBuild/Core/MSBuild/MSBuildWorkspace.cs b/.../Core/MSBuild/MSBuild/MSBuildWorkspace.cs → .../MSBuild/Core/MSBuild/MSBuildWorkspace.cs
diff --git a/...aces/Core/MSBuild/MSBuild/PathResolver.cs → ...aces/MSBuild/Core/MSBuild/PathResolver.cs b/...aces/Core/MSBuild/MSBuild/PathResolver.cs → ...aces/MSBuild/Core/MSBuild/PathResolver.cs
diff --git a/...d/MSBuild/ProjectFileExtensionRegistry.cs → ...e/MSBuild/ProjectFileExtensionRegistry.cs b/...d/MSBuild/ProjectFileExtensionRegistry.cs → ...e/MSBuild/ProjectFileExtensionRegistry.cs
diff --git a/...e/MSBuild/MSBuild/ProjectLoadOperation.cs → ...uild/Core/MSBuild/ProjectLoadOperation.cs b/...e/MSBuild/MSBuild/ProjectLoadOperation.cs → ...uild/Core/MSBuild/ProjectLoadOperation.cs
diff --git a/...re/MSBuild/MSBuild/ProjectLoadProgress.cs → ...Build/Core/MSBuild/ProjectLoadProgress.cs b/...re/MSBuild/MSBuild/ProjectLoadProgress.cs → ...Build/Core/MSBuild/ProjectLoadProgress.cs
diff --git a/...spaces/Core/MSBuild/MSBuild/ProjectMap.cs → ...spaces/MSBuild/Core/MSBuild/ProjectMap.cs b/...spaces/Core/MSBuild/MSBuild/ProjectMap.cs → ...spaces/MSBuild/Core/MSBuild/ProjectMap.cs
diff --git a/...ft.CodeAnalysis.Workspaces.MSBuild.csproj → ...ft.CodeAnalysis.Workspaces.MSBuild.csproj b/...ft.CodeAnalysis.Workspaces.MSBuild.csproj → ...ft.CodeAnalysis.Workspaces.MSBuild.csproj
@@ -29,13 +29,13 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
 
     <!-- For the following package we directly include the binary into this NuGet package because we don't want/need a separate NuGet package
          for it. PrivateAssets="all" is needed to prevent this reference from becoming a package reference in the package, as a workaround for
          https://github.com/NuGet/Home/issues/3891.
          -->
-    <ProjectReference Include="..\MSBuild.BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj" PrivateAssets="all" ReferenceOutputAssembly="false">
+    <ProjectReference Include="..\BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj" PrivateAssets="all" ReferenceOutputAssembly="false">
       <IncludeOutputInThisPackage>true</IncludeOutputInThisPackage>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Tools\ExternalAccess\RazorCompiler\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.csproj" PrivateAssets="all">
@@ -51,10 +51,10 @@
       <Link>InternalUtilities\GlobalAssemblyCache.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Compilers\Shared\NamedPipeUtil.cs" Link="InternalUtilities\NamedPipeUtil.cs" />
-    <Compile Include="..\MSBuild.BuildHost\Rpc\Contracts\*.cs" Link="Rpc\Contracts\%(FileName).cs"/>
+    <Compile Include="..\BuildHost\Rpc\Contracts\*.cs" Link="Rpc\Contracts\%(FileName).cs"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\MSBuild.BuildHost\Rpc\Readme.md" Link="Rpc\Readme.md" />
+    <None Include="..\BuildHost\Rpc\Readme.md" Link="Rpc\Readme.md" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="WorkspaceMSBuildResources.resx" GenerateSource="true" />
@@ -89,15 +89,15 @@
   <Target Name="DeployNetFrameworkBuildHost" BeforeTargets="_GetPackageFiles;AssignTargetPaths" Condition="'$(DesignTimeBuild)' != 'true'">
     <!-- If we're not doing source build, we will include a net472 version for the broadest compatibility -->
     <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-      <_NetFrameworkBuildHostProjectReference Include="..\..\..\Workspaces\Core\MSBuild.BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj">
+      <_NetFrameworkBuildHostProjectReference Include="..\..\..\Workspaces\MSBuild\BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj">
         <TargetFramework>net472</TargetFramework>
         <ContentFolderName>BuildHost-net472</ContentFolderName>
       </_NetFrameworkBuildHostProjectReference>
     </ItemGroup>
 
     <!-- We'll include a .NET Core version no matter what -->
     <ItemGroup>
-      <_NetFrameworkBuildHostProjectReference Include="..\..\..\Workspaces\Core\MSBuild.BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj">
+      <_NetFrameworkBuildHostProjectReference Include="..\..\..\Workspaces\MSBuild\BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj">
         <TargetFramework>$(NetRoslynBuildHostNetCoreVersion)</TargetFramework>
         <ContentFolderName>BuildHost-netcore</ContentFolderName>
       </_NetFrameworkBuildHostProjectReference>

diff --git a/...spaces/Core/MSBuild/PublicAPI.Shipped.txt → ...spaces/MSBuild/Core/PublicAPI.Shipped.txt b/...spaces/Core/MSBuild/PublicAPI.Shipped.txt → ...spaces/MSBuild/Core/PublicAPI.Shipped.txt
diff --git a/...aces/Core/MSBuild/PublicAPI.Unshipped.txt → ...aces/MSBuild/Core/PublicAPI.Unshipped.txt b/...aces/Core/MSBuild/PublicAPI.Unshipped.txt → ...aces/MSBuild/Core/PublicAPI.Unshipped.txt
diff --git a/...paces/Core/MSBuild/Rpc/RemoteBuildHost.cs → ...paces/MSBuild/Core/Rpc/RemoteBuildHost.cs b/...paces/Core/MSBuild/Rpc/RemoteBuildHost.cs → ...paces/MSBuild/Core/Rpc/RemoteBuildHost.cs
diff --git a/.../MSBuild/Rpc/RemoteInvocationException.cs → ...ild/Core/Rpc/RemoteInvocationException.cs b/.../MSBuild/Rpc/RemoteInvocationException.cs → ...ild/Core/Rpc/RemoteInvocationException.cs
diff --git a/...ces/Core/MSBuild/Rpc/RemoteProjectFile.cs → ...ces/MSBuild/Core/Rpc/RemoteProjectFile.cs b/...ces/Core/MSBuild/Rpc/RemoteProjectFile.cs → ...ces/MSBuild/Core/Rpc/RemoteProjectFile.cs
diff --git a/src/Workspaces/Core/MSBuild/Rpc/RpcClient.cs → src/Workspaces/MSBuild/Core/Rpc/RpcClient.cs b/src/Workspaces/Core/MSBuild/Rpc/RpcClient.cs → src/Workspaces/MSBuild/Core/Rpc/RpcClient.cs
diff --git a/...re/MSBuild/WorkspaceMSBuildResources.resx → ...Build/Core/WorkspaceMSBuildResources.resx b/...re/MSBuild/WorkspaceMSBuildResources.resx → ...Build/Core/WorkspaceMSBuildResources.resx
diff --git a/...uild/xlf/WorkspaceMSBuildResources.cs.xlf → ...Core/xlf/WorkspaceMSBuildResources.cs.xlf b/...uild/xlf/WorkspaceMSBuildResources.cs.xlf → ...Core/xlf/WorkspaceMSBuildResources.cs.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.de.xlf → ...Core/xlf/WorkspaceMSBuildResources.de.xlf b/...uild/xlf/WorkspaceMSBuildResources.de.xlf → ...Core/xlf/WorkspaceMSBuildResources.de.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.es.xlf → ...Core/xlf/WorkspaceMSBuildResources.es.xlf b/...uild/xlf/WorkspaceMSBuildResources.es.xlf → ...Core/xlf/WorkspaceMSBuildResources.es.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.fr.xlf → ...Core/xlf/WorkspaceMSBuildResources.fr.xlf b/...uild/xlf/WorkspaceMSBuildResources.fr.xlf → ...Core/xlf/WorkspaceMSBuildResources.fr.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.it.xlf → ...Core/xlf/WorkspaceMSBuildResources.it.xlf b/...uild/xlf/WorkspaceMSBuildResources.it.xlf → ...Core/xlf/WorkspaceMSBuildResources.it.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.ja.xlf → ...Core/xlf/WorkspaceMSBuildResources.ja.xlf b/...uild/xlf/WorkspaceMSBuildResources.ja.xlf → ...Core/xlf/WorkspaceMSBuildResources.ja.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.ko.xlf → ...Core/xlf/WorkspaceMSBuildResources.ko.xlf b/...uild/xlf/WorkspaceMSBuildResources.ko.xlf → ...Core/xlf/WorkspaceMSBuildResources.ko.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.pl.xlf → ...Core/xlf/WorkspaceMSBuildResources.pl.xlf b/...uild/xlf/WorkspaceMSBuildResources.pl.xlf → ...Core/xlf/WorkspaceMSBuildResources.pl.xlf
diff --git a/...d/xlf/WorkspaceMSBuildResources.pt-BR.xlf → ...e/xlf/WorkspaceMSBuildResources.pt-BR.xlf b/...d/xlf/WorkspaceMSBuildResources.pt-BR.xlf → ...e/xlf/WorkspaceMSBuildResources.pt-BR.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.ru.xlf → ...Core/xlf/WorkspaceMSBuildResources.ru.xlf b/...uild/xlf/WorkspaceMSBuildResources.ru.xlf → ...Core/xlf/WorkspaceMSBuildResources.ru.xlf
diff --git a/...uild/xlf/WorkspaceMSBuildResources.tr.xlf → ...Core/xlf/WorkspaceMSBuildResources.tr.xlf b/...uild/xlf/WorkspaceMSBuildResources.tr.xlf → ...Core/xlf/WorkspaceMSBuildResources.tr.xlf
diff --git a/...xlf/WorkspaceMSBuildResources.zh-Hans.xlf → ...xlf/WorkspaceMSBuildResources.zh-Hans.xlf b/...xlf/WorkspaceMSBuildResources.zh-Hans.xlf → ...xlf/WorkspaceMSBuildResources.zh-Hans.xlf
diff --git a/...xlf/WorkspaceMSBuildResources.zh-Hant.xlf → ...xlf/WorkspaceMSBuildResources.zh-Hant.xlf b/...xlf/WorkspaceMSBuildResources.zh-Hant.xlf → ...xlf/WorkspaceMSBuildResources.zh-Hant.xlf
diff --git a/...BuildTest/BuildHostProcessManagerTests.cs → ...uild/Test/BuildHostProcessManagerTests.cs b/...BuildTest/BuildHostProcessManagerTests.cs → ...uild/Test/BuildHostProcessManagerTests.cs
diff --git a/src/Workspaces/MSBuildTest/FileSet.cs → src/Workspaces/MSBuild/Test/FileSet.cs b/src/Workspaces/MSBuildTest/FileSet.cs → src/Workspaces/MSBuild/Test/FileSet.cs
diff --git a/...s/MSBuildTest/MSBuildWorkspaceTestBase.cs → .../MSBuild/Test/MSBuildWorkspaceTestBase.cs b/...s/MSBuildTest/MSBuildWorkspaceTestBase.cs → .../MSBuild/Test/MSBuildWorkspaceTestBase.cs
diff --git a/...lysis.Workspaces.MSBuild.UnitTests.csproj → ...lysis.Workspaces.MSBuild.UnitTests.csproj b/...lysis.Workspaces.MSBuild.UnitTests.csproj → ...lysis.Workspaces.MSBuild.UnitTests.csproj
@@ -7,16 +7,16 @@
     <TargetFrameworks>$(NetRoslyn);net472</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
-    <ProjectReference Include="..\..\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj" />
-    <ProjectReference Include="..\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
-    <ProjectReference Include="..\CoreTestUtilities\Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj" />
+    <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
+    <ProjectReference Include="..\..\..\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj" />
+    <ProjectReference Include="..\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
+    <ProjectReference Include="..\..\CoreTestUtilities\Microsoft.CodeAnalysis.Workspaces.Test.Utilities.csproj" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Core\MSBuild.BuildHost\Rpc\RpcServer.cs" Link="Rpc\RpcServer.cs"/>
+    <Compile Include="..\BuildHost\Rpc\RpcServer.cs" Link="Rpc\RpcServer.cs"/>
     <Compile Remove="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup>