Delete VisualStudioSetup.Next

This project originally existed to support a Dev14 vs. Dev15 split,
which we no longer version that way. This project had it's contents
moved out a few minor updates of Dev15 ago, and is now empty, only
so that way if you had an older VS Update F5 would still work. Now
we require 15.6 as a base drop, which also has this containing nothing,
so we can just delete this.

Roslyn.sln

@@ -279,8 +279,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.Tests", "src\Test\Perf
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn", "src\Deployment\Roslyn.csproj", "{600AF682-E097-407B-AD85-EE3CED37E680}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualStudioSetup.Next", "src\VisualStudio\Setup.Next\VisualStudioSetup.Next.csproj", "{143FE684-6E1C-41DF-9C60-84C7772DC49C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlVisualStudio", "src\VisualStudio\Xaml\Impl\XamlVisualStudio.csproj", "{971E832B-7471-48B5-833E-5913188EC0E4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.Utilities", "src\Test\Perf\Utilities\Perf.Utilities.csproj", "{59AD474E-2A35-4E8A-A74D-E33479977FBF}"
@@ -806,10 +804,6 @@ Global
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|Any CPU.Build.0 = Release|Any CPU
-		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{971E832B-7471-48B5-833E-5913188EC0E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{971E832B-7471-48B5-833E-5913188EC0E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{971E832B-7471-48B5-833E-5913188EC0E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1092,7 +1086,6 @@ Global
 		{E5A55C16-A5B9-4874-9043-A5266DC02F58} = {CC126D03-7EAC-493F-B187-DCDEE1EF6A70}
 		{3BED15FD-D608-4573-B432-1569C1026F6D} = {CC126D03-7EAC-493F-B187-DCDEE1EF6A70}
 		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5}
-		{143FE684-6E1C-41DF-9C60-84C7772DC49C} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{971E832B-7471-48B5-833E-5913188EC0E4} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{59AD474E-2A35-4E8A-A74D-E33479977FBF} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5}
 		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5}

build/config/SignToolData.json

@@ -141,7 +141,6 @@
         "Vsix\\CompilerExtension\\Roslyn.Compilers.Extension.vsix",
         "Vsix\\VisualStudioDiagnosticsWindow\\Roslyn.VisualStudio.DiagnosticsWindow.vsix",
         "Vsix\\VisualStudioInteractiveComponents\\Roslyn.VisualStudio.InteractiveComponents.vsix",
-        "Vsix\\VisualStudioSetup.Next\\Roslyn.VisualStudio.Setup.Next.vsix",
         "Vsix\\VisualStudioSetup\\Roslyn.VisualStudio.Setup.vsix",
         "Vsix\\Roslyn\\RoslynDeployment.vsix",
         "Vsix\\VisualStudioIntegrationTestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.vsix"

build/scripts/build.ps1

@@ -540,7 +540,6 @@ function Deploy-VsixViaTool() {
     $all = @(
         "Vsix\CompilerExtension\Roslyn.Compilers.Extension.vsix",
         "Vsix\VisualStudioSetup\Roslyn.VisualStudio.Setup.vsix",
-        "Vsix\VisualStudioSetup.Next\Roslyn.VisualStudio.Setup.Next.vsix",
         "Vsix\VisualStudioInteractiveComponents\Roslyn.VisualStudio.InteractiveComponents.vsix",
         "Vsix\ExpressionEvaluatorPackage\ExpressionEvaluatorPackage.vsix",
         "Vsix\VisualStudioDiagnosticsWindow\Roslyn.VisualStudio.DiagnosticsWindow.vsix",

docs/contributing/Building, Debugging, and Testing on Windows.md

@@ -76,7 +76,7 @@ will start a new Visual Studio instance using those VSIX which override our inst
 binaries.  This means trying out a change to the language, IDE or debugger is as
 simple as hitting F5.
 
-The startup project needs to be set to VisualStudioSetup.Next.  This should be
+The startup project needs to be set to VisualStudioSetup.  This should be
 the default but in same cases will need to be set explicitly.
 
 Here are what is deployed with each extension, by project that builds it. If
@@ -84,11 +84,6 @@ you're working on a particular area, you probably want to set the appropriate
 project as your startup project to ensure the right things are built and
 deployed.
 
-- **VisualStudioSetup.Next**: this project can be found inside the VisualStudio
-  folder from the Solution Explorer, and builds Roslyn.VisualStudio.Setup.vsix.
-  In theory, it contains code to light up features for the next version of VS
-  (Dev16), but currently hasn't been updated for that since Dev15/VS2017 shipped.
-  If you're working on fixing an IDE bug, this is the project you want to use.
 - **VisualStudioSetup**: this project can be found inside the VisualStudio folder
   from the Solution Explorer, and builds Roslyn.VisualStudio.Setup.vsix. It
   contains the core language services that provide C# and VB editing. It also
@@ -96,8 +91,8 @@ deployed.
   semantic analysis in Visual Studio. Although this is the copy of the compiler
   that's used to generate squiggles and other information, it's not the
   compiler used to actually produce your final .exe or .dll when you do a
-  build. If you're working on fixing an IDE bug, this is *NOT* the project you want
-  to use right now - use VisualStudioSetup.Next instead.
+  build. If you're working on fixing an IDE bug, this is the project you want
+  to use.
 - **CompilerExtension**: this project can be found inside the Compilers folder
   from the Solution Explorer, and builds Roslyn.Compilers.Extension.vsix.
   This deploys a copy of the command line compilers that are used to do actual

src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb

@@ -108,8 +108,7 @@ Public Class BuildDevDivInsertionFiles
     Private ReadOnly VsixesToInstall As String() = {
         "Vsix\VisualStudioSetup\Roslyn.VisualStudio.Setup.vsix",
         "Vsix\ExpressionEvaluatorPackage\ExpressionEvaluatorPackage.vsix",
-        "Vsix\VisualStudioInteractiveComponents\Roslyn.VisualStudio.InteractiveComponents.vsix",
-        "Vsix\VisualStudioSetup.Next\Roslyn.VisualStudio.Setup.Next.vsix"
+        "Vsix\VisualStudioInteractiveComponents\Roslyn.VisualStudio.InteractiveComponents.vsix"
     }
 
     ' Files copied to Maddog machines running integration tests that are produced from our builds.

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj

@@ -21,7 +21,6 @@
     <MergeManifest Include="$(OutputPath)\..\ExpressionEvaluatorPackage\Microsoft.CodeAnalysis.ExpressionEvaluator.json" />
     <MergeManifest Include="$(OutputPath)\..\VisualStudioInteractiveComponents\Microsoft.CodeAnalysis.VisualStudio.InteractiveComponents.json" />
     <MergeManifest Include="$(OutputPath)\..\VisualStudioSetup\Microsoft.CodeAnalysis.VisualStudio.Setup.json" />
-    <MergeManifest Include="$(OutputPath)\..\VisualStudioSetup.Next\Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json" />
   </ItemGroup>
 
   <Target Name="ValidateManifest" />

src/Test/Perf/Utilities/VsPerfTest.cs

@@ -72,8 +72,7 @@ protected virtual string GetFinalTestSource(string testTemplateWithReplacedSolut
 
         protected void InstallVsixes()
         {
-            var vsix1 = Path.Combine(MyBinaries(), "Vsix", "VisualStudioSetup", "Roslyn.VisualStudio.Setup.vsix");
-            var vsix2 = Path.Combine(MyBinaries(), "Vsix", "VisualStudioSetup.Next", "Roslyn.VisualStudio.Setup.Next.vsix");
+            var vsix = Path.Combine(MyBinaries(), "Vsix", "VisualStudioSetup", "Roslyn.VisualStudio.Setup.vsix");
 
             var rootSuffixArg = $"/rootsuffix:{_rootSuffix}";
 
@@ -81,8 +80,7 @@ protected void InstallVsixes()
             ShellOutVital(_installerPath, $"{rootSuffixArg}, /uninstallAll");
 
             // Then install the RoslynDeployment.vsix we just built
-            ShellOutVital(_installerPath, $"{rootSuffixArg} {vsix1}");
-            ShellOutVital(_installerPath, $"{rootSuffixArg} {vsix2}");
+            ShellOutVital(_installerPath, $"{rootSuffixArg} {vsix}");
         }
 
         public override void Test()

src/Tools/MicroBuild/microbuild.ps1

@@ -50,8 +50,6 @@ function Copy-InsertionItems() {
         "Vsix\VisualStudioInteractiveComponents\Roslyn.VisualStudio.InteractiveComponents.vsix",
         "Vsix\VisualStudioSetup\Microsoft.CodeAnalysis.VisualStudio.Setup.json",
         "Vsix\VisualStudioSetup\Roslyn.VisualStudio.Setup.vsix",
-        "Vsix\VisualStudioSetup.Next\Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json",
-        "Vsix\VisualStudioSetup.Next\Roslyn.VisualStudio.Setup.Next.vsix",
         "Vsix\CodeAnalysisLanguageServices\Microsoft.CodeAnalysis.LanguageServices.vsman",
         "Vsix\PortableFacades\PortableFacades.vsix",
         "Vsix\PortableFacades\PortableFacades.vsman",

src/VisualStudio/Setup.Next/Properties/launchSettings.json

-{
-  "profiles": {
-    "Visual Studio Extension": {
-      "executablePath": "$(DevEnvDir)devenv.exe",
-      "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log"
-    }
-  }
-}

src/VisualStudio/Setup.Next/VisualStudioSetup.Next.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>Roslyn.VisualStudio.Setup.Next</RootNamespace>
-    <AssemblyName>Roslyn.VisualStudio.Setup.Next</AssemblyName>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <ImportVSSDKTargets>true</ImportVSSDKTargets>
-    <TargetFramework>net46</TargetFramework>
-    <RuntimeIdentifier>$(RoslynDesktopRuntimeIdentifier)</RuntimeIdentifier>
-    <RoslynProjectType>Vsix</RoslynProjectType>
-    <IsProductComponent>true</IsProductComponent>
-    <ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
-    <ExtensionInstallationFolder>Microsoft\ManagedLanguages\VBCSharp\LanguageServicesNext</ExtensionInstallationFolder>
-  </PropertyGroup>
-  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\Setup\VisualStudioSetup.csproj">
-      <Name>VisualStudioSetup</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <ItemGroup>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file

src/VisualStudio/Setup.Next/source.extension.vsixmanifest

-<?xml version="1.0" encoding="utf-8"?>
-<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="58293943-56F1-4734-82FC-0411DCF49DE1" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Microsoft" />
-    <DisplayName>Roslyn Language Services (Local Placeholder)</DisplayName>
-    <Description>C# and VB.NET language services (Local Placeholder).</Description>
-    <PackageId>Microsoft.CodeAnalysis.VisualStudio.Setup.Next</PackageId>
-  </Metadata>
-  <Installation Experimental="true">
-    <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.Pro" />
-    <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
-    <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.VWDExpress" />
-    <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.VSWinExpress" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
-    <Dependency Version="[|VisualStudioSetup;GetBuildVersion|,]" DisplayName="Roslyn Language Services" Id="0b5e8ddb-f12d-4131-a71d-77acc26a798f" />
-  </Dependencies>
-  <Assets>
-    <!-- This VSIX now contains no contents, but is a placeholder to ensure that F5 locally works by preventing loads from the base-installed
-         extension. The actual contents are all in VisualStudioSetup -->
-  </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-  </Prerequisites>
-</PackageManifest>

src/Workspaces/Remote/ServiceHub/Services/RemoteHostService.cs

@@ -284,7 +284,7 @@ private static void SetNativeDllSearchDirectories()
                 // Set LoadLibrary search directory to %VSINSTALLDIR%\Common7\IDE so that the compiler
                 // can P/Invoke to Microsoft.DiaSymReader.Native when emitting Windows PDBs.
                 //
-                // The AppDomain base directory is specified in VisualStudio\Setup.Next\codeAnalysisService.servicehub.service.json
+                // The AppDomain base directory is specified in VisualStudio\Setup\codeAnalysisService.servicehub.service.json
                 // to be the directory where devenv.exe is -- which is exactly the directory we need to add to the search paths:
                 //
                 //   "appBasePath": "%VSAPPIDDIR%"