From ef144be4d502978f7c4f5d81b05a712c216afc2c Mon Sep 17 00:00:00 2001 From: Jason Malinowski Date: Fri, 23 Mar 2018 15:51:50 -0700 Subject: [PATCH] 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 | 7 ---- build/config/SignToolData.json | 1 - build/scripts/build.ps1 | 1 - ...ding, Debugging, and Testing on Windows.md | 11 ++---- .../BuildDevDivInsertionFiles.vb | 3 +- ...ft.CodeAnalysis.LanguageServices.vsmanproj | 1 - src/Test/Perf/Utilities/VsPerfTest.cs | 6 +-- src/Tools/MicroBuild/microbuild.ps1 | 2 - .../Setup.Next/Properties/launchSettings.json | 8 ---- .../Setup.Next/VisualStudioSetup.Next.csproj | 37 ------------------- .../Setup.Next/source.extension.vsixmanifest | 26 ------------- .../ServiceHub/Services/RemoteHostService.cs | 2 +- 12 files changed, 7 insertions(+), 98 deletions(-) delete mode 100644 src/VisualStudio/Setup.Next/Properties/launchSettings.json delete mode 100644 src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj delete mode 100644 src/VisualStudio/Setup.Next/source.extension.vsixmanifest diff --git a/Roslyn.sln b/Roslyn.sln index be244dcfde5..e25ae2d2b82 100644 --- a/Roslyn.sln +++ b/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} diff --git a/build/config/SignToolData.json b/build/config/SignToolData.json index e4ea966a1a8..ce94acf0762 100644 --- a/build/config/SignToolData.json +++ b/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" diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1 index da5945bfe47..6300086c4a9 100644 --- a/build/scripts/build.ps1 +++ b/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", diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md index 7667a6df90d..4d37a7dc5d3 100644 --- a/docs/contributing/Building, Debugging, and Testing on Windows.md +++ b/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 diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb index 0a1abb9c433..32a3770b453 100644 --- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb +++ b/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. diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj index bbf0554d49f..36f7d27f327 100644 --- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj +++ b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj @@ -21,7 +21,6 @@ - diff --git a/src/Test/Perf/Utilities/VsPerfTest.cs b/src/Test/Perf/Utilities/VsPerfTest.cs index 08860a391a0..62483758685 100644 --- a/src/Test/Perf/Utilities/VsPerfTest.cs +++ b/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() diff --git a/src/Tools/MicroBuild/microbuild.ps1 b/src/Tools/MicroBuild/microbuild.ps1 index e8e33efeaa9..fd8f63a80b4 100644 --- a/src/Tools/MicroBuild/microbuild.ps1 +++ b/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", diff --git a/src/VisualStudio/Setup.Next/Properties/launchSettings.json b/src/VisualStudio/Setup.Next/Properties/launchSettings.json deleted file mode 100644 index 18304085693..00000000000 --- a/src/VisualStudio/Setup.Next/Properties/launchSettings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "profiles": { - "Visual Studio Extension": { - "executablePath": "$(DevEnvDir)devenv.exe", - "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log" - } - } -} diff --git a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj deleted file mode 100644 index 116c3e75694..00000000000 --- a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - - AnyCPU - AnyCPU - Library - Roslyn.VisualStudio.Setup.Next - Roslyn.VisualStudio.Setup.Next - false - RoslynDev - false - false - false - true - net46 - $(RoslynDesktopRuntimeIdentifier) - Vsix - true - CommonExtensions - Microsoft\ManagedLanguages\VBCSharp\LanguageServicesNext - - - - VisualStudioSetup - false - False - - - - - - - Designer - - - \ No newline at end of file diff --git a/src/VisualStudio/Setup.Next/source.extension.vsixmanifest b/src/VisualStudio/Setup.Next/source.extension.vsixmanifest deleted file mode 100644 index 7db1f8bad45..00000000000 --- a/src/VisualStudio/Setup.Next/source.extension.vsixmanifest +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Roslyn Language Services (Local Placeholder) - C# and VB.NET language services (Local Placeholder). - Microsoft.CodeAnalysis.VisualStudio.Setup.Next - - - - - - - - - - - - - - - - - - diff --git a/src/Workspaces/Remote/ServiceHub/Services/RemoteHostService.cs b/src/Workspaces/Remote/ServiceHub/Services/RemoteHostService.cs index 69130e99533..073112aa1b3 100644 --- a/src/Workspaces/Remote/ServiceHub/Services/RemoteHostService.cs +++ b/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%" -- GitLab