diff --git a/src/Diagnostics/CodeAnalysis/Setup/CodeAnalysisDiagnosticsSetup.csproj b/src/Diagnostics/CodeAnalysis/Setup/CodeAnalysisDiagnosticsSetup.csproj
index 0f0ee86683144c531a5526cd5fa38648586c9c64..e3548b9cb4edbc4fb728bdb0fa26d060beeb94f5 100644
--- a/src/Diagnostics/CodeAnalysis/Setup/CodeAnalysisDiagnosticsSetup.csproj
+++ b/src/Diagnostics/CodeAnalysis/Setup/CodeAnalysisDiagnosticsSetup.csproj
@@ -60,14 +60,20 @@
{d8762a0a-3832-47be-bcf6-8b1060be6b28}
CodeAnalysisDiagnosticAnalyzers
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{921b412a-5551-4853-82b4-46ad5a05a03e}
CSharpCodeAnalysisDiagnosticAnalyzers
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{b1a6a74b-e484-48fb-8745-7a30a06db631}
BasicCodeAnalysisDiagnosticAnalyzers
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
diff --git a/src/Diagnostics/FxCop/Setup/FxCopRulesSetup.csproj b/src/Diagnostics/FxCop/Setup/FxCopRulesSetup.csproj
index a08694473ce2df47ae5a12ad1e5ab34ac0e6f787..62bf5dd3a66e61d52b6d84e63b4bc89613d0f4bb 100644
--- a/src/Diagnostics/FxCop/Setup/FxCopRulesSetup.csproj
+++ b/src/Diagnostics/FxCop/Setup/FxCopRulesSetup.csproj
@@ -30,16 +30,22 @@
{3BA13187-2A3B-4B08-9199-C11FDA1D5AD0}
CSharpFxCopRulesDiagnosticAnalyzers
false
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{2FCCB9BE-DD4E-48F2-B678-80E6FB196948}
BasicFxCopRulesDiagnosticAnalyzers
false
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{36755424-5267-478C-9434-37A507E22711}
FxCopRulesDiagnosticAnalyzers
false
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
diff --git a/src/Diagnostics/Roslyn/Setup/RoslynDiagnosticsSetup.csproj b/src/Diagnostics/Roslyn/Setup/RoslynDiagnosticsSetup.csproj
index dd53d96b0a8a82057fefec4ace320047796b4ee6..4424c6aa2767e71f72bfa3065f5c9954c5c3affd 100644
--- a/src/Diagnostics/Roslyn/Setup/RoslynDiagnosticsSetup.csproj
+++ b/src/Diagnostics/Roslyn/Setup/RoslynDiagnosticsSetup.csproj
@@ -64,14 +64,20 @@
{dcc1f13b-f51c-445b-bdae-92135bd58364}
RoslynDiagnosticAnalyzers
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{b82f1c54-2d3e-497b-8c31-4ab16d6508fa}
CSharpRoslynDiagnosticAnalyzers
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{640b92e8-ed8a-44ac-85c6-50b53837db91}
BasicRoslynDiagnosticAnalyzers
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
diff --git a/src/VisualStudio/SetupInteractive/VisualStudioSetupInteractive.csproj b/src/VisualStudio/SetupInteractive/VisualStudioSetupInteractive.csproj
index 2393dfa81e8ff3e2d28e8d19bc5c97052bda25d8..bd484cd6d43ea0beb2d629fdebbdbced5cbfd670 100644
--- a/src/VisualStudio/SetupInteractive/VisualStudioSetupInteractive.csproj
+++ b/src/VisualStudio/SetupInteractive/VisualStudioSetupInteractive.csproj
@@ -34,15 +34,19 @@
{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}
BasicCodeAnalysis
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{01e9bd68-0339-4a13-b42f-a3ca84d164f3}
InteractiveWindow
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{20bb6fac-44d2-4d76-abfe-0c1e163a1a4f}
VisualStudioInteractiveWindow
- BuiltProjectOutputGroup%3bPkgDefProjectOutputGroup
+ BuiltProjectOutputGroup
DebugSymbolsProjectOutputGroup
@@ -54,34 +58,28 @@
{737ff62c-f068-4317-84d0-bfb210c17a4e}
CSharpVisualStudioRepl
- BuiltProjectOutputGroup%3bPkgDefProjectOutputGroup
+ BuiltProjectOutputGroup
DebugSymbolsProjectOutputGroup
{b4a38526-5f15-4ca8-b5e9-0ba04e547023}
BasicVisualStudioRepl
- BuiltProjectOutputGroup%3bPkgDefProjectOutputGroup
+ BuiltProjectOutputGroup
DebugSymbolsProjectOutputGroup
{201ec5b7-f91e-45e5-b9f2-67a266cce6fc}
VisualStudioComponents
false
- False
-
-
-
-
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{2169f526-8a88-435d-8732-486aca095a6a}
VisualStudioInteractiveComponents
false
- False
-
-
-
-
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj
index b10e9193e9551bd111656eb58c6327d61de5f3b6..6196d1d67c61204a3a069a526aa291b2d9326240 100644
--- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj
+++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj
@@ -34,34 +34,50 @@
{1ee8cad3-55f9-4d91-96b2-084641da9a6c}
CodeAnalysis
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{edc68a0e-c68d-4a74-91b7-bf38ec909888}
Features
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{2e87fa96-50bb-4607-8676-46521599f998}
Workspaces.Desktop
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}
Workspaces
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{3cdeeab7-2256-418a-beb2-620b5cb16302}
EditorFeatures
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{E2E889A5-2489-4546-9194-47C63E49EAEB}
Diagnostics
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}
ServicesVisualStudio
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{C0E80510-4FBE-4B0C-AF2C-4F473787722C}
ServicesVisualStudioImpl
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
diff --git a/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj b/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj
index fd14e819059dad049b706040026ba328beffefb5..4c922e04b9072005066f29f7e41c40338e47404a 100644
--- a/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj
+++ b/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj
@@ -70,6 +70,8 @@
{849e516a-595f-474b-adb4-e099f921cedf}
BasicInteractiveEditorFeatures
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup
{eba4dfa1-6ded-418f-a485-a3b608978906}
@@ -120,7 +122,8 @@
{201EC5B7-F91E-45E5-B9F2-67A266CCE6FC}
VisualStudioSetup
false
- False
+ BuiltProjectOutputGroup
+ DebugSymbolsProjectOutputGroup