Merge pull request #28512 from sharwell/integration-service

Move IntegrationService (used by integration tests) to its own project

Merge pull request #28512 from sharwell/integration-service
Move IntegrationService (used by integration tests) to its own project
288fb720 · Sam Harwell · GitHub · 569124ee · 223acccc · 288fb720
8 changed file
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -369,6 +369,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetProjectPackUtil", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteractiveHost64", "src\Interactive\Host\InteractiveHost64.csproj", "{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationService", "src\VisualStudio\IntegrationTest\IntegrationService\IntegrationService.csproj", "{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
@@ -986,6 +988,10 @@ Global
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1161,6 +1167,7 @@ Global
 		{5FE910A9-E7C9-40E1-AAF1-6C6C7DD61B67} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{B2B261E8-56EC-45DC-8AB8-A491A065EFD4} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{2F11618A-9251-4609-B3D5-CE4D2B3D3E49} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087}
+		{764D2C19-0187-4837-A2A3-96DDC6EF4CE2} = {CC126D03-7EAC-493F-B187-DCDEE1EF6A70}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}

--- a/build/config/SignToolData.json
+++ b/build/config/SignToolData.json
@@ -111,6 +111,7 @@
        "Dlls\\ServicesTestUtilities\\Roslyn.Services.Test.Utilities.dll",
        "Dlls\\TestUtilities\\net46\\Roslyn.Test.Utilities.dll",
        "Dlls\\VisualStudioIntegrationTestUtilities\\Microsoft.VisualStudio.IntegrationTest.Utilities.dll",
+        "Dlls\\IntegrationService\\Microsoft.VisualStudio.IntegrationTest.IntegrationService.dll",
        "Vsix\\VisualStudioIntegrationTestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.dll"
      ]
    },

--- a/src/VisualStudio/IntegrationTest/TestUtilities/IntegrationService.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/IntegrationService.cs
--- a/src/VisualStudio/IntegrationTest/IntegrationService/IntegrationService.csproj
+++ b/src/VisualStudio/IntegrationTest/IntegrationService/IntegrationService.csproj
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.VisualStudio.IntegrationTest.IntegrationService</RootNamespace>
+    <AssemblyName>Microsoft.VisualStudio.IntegrationTest.IntegrationService</AssemblyName>
+    <TargetFramework>net46</TargetFramework>
+    <Nonshipping>true</Nonshipping>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+  <ItemGroup>
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Setup" />
+  </ItemGroup>
+</Project>
--- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj
+++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj
@@ -2,9 +2,8 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <Platform Condition="'$(Platform)' == ''">x86</Platform>
-    <PlatformTarget>x86</PlatformTarget>
-    <RuntimeIdentifier>$(RoslynDesktopRuntimeIdentifierX86)</RuntimeIdentifier>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <OutputType>Library</OutputType>
    <RootNamespace>Roslyn.VisualStudio.IntegrationTests</RootNamespace>
    <AssemblyName>Roslyn.VisualStudio.IntegrationTests</AssemblyName>
@@ -12,8 +11,8 @@
    <Nonshipping>true</Nonshipping>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <ItemGroup>
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj" />
    <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj" />
@@ -49,6 +48,7 @@
    <ProjectReference Include="..\..\Core\Impl\ServicesVisualStudioImpl.csproj" />
    <ProjectReference Include="..\..\CSharp\Repl\CSharpVisualStudioRepl.csproj" />
    <ProjectReference Include="..\..\InteractiveServices\VisualStudioInteractiveServices.csproj" />
+    <ProjectReference Include="..\IntegrationService\IntegrationService.csproj" />
    <ProjectReference Include="..\TestUtilities\VisualStudioIntegrationTestUtilities.csproj" />
    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Workspaces.csproj" />
  </ItemGroup>

--- a/src/VisualStudio/IntegrationTest/TestSetup/BindingAttributes.cs
+++ b/src/VisualStudio/IntegrationTest/TestSetup/BindingAttributes.cs
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 using Microsoft.VisualStudio.Shell;
-using Roslyn.VisualStudio.Setup;

-[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.IntegrationTest.Setup.dll")]
-[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.IntegrationTest.Utilities.dll")]
-[assembly: ProvideRoslynBindingRedirection("Roslyn.Hosting.Diagnostics.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.VisualStudio.IntegrationTest.Setup.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.VisualStudio.IntegrationTest.IntegrationService.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Roslyn.Hosting.Diagnostics.dll")]

 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Diagnostics.Runtime.dll")]
--- a/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj
+++ b/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj
@@ -2,13 +2,12 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <Platform Condition="'$(Platform)' == ''">x86</Platform>
-    <PlatformTarget>x86</PlatformTarget>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.VisualStudio.IntegrationTest.Setup</RootNamespace>
    <AssemblyName>Microsoft.VisualStudio.IntegrationTest.Setup</AssemblyName>
    <TargetFramework>net46</TargetFramework>
-    <RuntimeIdentifier>$(RoslynDesktopRuntimeIdentifierX86)</RuntimeIdentifier>
    <Nonshipping>true</Nonshipping>
    <RoslynProjectType>Vsix</RoslynProjectType>
    <GeneratePkgDefFile>true</GeneratePkgDefFile>
@@ -21,8 +20,8 @@
    <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
    <ImportVSSDKTargets>true</ImportVSSDKTargets>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <ItemGroup>
    <None Include="source.extension.vsixmanifest">
      <SubType>Designer</SubType>
@@ -75,8 +74,8 @@
      <Name>VisualStudioSetup</Name>
      <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\TestUtilities\VisualStudioIntegrationTestUtilities.csproj">
-      <Name>VisualStudioIntegrationTestUtilities</Name>
+    <ProjectReference Include="..\IntegrationService\IntegrationService.csproj">
+      <Name>IntegrationService</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>

--- a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj
@@ -2,17 +2,16 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <Platform Condition="'$(Platform)' == ''">x86</Platform>
-    <PlatformTarget>x86</PlatformTarget>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.VisualStudio.IntegrationTest.Utilities</RootNamespace>
    <AssemblyName>Microsoft.VisualStudio.IntegrationTest.Utilities</AssemblyName>
    <TargetFramework>net46</TargetFramework>
-    <RuntimeIdentifier>$(RoslynDesktopRuntimeIdentifierX86)</RuntimeIdentifier>
    <Nonshipping>true</Nonshipping>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <ItemGroup>
    <None Include="app.config" />
    <None Include="Settings.settings">
@@ -75,6 +74,7 @@
    <ProjectReference Include="..\..\Core\Def\ServicesVisualStudio.csproj" />
    <ProjectReference Include="..\..\CSharp\Repl\CSharpVisualStudioRepl.csproj" />
    <ProjectReference Include="..\..\InteractiveServices\VisualStudioInteractiveServices.csproj" />
+    <ProjectReference Include="..\IntegrationService\IntegrationService.csproj" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\..\..\Tools\Source\RunTests\ProcDumpUtil.cs" />