Updating the integration test project files.

3c6d433b · Tanner Gooding · 6677ba14 · 3c6d433b · 3c6d433b · 3c6d433b
17 changed file
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -2685,26 +2685,20 @@ Global
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x64.ActiveCfg = Release|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x64.Build.0 = Release|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x86.ActiveCfg = Release|x64
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x64.Build.0 = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x86.Build.0 = Debug|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|ARM.Build.0 = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x64.ActiveCfg = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x64.Build.0 = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x86.Build.0 = Release|Any CPU
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|ARM.ActiveCfg = Debug|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x64.ActiveCfg = Debug|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x86.ActiveCfg = Debug|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Debug|x86.Build.0 = Debug|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Any CPU.ActiveCfg = Release|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|ARM.ActiveCfg = Release|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|Mixed Platforms.Build.0 = Release|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x64.ActiveCfg = Release|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x86.ActiveCfg = Release|x86
+		{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}.Release|x86.Build.0 = Release|x86
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Debug|ARM.ActiveCfg = Debug|x86
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
@@ -2719,26 +2713,20 @@ Global
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Release|x64.ActiveCfg = Release|x86
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Release|x86.ActiveCfg = Release|x86
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58}.Release|x86.Build.0 = Release|x86
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x64.Build.0 = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x86.Build.0 = Debug|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|ARM.Build.0 = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x64.ActiveCfg = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x64.Build.0 = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x86.ActiveCfg = Release|Any CPU
-		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x86.Build.0 = Release|Any CPU
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|ARM.ActiveCfg = Debug|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x64.ActiveCfg = Debug|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x86.ActiveCfg = Debug|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Debug|x86.Build.0 = Debug|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Any CPU.ActiveCfg = Release|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|ARM.ActiveCfg = Release|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|Mixed Platforms.Build.0 = Release|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x64.ActiveCfg = Release|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x86.ActiveCfg = Release|x86
+		{3BED15FD-D608-4573-B432-1569C1026F6D}.Release|x86.Build.0 = Release|x86
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|ARM.ActiveCfg = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

--- a/src/EditorFeatures/Core/EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/EditorFeatures.csproj
@@ -89,7 +89,7 @@
    <InternalsVisibleToTest Include="Roslyn.Test.Utilities.Desktop" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.CSharp.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities2" />
    <!-- Eventually a bunch of these unit tests should move into Roslyn.Services.Implementation.UnitTests
         and this should be removed. -->

--- a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj
+++ b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj
@@ -277,7 +277,7 @@
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Next.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities2" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities2" />
  </ItemGroup>
  <ItemGroup>

--- a/src/Features/Core/Portable/Features.csproj
+++ b/src/Features/Core/Portable/Features.csproj
@@ -69,7 +69,7 @@
    <InternalsVisibleToTest Include="Roslyn.Services.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.IntegrationTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities.Next" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Next.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.Services.Test.Utilities" />
@@ -77,7 +77,7 @@
    <InternalsVisibleToTest Include="RoslynETAHost" />
    <InternalsVisibleToTest Include="RoslynTaoActions" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.CSharp.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities2" />
    <InternalsVisibleToTypeScript Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" />
    <InternalsVisibleToTypeScript Include="Microsoft.VisualStudio.LanguageServices.TypeScript" />

--- a/src/NuGet/BuildNuGets.csx
+++ b/src/NuGet/BuildNuGets.csx
@@ -104,7 +104,7 @@ string[] NonRedistPackageNames = {
    "Microsoft.Net.Compilers",
    "Microsoft.Net.Compilers.netcore",
    "Microsoft.Net.CSharp.Interactive.netcore",
-    "Roslyn.VisualStudio.Test.Utilities",
+    "Microsoft.VisualStudio.IntegrationTest.Utilities",
 };

 string[] TestPackageNames = {

--- a/src/NuGet/Roslyn.VisualStudio.Test.Utilities.nuspec
+++ b/src/NuGet/Roslyn.VisualStudio.Test.Utilities.nuspec
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
  <metadata>
-    <id>Roslyn.VisualStudio.Test.Utilities</id>
-    <description>Utility methods used to run Roslyn Visual Studio integration tests.</description>
+    <id>Microsoft.VisualStudio.IntegrationTest.Utilities</id>
+    <description>Utility methods used to run Visual Studio integration tests.</description>
    <dependencies>
      <dependency id="Microsoft.VisualStudio.LanguageServices" version="$version$" />
    </dependencies>
-    
    <language>en-US</language>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <version>$version$</version>
@@ -17,7 +16,7 @@
    <tags>$tags$</tags>
  </metadata>
  <files>
-    <file src="Dlls\VisualStudioTestUtilities\Roslyn.VisualStudio.Test.Utilities.dll" target="lib\net46" />
-    <file src="Vsix\VisualStudioTestSetup\Microsoft.VisualStudio.Setup.Configuration.Interop.dll" target="lib\net46" />
+    <file src="Dlls\VisualStudioIntegrationTestUtilities\Microsoft.VisualStudio.IntegrationTest.Utilities.dll" target="lib\net46" />
+    <file src="Dlls\VisualStudioIntegrationTestUtilities\Microsoft.VisualStudio.Setup.Configuration.Interop.dll" target="lib\net46" />
  </files>
 </package>
--- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
@@ -174,6 +174,7 @@ Public Class BuildDevDivInsertionFiles
        "Microsoft.CodeAnalysis.Workspaces.dll",
        "Microsoft.Diagnostics.Runtime.dll",
        "Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll",
+        "Microsoft.VisualStudio.IntegrationTest.Setup.vsix",
        "Microsoft.VisualStudio.LanguageServices.CSharp.dll",
        "Microsoft.VisualStudio.LanguageServices.dll",
        "Microsoft.VisualStudio.LanguageServices.Implementation.dll",
@@ -183,8 +184,7 @@ Public Class BuildDevDivInsertionFiles
        "Roslyn.Hosting.Diagnostics.dll",
        "Roslyn.Services.Test.Utilities.dll",
        "Roslyn.Test.PdbUtilities.dll",
-        "Roslyn.Test.Utilities.dll",
-        "Roslyn.VisualStudio.Test.Setup.vsix"
+        "Roslyn.Test.Utilities.dll"
    }

    ' Files needed by Mad dog tests that are produced by our internal builds.
@@ -858,8 +858,8 @@ Public Class BuildDevDivInsertionFiles
        add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.Native.x86.dll")
        add("UnitTests\EditorServicesTest\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll")
        add("Dlls\Concord\Microsoft.VisualStudio.Debugger.Engine.dll")
-        add("Vsix\VisualStudioTestSetup\Microsoft.Diagnostics.Runtime.dll")
-        add("Vsix\VisualStudioTestSetup\Roslyn.VisualStudio.Test.Setup.vsix")
+        add("Vsix\VisualStudioIntegrationTestSetup\Microsoft.Diagnostics.Runtime.dll")
+        add("Vsix\VisualStudioIntegrationTestSetup\Microsoft.VisualStudio.IntegrationTest.Setup.vsix")
        add("Vsix\CompilerExtension\System.Collections.Immutable.dll")
        add("Vsix\CompilerExtension\System.Reflection.Metadata.dll")
        add("Vsix\CompilerExtension\System.Diagnostics.FileVersionInfo.dll")

--- a/src/VisualStudio/CSharp/Repl/CSharpVisualStudioRepl.csproj
+++ b/src/VisualStudio/CSharp/Repl/CSharpVisualStudioRepl.csproj
@@ -96,7 +96,7 @@
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
    <InternalsVisibleToTest Include="RoslynETAHost" />
    <InternalsVisibleToTest Include="RoslynTaoActions" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
  </ItemGroup>
  <ItemGroup>
    <None Include="project.json" />

--- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj
+++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\build\Targets\Settings.props" />
  <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Platform Condition="'$(Platform)' == ''">x86</Platform>
    <ProjectGuid>{E5A55C16-A5B9-4874-9043-A5266DC02F58}</ProjectGuid>
    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Roslyn.VisualStudio.IntegrationTests</RootNamespace>
    <AssemblyName>Roslyn.VisualStudio.IntegrationTests</AssemblyName>
    <PlatformTarget>x86</PlatformTarget>
@@ -38,9 +38,6 @@
  <ItemGroup>
    <Reference Include="System" />
  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
@@ -188,7 +185,7 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Folder Include="Properties\" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
 </Project>
\ No newline at end of file
--- a/src/VisualStudio/IntegrationTest/TestSetup/BindingAttributes.cs
+++ b/src/VisualStudio/IntegrationTest/TestSetup/BindingAttributes.cs
 using Microsoft.VisualStudio.Shell;

 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Roslyn.Hosting.Diagnostics.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Roslyn.VisualStudio.Test.Utilities.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.VisualStudio.IntegrationTest.Utilities.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Diagnostics.Runtime.dll")]
\ No newline at end of file
--- a/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj
+++ b/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\build\Targets\Settings.props" />
  <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{82B43B9B-A64C-4715-B499-D71E9CA2BD60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <Platform Condition="'$(Platform)' == ''">x86</Platform>
    <ProjectGuid>{A88AB44F-7F9D-43F6-A127-83BB65E5A7E2}</ProjectGuid>
    <OutputType>Library</OutputType>
-    <RootNamespace>Roslyn.VisualStudio.Test.Setup</RootNamespace>
-    <AssemblyName>Roslyn.VisualStudio.Test.Setup</AssemblyName>
+    <RootNamespace>Microsoft.VisualStudio.IntegrationTest.Setup</RootNamespace>
+    <AssemblyName>Microsoft.VisualStudio.IntegrationTest.Setup</AssemblyName>
+    <PlatformTarget>x86</PlatformTarget>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <Nonshipping>true</Nonshipping>
+    <RoslynProjectType>Vsix</RoslynProjectType>
+    <ProjectTypeGuids>{82B43B9B-A64C-4715-B499-D71E9CA2BD60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SchemaVersion>2.0</SchemaVersion>
    <GeneratePkgDefFile>true</GeneratePkgDefFile>
    <UseCodebase>true</UseCodebase>
    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -16,11 +22,12 @@
    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
    <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
    <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
-    <Nonshipping>true</Nonshipping>
    <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
    <ImportVSSDKTargets>true</ImportVSSDKTargets>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <RoslynProjectType>Vsix</RoslynProjectType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
  </PropertyGroup>
  <ItemGroup>
    <None Include="project.json" />
@@ -47,6 +54,15 @@
      <ManifestResourceName>VSPackage</ManifestResourceName>
    </EmbeddedResource>
  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Runtime.Remoting" />
+    <!-- The CodingConventions nuget package isn't correctly formed for real nuget to understand it -->
+    <Reference Include="$(NuGetPackageRoot)\VS.ExternalAPIs.CodingConventions\1.0.60704.2\Microsoft.VisualStudio.CodingConventions.dll">
+      <Private>true</Private>
+    </Reference>
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\Test\Diagnostics\Diagnostics.csproj">
      <Project>{e2e889a5-2489-4546-9194-47c63e49eaeb}</Project>
@@ -76,14 +92,5 @@
  <ItemGroup>
    <NuGetPackageToIncludeInVsix Include="Microsoft.Diagnostics.Runtime" />
  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Runtime.Remoting" />
-    <!-- The CodingConventions nuget package isn't correctly formed for real nuget to understand it -->
-    <Reference Include="$(NuGetPackageRoot)\VS.ExternalAPIs.CodingConventions\1.0.60704.2\Microsoft.VisualStudio.CodingConventions.dll">
-      <Private>true</Private>
-    </Reference>
-  </ItemGroup>
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
 </Project>
\ No newline at end of file
--- a/src/VisualStudio/IntegrationTest/TestSetup/project.json
+++ b/src/VisualStudio/IntegrationTest/TestSetup/project.json
@@ -7,6 +7,6 @@
    "net46": { }
  },
  "runtimes": {
-    "win7": { }
+    "win7-x86": { }
  }
 }
\ No newline at end of file
--- a/src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs
@@ -8,11 +8,11 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace Roslyn.VisualStudio.Test.Utilities {
+namespace Microsoft.VisualStudio.IntegrationTest.Utilities {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

--- a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\build\Targets\Settings.props" />
  <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition="'$(Platform)' == ''">x86</Platform>
    <ProjectGuid>{3BED15FD-D608-4573-B432-1569C1026F6D}</ProjectGuid>
    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Roslyn.VisualStudio.Test.Utilities</RootNamespace>
-    <AssemblyName>Roslyn.VisualStudio.Test.Utilities</AssemblyName>
+    <RootNamespace>Microsoft.VisualStudio.IntegrationTest.Utilities</RootNamespace>
+    <AssemblyName>Microsoft.VisualStudio.IntegrationTest.Utilities</AssemblyName>
+    <PlatformTarget>x86</PlatformTarget>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <Nonshipping>true</Nonshipping>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
  </PropertyGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="project.json" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Common\Comparison.cs" />
    <Compile Include="Common\Parameter.cs" />
@@ -55,18 +64,8 @@
    <Compile Include="OutOfProcess\VisualStudioWorkspace_OutOfProc.cs" />
  </ItemGroup>
  <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.VisualStudio.LiveUnitTesting.IntegrationTests" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Setup" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="project.json" />
-    <None Include="Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
+    <Reference Include="EnvDTE" />
+    <Reference Include="EnvDTE80" />
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
    <Reference Include="System" />
@@ -114,6 +113,9 @@
      <Name>VisualStudioInteractiveServices</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.VisualStudio.LiveUnitTesting.IntegrationTests" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Setup" />
+  </ItemGroup>
  <Import Project="..\..\..\..\build\Targets\Imports.targets" />
 </Project>
\ No newline at end of file
--- a/src/VisualStudio/IntegrationTest/TestUtilities/project.json
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/project.json
@@ -16,6 +16,6 @@
    "net46": { }
  },
  "runtimes": {
-    "win7": { }
+    "win7-x86": { }
  }
 }
--- a/src/VisualStudio/InteractiveServices/VisualStudioInteractiveServices.csproj
+++ b/src/VisualStudio/InteractiveServices/VisualStudioInteractiveServices.csproj
@@ -72,7 +72,7 @@
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
    <InternalsVisibleToTest Include="RoslynETAHost" />
    <InternalsVisibleToTest Include="RoslynTaoActions" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
  </ItemGroup>
  <ItemGroup>
    <Reference Include="Microsoft.CSharp" />

--- a/src/Workspaces/Core/Portable/Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Workspaces.csproj
@@ -243,8 +243,8 @@
    <InternalsVisibleToTest Include="Roslyn.Services.VisualBasic.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.CSharp.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Closed.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Setup" />
-    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Setup" />
+    <InternalsVisibleToTest Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Next.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
    <InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities2" />