From 6a9d3aabdf13819a6be1d01d749c8e6308db3a18 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Fri, 4 Nov 2016 09:00:01 -0700 Subject: [PATCH] Fix up a number of missing project references --- BuildAndTest.proj | 2 +- build/Targets/Imports.targets | 5 + .../CommandLine/CSharpCommandLineTest.csproj | 8 ++ .../CSharpCompilerSemanticTest.csproj | 10 +- .../Symbol/CSharpCompilerSymbolTest.csproj | 4 + .../Syntax/CSharpCompilerSyntaxTest.csproj | 4 + .../CSharp/Test/WinRT/CSharpWinRTTest.csproj | 8 ++ .../MSBuildTaskTests/MSBuildTaskTests.csproj | 4 + .../VBCSCompilerTests.csproj | 8 ++ .../CommandLine/BasicCommandLineTest.vbproj | 17 ++- .../Semantic/BasicCompilerSemanticTest.vbproj | 4 + .../Symbol/BasicCompilerSymbolTest.vbproj | 4 + .../Syntax/BasicCompilerSyntaxTest.vbproj | 4 + .../CSharpEditorServicesTest.csproj | 62 +++++++- .../CSharpEditorServicesTest2.csproj | 66 ++++++++- .../Test/EditorServicesTest.csproj | 34 ++++- .../Test2/EditorServicesTest2.vbproj | 60 ++++++++ .../BasicEditorServicesTest.vbproj | 68 +++++++++ .../CSharpExpressionCompilerTest.csproj | 8 ++ .../CSharpResultProviderTest.csproj | 8 ++ .../BasicExpressionCompilerTest.vbproj | 4 + .../BasicResultProviderTest.vbproj | 8 ++ .../HostTest/InteractiveHostTest.csproj | 60 ++++++++ .../CSharpScriptingTest.Desktop.csproj | 18 ++- .../CSharpTest/CSharpScriptingTest.csproj | 17 ++- src/Scripting/CoreTest/ScriptingTest.csproj | 13 +- .../BasicScriptingTest.Desktop.vbproj | 12 ++ .../VisualBasicTest/BasicScriptingTest.vbproj | 21 ++- src/Tools/BuildBoss/ProjectCheckerUtil.cs | 1 + src/Tools/BuildBoss/ProjectUtil.cs | 16 +++ src/Tools/BuildBoss/RoslynProjectData.cs | 8 +- .../Test.Next/VisualStudioTest.Next.csproj | 56 ++++++++ .../Core/Test/ServicesVisualStudioTest.vbproj | 68 +++++++++ .../VisualStudioIntegrationTests.csproj | 136 ++++++++++++++++++ .../CSharpTest/CSharpServicesTest.csproj | 12 ++ src/Workspaces/CoreTest/ServicesTest.csproj | 4 + .../VisualBasicServicesTest.vbproj | 12 ++ 37 files changed, 811 insertions(+), 43 deletions(-) diff --git a/BuildAndTest.proj b/BuildAndTest.proj index 32bcee16bce..747d48fa67c 100644 --- a/BuildAndTest.proj +++ b/BuildAndTest.proj @@ -10,7 +10,7 @@ $(MSBuildThisFileDirectory)Roslyn.sln $(MSBuildThisFileDirectory)src\Samples\Samples.sln - Debug + Debug $(RunTestArgs) -xml $(RunTestArgs) -test64 $(RunTestArgs) -testVsi diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets index 065c5facd97..a2d9cee4717 100644 --- a/build/Targets/Imports.targets +++ b/build/Targets/Imports.targets @@ -8,6 +8,11 @@ $(OutDir)Exes\$(MSBuildProjectName)\ + + + $(OutDir)UnitTests\$(MSBuildProjectName)\ + + $(OutDir)UnitTests\Current\ diff --git a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj index 90d922944d7..86cda88c8dd 100644 --- a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj +++ b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj @@ -46,6 +46,14 @@ {B501A547-C911-4A05-AC6E-274A50DFF30E} CSharpCodeAnalysis + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + diff --git a/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj b/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj index f61866a1a7f..546d4781f4c 100644 --- a/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj +++ b/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj @@ -42,11 +42,13 @@ {B501A547-C911-4A05-AC6E-274A50DFF30E} CSharpCodeAnalysis + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + - - - - + + ARM diff --git a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj index c2d03510928..ffbec41e6cb 100644 --- a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj +++ b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj @@ -42,6 +42,10 @@ {B501A547-C911-4A05-AC6E-274A50DFF30E} CSharpCodeAnalysis + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + true diff --git a/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj b/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj index b00524c7d65..2ff3628b308 100644 --- a/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj +++ b/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj @@ -56,6 +56,10 @@ CSharpCodeAnalysis false + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + diff --git a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj index ce93970c1c7..a64b1a307e2 100644 --- a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj +++ b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj @@ -46,6 +46,14 @@ {b501a547-c911-4a05-ac6e-274a50dff30e} CSharpCodeAnalysis + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + diff --git a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj index e00f32d73a2..b5645671377 100644 --- a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj +++ b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj @@ -42,6 +42,10 @@ {1ee8cad3-55f9-4d91-96b2-084641da9a6c} CodeAnalysis + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj index d48743c3cd2..dc78e4f2983 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj @@ -53,6 +53,14 @@ {9508f118-f62e-4c16-a6f4-7c3b56e166ad} VBCSCompiler + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {b501a547-c911-4a05-ac6e-274a50dff30e} + CSharpCodeAnalysis + diff --git a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj index dc0855f9891..918b6b2d270 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj +++ b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj @@ -7,17 +7,26 @@ AnyCPU {E3B32027-3362-41DF-9172-4D3B623F42A5} Library - + + Roslyn.Compilers.VisualBasic.CommandLine.UnitTests false v4.6 UnitTest + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {b501a547-c911-4a05-ac6e-274a50dff30e} + CSharpCodeAnalysis + {9508F118-F62E-4C16-A6F4-7C3B56E166AD} VBCSCompiler @@ -47,8 +56,10 @@ CompilerTestResources - - + + + + diff --git a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj index d024a89a09d..c08f0a008e8 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj @@ -12,6 +12,10 @@ UnitTest + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop diff --git a/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj b/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj index 7cb401395f6..304023889ca 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj @@ -12,6 +12,10 @@ UnitTest + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop diff --git a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj index f05f7d6d5ce..8ae3f260cca 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj @@ -49,6 +49,10 @@ BasicCodeAnalysis false + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + true diff --git a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj index 9ee3fe7ccff..72a5d4da14a 100644 --- a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj +++ b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj @@ -79,6 +79,62 @@ {76C6F005-C89D-4348-BB4A-39189DDBEB52} ServicesTestUtilities + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {49bfae50-1bce-48ae-bc89-78b7d90a3ecd} + BasicEditorFeatures + + + {a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d} + BasicFeatures + + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c} + BasicWorkspace + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {12a68549-4e8c-42d6-8703-a09335f97997} + Scripting + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + + + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} + WorkspacesTestUtilities + true @@ -89,10 +145,8 @@ Roslyn.Services.Editor.CSharp.UnitTests UnitTest - - - - + + diff --git a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj index c31f28a305e..21e3a68c8d4 100644 --- a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj +++ b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj @@ -79,6 +79,66 @@ {76C6F005-C89D-4348-BB4A-39189DDBEB52} ServicesTestUtilities + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {49bfae50-1bce-48ae-bc89-78b7d90a3ecd} + BasicEditorFeatures + + + {a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d} + BasicFeatures + + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c} + BasicWorkspace + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {12a68549-4e8c-42d6-8703-a09335f97997} + Scripting + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + + + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} + WorkspacesTestUtilities + true @@ -89,10 +149,8 @@ Roslyn.Services.Editor.CSharp.UnitTests2 UnitTest - - - - + + diff --git a/src/EditorFeatures/Test/EditorServicesTest.csproj b/src/EditorFeatures/Test/EditorServicesTest.csproj index 02e15ebfa65..3864e91bc3e 100644 --- a/src/EditorFeatures/Test/EditorServicesTest.csproj +++ b/src/EditorFeatures/Test/EditorServicesTest.csproj @@ -113,11 +113,37 @@ {76C6F005-C89D-4348-BB4A-39189DDBEB52} ServicesTestUtilities + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + - - - - + + diff --git a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj index e9ddd771c09..cd3c44fd85d 100644 --- a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj +++ b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj @@ -101,6 +101,66 @@ {76C6F005-C89D-4348-BB4A-39189DDBEB52} ServicesTestUtilities + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + + + {fe2cbea6-d121-4faa-aa8b-fc9900bf8c83} + CSharpInteractiveEditorFeatures + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {8e2a252e-a140-45a6-a81a-2652996ea589} + InteractiveFeatures + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {12a68549-4e8c-42d6-8703-a09335f97997} + Scripting + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + + + {86fd5b9a-4fa0-4b10-b59f-cfaf077a859c} + ServicesVisualStudio + + + {c0e80510-4fbe-4b0c-af2c-4f473787722c} + ServicesVisualStudioImpl + + + {8da861d8-0cce-4334-b6c0-01a846c881ec} + VisualStudio + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + true diff --git a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj index 28d76818b89..18e1cda4fcd 100644 --- a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj +++ b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj @@ -18,6 +18,14 @@ {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C} CodeAnalysis + + {b501a547-c911-4a05-ac6e-274a50dff30e} + CSharpCodeAnalysis + + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + {4371944A-D3BA-4B5B-8285-82E5FFC6D1F8} BasicCompilerTestUtilities @@ -26,10 +34,50 @@ {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6} BasicCodeAnalysis + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + + + {3973b09a-4fbf-44a5-8359-3d22ceb71f71} + CSharpFeatures + {92412d1a-0f23-45b5-b196-58839c524917} InteractiveEditorFeatures + + {fe2cbea6-d121-4faa-aa8b-fc9900bf8c83} + CSharpInteractiveEditorFeatures + + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {8e2a252e-a140-45a6-a81a-2652996ea589} + InteractiveFeatures + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {12a68549-4e8c-42d6-8703-a09335f97997} + Scripting + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop @@ -42,6 +90,10 @@ {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities + + {2e87fa96-50bb-4607-8676-46521599f998} + Workspaces.Desktop + {5F8D2414-064A-4B3A-9B42-8E2A04246BE5} Workspaces @@ -54,6 +106,18 @@ {18F5FBB8-7570-4412-8CC7-0A86FF13B7BA} TextEditorFeatures + + {21b239d0-d144-430f-a394-c066d58ee267} + CSharpWorkspace + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + {57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C} BasicWorkspace @@ -70,6 +134,10 @@ {F7712928-1175-47B3-8819-EE086753DEE2} TestUtilities.FX45 + + {b0ce9307-ffdb-4838-a5ec-ce1f7cdc4ac2} + CSharpEditorFeatures + {76C6F005-C89D-4348-BB4A-39189DDBEB52} ServicesTestUtilities diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj index 014dc8df5a3..190fd28b036 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj @@ -54,6 +54,14 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + true diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj index 9308e6c676e..69ed3163115 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj @@ -40,6 +40,14 @@ {abdbac1e-350e-4dc3-bb45-3504404545ee} ResultProviderTestUtilities + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + true diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj index b2b97e8fcc8..05e1e989af8 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj @@ -14,6 +14,10 @@ + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj index 4200b877b2f..a5db78a041e 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj @@ -45,6 +45,14 @@ ResultProviderTestUtilities + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + true diff --git a/src/Interactive/HostTest/InteractiveHostTest.csproj b/src/Interactive/HostTest/InteractiveHostTest.csproj index 5cfdd569163..b9bda87260b 100644 --- a/src/Interactive/HostTest/InteractiveHostTest.csproj +++ b/src/Interactive/HostTest/InteractiveHostTest.csproj @@ -81,6 +81,66 @@ {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6} BasicCodeAnalysis + + {49bfae50-1bce-48ae-bc89-78b7d90a3ecd} + BasicEditorFeatures + + + {a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d} + BasicFeatures + + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c} + BasicWorkspace + + + {3973b09a-4fbf-44a5-8359-3d22ceb71f71} + CSharpFeatures + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {21b239d0-d144-430f-a394-c066d58ee267} + CSharpWorkspace + + + {3cdeeab7-2256-418a-beb2-620b5cb16302} + EditorFeatures + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + + + {18f5fbb8-7570-4412-8cc7-0a86ff13b7ba} + TextEditorFeatures + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + + + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} + WorkspacesTestUtilities + diff --git a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj index 8e07849f40d..a1f08617f66 100644 --- a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj +++ b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj @@ -21,10 +21,8 @@ - - - - + + @@ -72,6 +70,18 @@ {066f0dbd-c46c-4c20-afec-99829a172625} CSharpScripting + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f7712928-1175-47b3-8819-ee086753dee2} + TestUtilities.FX45 + diff --git a/src/Scripting/CSharpTest/CSharpScriptingTest.csproj b/src/Scripting/CSharpTest/CSharpScriptingTest.csproj index 9ae0ec4e5d4..4200fdb73f9 100644 --- a/src/Scripting/CSharpTest/CSharpScriptingTest.csproj +++ b/src/Scripting/CSharpTest/CSharpScriptingTest.csproj @@ -11,8 +11,7 @@ Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests true v5.0 - - + .NETPortable {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest @@ -50,11 +49,17 @@ {066F0DBD-C46C-4C20-AFEC-99829A172625} CSharpScripting + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + - - - - + + diff --git a/src/Scripting/CoreTest/ScriptingTest.csproj b/src/Scripting/CoreTest/ScriptingTest.csproj index a6479d25a05..d2c2a48ab78 100644 --- a/src/Scripting/CoreTest/ScriptingTest.csproj +++ b/src/Scripting/CoreTest/ScriptingTest.csproj @@ -11,8 +11,7 @@ Microsoft.CodeAnalysis.Scripting.UnitTests true v5.0 - - + .NETPortable {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTest @@ -55,11 +54,13 @@ {3e7dea65-317b-4f43-a25d-62f18d96cfd7} BasicScripting + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + - - - - + + diff --git a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj index c22494e930a..4eb6d439a82 100644 --- a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj +++ b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj @@ -19,6 +19,10 @@ {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C} CodeAnalysis + + {b501a547-c911-4a05-ac6e-274a50dff30e} + CSharpCodeAnalysis + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6} BasicCodeAnalysis @@ -27,6 +31,10 @@ {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD} CompilerTestResources + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} TestUtilities @@ -39,6 +47,10 @@ {12A68549-4E8C-42D6-8703-A09335F97997} Scripting + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + {3E7DEA65-317B-4F43-A25D-62F18D96CFD7} BasicScripting diff --git a/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj b/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj index 2856bd81b8b..70ef6a46f77 100644 --- a/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj +++ b/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj @@ -6,18 +6,15 @@ AnyCPU {ABC7262E-1053-49F3-B846-E3091BB92E8C} Library - - + Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests v5.0 .NETPortable {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} UnitTest - - - - + + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C} @@ -47,6 +44,18 @@ {3E7DEA65-317B-4F43-A25D-62F18D96CFD7} BasicScripting + + {b501a547-c911-4a05-ac6e-274a50dff30e} + CSharpCodeAnalysis + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index 94a46f18460..1a56dc45e8b 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using System.Text; diff --git a/src/Tools/BuildBoss/ProjectUtil.cs b/src/Tools/BuildBoss/ProjectUtil.cs index 72e67470c51..7428ffb583c 100644 --- a/src/Tools/BuildBoss/ProjectUtil.cs +++ b/src/Tools/BuildBoss/ProjectUtil.cs @@ -54,6 +54,17 @@ internal RoslynProjectData GetRoslynProjectData() } } + internal Guid? GetProjectGuid() + { + var elem = _document.XPathSelectElements("//mb:ProjectGuid", _manager).FirstOrDefault(); + if (elem == null) + { + return null; + } + + return Guid.Parse(elem.Value); + } + internal RoslynProjectData? TryGetRoslynProjectData() { try @@ -83,6 +94,11 @@ internal IEnumerable GetImports() return _document.XPathSelectElements("//mb:Import", _manager); } + internal IEnumerable GetItemGroup() + { + return _document.XPathSelectElements("//mb:ItemGroup", _manager); + } + internal List GetDeclaredProjectReferences() { var references = _document.XPathSelectElements("//mb:ProjectReference", _manager); diff --git a/src/Tools/BuildBoss/RoslynProjectData.cs b/src/Tools/BuildBoss/RoslynProjectData.cs index 3c59e6d6d98..c27d1564692 100644 --- a/src/Tools/BuildBoss/RoslynProjectData.cs +++ b/src/Tools/BuildBoss/RoslynProjectData.cs @@ -13,6 +13,7 @@ internal enum RoslynProjectKind Exe, ExeCoreClr, UnitTest, + UnitTestFixed, UnitTestNext, CompilerGeneratorTool, DeploymentCompilerGeneratorTools, @@ -34,6 +35,8 @@ internal static class RoslynProjectKindUtil { case "ExeCoreClr": return RoslynProjectKind.Exe; + case "UnitTestFixed": + return RoslynProjectKind.UnitTestFixed; case "UnitTest": return RoslynProjectKind.UnitTest; case "UnitTestNext": @@ -59,12 +62,15 @@ internal static bool IsAnyUnitTest(RoslynProjectKind kind) { return kind == RoslynProjectKind.UnitTest || + kind == RoslynProjectKind.UnitTestFixed || kind == RoslynProjectKind.UnitTestNext; } internal static bool IsDeploymentProject(RoslynProjectKind kind) { - return kind == RoslynProjectKind.Exe; + return + kind == RoslynProjectKind.Exe || + kind == RoslynProjectKind.UnitTestFixed; } } diff --git a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj index 95bed013c26..ac7bbf40a8c 100644 --- a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj +++ b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj @@ -111,6 +111,62 @@ {fe0d4bdd-1c30-488e-a870-854f5b8c5014} ServicesVisualStudio.Next + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + + + {fe2cbea6-d121-4faa-aa8b-fc9900bf8c83} + CSharpInteractiveEditorFeatures + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {92412d1a-0f23-45b5-b196-58839c524917} + InteractiveEditorFeatures + + + {8e2a252e-a140-45a6-a81a-2652996ea589} + InteractiveFeatures + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {12a68549-4e8c-42d6-8703-a09335f97997} + Scripting + + + {c0e80510-4fbe-4b0c-af2c-4f473787722c} + ServicesVisualStudioImpl + + + {8da861d8-0cce-4334-b6c0-01a846c881ec} + VisualStudio + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + + + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} + WorkspacesTestUtilities + diff --git a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj index e67c89141c6..474025f7e57 100644 --- a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj +++ b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj @@ -102,6 +102,74 @@ {C0E80510-4FBE-4B0C-AF2C-4F473787722C} ServicesVisualStudioImpl + + {4371944a-d3ba-4b5b-8285-82e5ffc6d1f8} + BasicCompilerTestUtilities + + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + + + {3973b09a-4fbf-44a5-8359-3d22ceb71f71} + CSharpFeatures + + + {fe2cbea6-d121-4faa-aa8b-fc9900bf8c83} + CSharpInteractiveEditorFeatures + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {92412d1a-0f23-45b5-b196-58839c524917} + InteractiveEditorFeatures + + + {8e2a252e-a140-45a6-a81a-2652996ea589} + InteractiveFeatures + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {12a68549-4e8c-42d6-8703-a09335f97997} + Scripting + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + + + {8da861d8-0cce-4334-b6c0-01a846c881ec} + VisualStudio + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + + + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} + WorkspacesTestUtilities + true diff --git a/src/VisualStudio/IntegrationTests/VisualStudioIntegrationTests.csproj b/src/VisualStudio/IntegrationTests/VisualStudioIntegrationTests.csproj index 31bca8b9b60..8d247f94132 100644 --- a/src/VisualStudio/IntegrationTests/VisualStudioIntegrationTests.csproj +++ b/src/VisualStudio/IntegrationTests/VisualStudioIntegrationTests.csproj @@ -59,6 +59,142 @@ {3BED15FD-D608-4573-B432-1569C1026F6D} VisualStudioTestUtilities + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {49bfae50-1bce-48ae-bc89-78b7d90a3ecd} + BasicEditorFeatures + + + {a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d} + BasicFeatures + + + {849e516a-595f-474b-adb4-e099f921cedf} + BasicInteractiveEditorFeatures + + + {3e7dea65-317b-4f43-a25d-62f18d96cfd7} + BasicScripting + + + {57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c} + BasicWorkspace + + + {7fe6b002-89d8-4298-9b1b-0b5c247dd1fd} + CompilerTestResources + + + {b501a547-c911-4a05-ac6e-274a50dff30e} + CSharpCodeAnalysis + + + {b0ce9307-ffdb-4838-a5ec-ce1f7cdc4ac2} + CSharpEditorFeatures + + + {3973b09a-4fbf-44a5-8359-3d22ceb71f71} + CSharpFeatures + + + {fe2cbea6-d121-4faa-aa8b-fc9900bf8c83} + CSharpInteractiveEditorFeatures + + + {066f0dbd-c46c-4c20-afec-99829a172625} + CSharpScripting + + + {737ff62c-f068-4317-84d0-bfb210c17a4e} + CSharpVisualStudioRepl + + + {21b239d0-d144-430f-a394-c066d58ee267} + CSharpWorkspace + + + {e2e889a5-2489-4546-9194-47c63e49eaeb} + Diagnostics + + + {3cdeeab7-2256-418a-beb2-620b5cb16302} + EditorFeatures + + + {92412d1a-0f23-45b5-b196-58839c524917} + InteractiveEditorFeatures + + + {8e2a252e-a140-45a6-a81a-2652996ea589} + InteractiveFeatures + + + {eba4dfa1-6ded-418f-a485-a3b608978906} + InteractiveHost + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + + + {f822f72a-cc87-4e31-b57d-853f65cbebf3} + RemoteWorkspaces + + + {12a68549-4e8c-42d6-8703-a09335f97997} + Scripting + + + {80fddd00-9393-47f7-8baf-7e87ce011068} + ServiceHub + + + {86fd5b9a-4fa0-4b10-b59f-cfaf077a859c} + ServicesVisualStudio + + + {c0e80510-4fbe-4b0c-af2c-4f473787722c} + ServicesVisualStudioImpl + + + {f7712928-1175-47b3-8819-ee086753dee2} + TestUtilities.FX45 + + + {18f5fbb8-7570-4412-8cc7-0a86ff13b7ba} + TextEditorFeatures + + + {8da861d8-0cce-4334-b6c0-01a846c881ec} + VisualStudio + + + {ef986d9b-8cfc-4ecb-9729-e260a1f84aff} + VisualStudioEditor + + + {a31228bb-f05c-4d4a-b98a-0e681d876b7c} + VisualStudioInteractiveServices + + + {c25768b3-2fe1-4d6d-8c17-a6acd56f8389} + VisualStudioText + + + {5f8d2414-064a-4b3a-9b42-8e2a04246be5} + Workspaces + + + {2e87fa96-50bb-4607-8676-46521599f998} + Workspaces.Desktop + + + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} + WorkspacesTestUtilities + diff --git a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj index 706c6c75845..03530e454ce 100644 --- a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj +++ b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj @@ -49,6 +49,18 @@ {5F8D2414-064A-4B3A-9B42-8E2A04246BE5} Workspaces + + {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} + BasicCodeAnalysis + + + {57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c} + BasicWorkspace + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + diff --git a/src/Workspaces/CoreTest/ServicesTest.csproj b/src/Workspaces/CoreTest/ServicesTest.csproj index 2fff01ab619..09cc1147fef 100644 --- a/src/Workspaces/CoreTest/ServicesTest.csproj +++ b/src/Workspaces/CoreTest/ServicesTest.csproj @@ -58,6 +58,10 @@ {5F8D2414-064A-4B3A-9B42-8E2A04246BE5} Workspaces + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + diff --git a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj index 614e454e9ec..faecb98e1e3 100644 --- a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj +++ b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj @@ -50,6 +50,18 @@ {5F8D2414-064A-4B3A-9B42-8E2A04246BE5} Workspaces + + {b501a547-c911-4a05-ac6e-274a50dff30e} + CSharpCodeAnalysis + + + {21b239d0-d144-430f-a394-c066d58ee267} + CSharpWorkspace + + + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} + PdbUtilities + true -- GitLab