From 5b1a60c990b0c6b334f219c2382d76b11e848406 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Thu, 22 Dec 2016 15:47:58 -0800 Subject: [PATCH] Re-arranging portable TestUtilities part 5 Clean up the remaining solutions to have the utilities included. --- CrossPlatform.sln | 32 +++++++++++++++---- Roslyn.sln | 31 ++++++++++++++---- .../CSharpEditorServicesTest.csproj | 4 +++ .../CSharpEditorServicesTest2.csproj | 3 +- .../Test/EditorServicesTest.csproj | 10 ++++-- .../Test2/EditorServicesTest2.vbproj | 4 +++ .../ServicesTestUtilities.csproj | 4 +++ .../ServicesTestUtilities2.vbproj | 6 +++- .../BasicEditorServicesTest.vbproj | 4 +++ .../CSharpExpressionCompilerTest.csproj | 6 +++- .../CSharpResultProviderTest.csproj | 6 +++- .../ExpressionCompilerTestUtilities.csproj | 4 +++ .../FunctionResolverTest.csproj | 4 +++ .../ResultProviderTestUtilities.csproj | 4 +++ .../BasicExpressionCompilerTest.vbproj | 6 +++- .../BasicResultProviderTest.vbproj | 12 +++++-- .../HostTest/InteractiveHostTest.csproj | 4 +++ .../CSharp/Test/CSharpVisualStudioTest.csproj | 4 +++ .../Core/Test/ServicesVisualStudioTest.vbproj | 4 +++ .../VisualStudioIntegrationTests.csproj | 4 +++ .../CSharpTest/CSharpServicesTest.csproj | 6 +++- src/Workspaces/CoreTest/ServicesTest.csproj | 4 +++ .../WorkspacesTestUtilities.csproj | 4 +++ .../VisualBasicServicesTest.vbproj | 6 +++- 24 files changed, 149 insertions(+), 27 deletions(-) diff --git a/CrossPlatform.sln b/CrossPlatform.sln index 4b9821b6801..5f08e28411a 100644 --- a/CrossPlatform.sln +++ b/CrossPlatform.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26021.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\Compilers\Core\Portable\CodeAnalysis.csproj", "{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}" EndProject @@ -51,8 +51,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CscCore", "src\Compilers\CS EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VbcCore", "src\Compilers\VisualBasic\VbcCore\VbcCore.csproj", "{8CE3A581-2969-4864-A803-013E9D977C3A}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Shared\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommandLine", "src\Compilers\Core\CommandLine\CommandLine.shproj", "{AD6F474E-E6D4-4217-91F3-B7AF1BE31CCC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{50509463-6012-4061-99BF-6C5C8262E643}" @@ -99,6 +97,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsiCore", "src\Interactive\ EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VbiCore", "src\Interactive\VbiCore\VbiCore.vbproj", "{1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.CoreClr", "src\Test\Utilities\CoreClr\TestUtilities.CoreClr.csproj", "{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4 @@ -106,7 +106,6 @@ Global src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4 src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4 src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 4 - src\Test\Utilities\Shared\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13 src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{8ce3a581-2969-4864-a803-013e9d977c3a}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{ad6f474e-e6d4-4217-91f3-b7af1be31ccc}*SharedItemsImports = 13 @@ -114,7 +113,6 @@ Global src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4 src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4 src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13 - src\Test\Utilities\Shared\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4 src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13 src\Dependencies\CodeAnalysis.Metadata\Microsoft.CodeAnalysis.Metadata.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13 src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4 @@ -748,6 +746,26 @@ Global {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|x64.Build.0 = Release|Any CPU {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|x86.ActiveCfg = Release|Any CPU {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|x86.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -774,7 +792,6 @@ Global {D0BC9BE7-24F6-40CA-8DC6-FCB93BD44B34} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA} {8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} - {6FF42825-5464-4151-AC55-ED828168C192} = {50509463-6012-4061-99BF-6C5C8262E643} {AD6F474E-E6D4-4217-91F3-B7AF1BE31CCC} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {50509463-6012-4061-99BF-6C5C8262E643} {59BABFC3-C19B-4472-A93D-3DD3835BC219} = {50509463-6012-4061-99BF-6C5C8262E643} @@ -794,5 +811,6 @@ Global {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} = {FED79E76-76A7-48A1-B0F1-E5E56B5E7FE4} {D1B051A4-F2A1-4E97-9747-C41D13E475FD} = {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD} = {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37} = {50509463-6012-4061-99BF-6C5C8262E643} EndGlobalSection EndGlobal diff --git a/Roslyn.sln b/Roslyn.sln index 7a6611c50ac..f0f6570855e 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.25920.0 +VisualStudioVersion = 15.0.26021.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysisTest", "src\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj", "{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}" EndProject @@ -251,8 +251,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CscCore", "src\Compilers\CS EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VbcCore", "src\Compilers\VisualBasic\VbcCore\VbcCore.csproj", "{8CE3A581-2969-4864-A803-013E9D977C3A}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Shared\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\Utilities\Portable\TestUtilities.csproj", "{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTest.Desktop", "src\Scripting\CoreTest.Desktop\ScriptingTest.Desktop.csproj", "{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}" @@ -366,6 +364,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorVisualStudio", "src\Vi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorServiceHub", "src\Workspaces\Remote\Razor\RazorServiceHub.csproj", "{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.CoreClr", "src\Test\Utilities\CoreClr\TestUtilities.CoreClr.csproj", "{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4 @@ -382,10 +382,8 @@ Global src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{54e08bf5-f819-404f-a18d-0ab9ea81ea04}*SharedItemsImports = 13 src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 4 src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{60db272a-21c9-4e8d-9803-ff4e132392c8}*SharedItemsImports = 4 - src\Test\Utilities\Shared\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13 src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1842}*SharedItemsImports = 4 src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1843}*SharedItemsImports = 4 - src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 src\Dependencies\CodeAnalysis.Metadata\Microsoft.CodeAnalysis.Metadata.projitems*{86fd5b9a-4fa0-4b10-b59f-cfaf077a859c}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{8ce3a581-2969-4864-a803-013e9d977c3a}*SharedItemsImports = 4 @@ -403,7 +401,6 @@ Global src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4 src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d4}*SharedItemsImports = 4 src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13 - src\Test\Utilities\Shared\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4 src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13 src\Dependencies\CodeAnalysis.Metadata\Microsoft.CodeAnalysis.Metadata.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13 src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4 @@ -3221,6 +3218,26 @@ Global {B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x64.Build.0 = Release|Any CPU {B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x86.ActiveCfg = Release|Any CPU {B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x86.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.ActiveCfg = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.Build.0 = Debug|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.Build.0 = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.ActiveCfg = Release|Any CPU + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3341,7 +3358,6 @@ Global {81F048A1-B30A-4E74-9BD3-2655DA1DBEA6} = {999FBDA2-33DA-4F74-B957-03AC72CCE5EC} {E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA} {8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} - {6FF42825-5464-4151-AC55-ED828168C192} = {CAD2965A-19AB-489F-BE2E-7649957F914A} {CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {CAD2965A-19AB-489F-BE2E-7649957F914A} {6FD1CC3E-6A99-4736-9B8D-757992DDE75D} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} {286B01F3-811A-40A7-8C1F-10C9BB0597F7} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} @@ -3394,5 +3410,6 @@ Global {DD317BE1-42A1-4795-B1D4-F370C40D649A} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6} {0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980} = {8DBA5174-B0AA-4561-82B1-A46607697753} {B6FC05F2-0E49-4BE2-8030-ACBB82B7F431} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5} + {67CA3EEE-37F1-4EDF-BD9B-C11911748F37} = {CAD2965A-19AB-489F-BE2E-7649957F914A} EndGlobalSection EndGlobal diff --git a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj index 03a078fbc75..1d4f9f1f2ed 100644 --- a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj +++ b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj @@ -27,6 +27,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {2e87fa96-50bb-4607-8676-46521599f998} Workspaces.Desktop diff --git a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj index eb4d04321b4..4f31a65c716 100644 --- a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj +++ b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj @@ -130,7 +130,6 @@ {ccbd3438-3e84-40a9-83ad-533f23bcfca5} TestUtilities - TestUtilitiesPortable {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} @@ -300,4 +299,4 @@ - \ No newline at end of file + diff --git a/src/EditorFeatures/Test/EditorServicesTest.csproj b/src/EditorFeatures/Test/EditorServicesTest.csproj index 5dd9a2c918e..e12271a060a 100644 --- a/src/EditorFeatures/Test/EditorServicesTest.csproj +++ b/src/EditorFeatures/Test/EditorServicesTest.csproj @@ -50,6 +50,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities @@ -137,8 +141,10 @@ ServiceHub - - + + + + diff --git a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj index 2e042ae9310..fb35d8c3de2 100644 --- a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj +++ b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj @@ -33,6 +33,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {d49439d7-56d2-450f-a4f0-74cb95d620e6} BasicVisualStudio diff --git a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj index 485c2f83b61..b64b50ddd77 100644 --- a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj +++ b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj @@ -67,6 +67,10 @@ {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities diff --git a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj index 2736b456f08..2660d4119dc 100644 --- a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj +++ b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj @@ -34,6 +34,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {d49439d7-56d2-450f-a4f0-74cb95d620e6} BasicVisualStudio @@ -152,4 +156,4 @@ - + \ No newline at end of file diff --git a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj index 5c5d2099aad..78f9a12c18c 100644 --- a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj +++ b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj @@ -82,6 +82,10 @@ {A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D} BasicFeatures + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj index 9c9f2dbe610..1db785f6874 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj @@ -21,6 +21,10 @@ {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {5002636a-fe8d-40bf-8818-ab513a2194fa} Concord @@ -113,4 +117,4 @@ - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj index 15f7bf48922..869c3d90539 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj @@ -36,6 +36,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {abdbac1e-350e-4dc3-bb45-3504404545ee} ResultProviderTestUtilities @@ -104,4 +108,4 @@ - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj index 889e4973d0f..21f86ed333b 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj @@ -19,6 +19,10 @@ {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {5002636a-fe8d-40bf-8818-ab513a2194fa} Concord diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj index 4cf2e2778ca..d5686697441 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj @@ -38,6 +38,10 @@ {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} BasicCodeAnalysis + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {6FC8E6F5-659C-424D-AEB5-331B95883E29} FunctionResolver diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj index 136dd5bee7d..5de90f1b436 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj @@ -24,6 +24,10 @@ {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {5002636a-fe8d-40bf-8818-ab513a2194fa} Concord diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj index 9f20094838f..6d2cabcc75f 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj @@ -34,6 +34,10 @@ {b501a547-c911-4a05-ac6e-274a50dff30e} CSharpCodeAnalysis + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {b8da3a90-a60c-42e3-9d8e-6c67b800c395} ExpressionCompiler @@ -112,4 +116,4 @@ - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj index 8678aeeb9a4..5c4a169bb86 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj @@ -6,10 +6,12 @@ AnyCPU {ACE53515-482C-4C6A-E2D2-4242A687DFEE} Library - + + Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests v4.6 - + + UnitTest @@ -40,6 +42,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {abdbac1e-350e-4dc3-bb45-3504404545ee} ResultProviderTestUtilities @@ -94,4 +100,4 @@ - + \ No newline at end of file diff --git a/src/Interactive/HostTest/InteractiveHostTest.csproj b/src/Interactive/HostTest/InteractiveHostTest.csproj index 5db7e11fbe4..e0162032303 100644 --- a/src/Interactive/HostTest/InteractiveHostTest.csproj +++ b/src/Interactive/HostTest/InteractiveHostTest.csproj @@ -41,6 +41,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {2e87fa96-50bb-4607-8676-46521599f998} Workspaces.Desktop diff --git a/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj b/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj index 95c6a1f825d..6a9306099c9 100644 --- a/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj +++ b/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj @@ -78,6 +78,10 @@ {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities diff --git a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj index e721c6c23fc..c738a5c019f 100644 --- a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj +++ b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj @@ -39,6 +39,10 @@ {a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d} BasicFeatures + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {2e87fa96-50bb-4607-8676-46521599f998} Workspaces.Desktop diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj index 6b21d3a33db..ba815bc6a52 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj @@ -132,6 +132,10 @@ {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities diff --git a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj index 09f062bcb3e..fd10914d13e 100644 --- a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj +++ b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj @@ -33,6 +33,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities @@ -88,4 +92,4 @@ - + \ No newline at end of file diff --git a/src/Workspaces/CoreTest/ServicesTest.csproj b/src/Workspaces/CoreTest/ServicesTest.csproj index 9baa308e95a..21b217719c4 100644 --- a/src/Workspaces/CoreTest/ServicesTest.csproj +++ b/src/Workspaces/CoreTest/ServicesTest.csproj @@ -37,6 +37,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities diff --git a/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj b/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj index ffb1ac8136d..4b77ad82aa8 100644 --- a/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj +++ b/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj @@ -36,6 +36,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {2e87fa96-50bb-4607-8676-46521599f998} Workspaces.Desktop diff --git a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj index e58cf9b0fc4..82bb54683d5 100644 --- a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj +++ b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj @@ -34,6 +34,10 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop + + {ccbd3438-3e84-40a9-83ad-533f23bcfca5} + TestUtilities + {3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e} WorkspacesTestUtilities @@ -120,4 +124,4 @@ - + \ No newline at end of file -- GitLab