Skip to content

Commit 9bb8c50

Browse files
Remove cohosting setting and hardcode the value to true (#8810)
2 parents 0abf259 + 4a60675 commit 9bb8c50

File tree

149 files changed

+120
-6867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+120
-6867
lines changed

.vscode/launch.json

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -97,33 +97,6 @@
9797
"preLaunchTask": "packageDev",
9898
"internalConsoleOptions": "openOnSessionStart"
9999
},
100-
{
101-
"name": "[Razor] Run Current File Integration Test",
102-
"type": "extensionHost",
103-
"request": "launch",
104-
"runtimeExecutable": "${execPath}",
105-
"args": [
106-
// Launch VSCode using a specific profile to ensure that user settings are not used.
107-
// This profile must be imported into vscode before running this launch configuration.
108-
// The profile can be found under /test/csharp-test-profile.
109-
"--profile",
110-
"csharp-test-profile",
111-
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/devkit_RazorApp.code-workspace",
112-
"--extensionDevelopmentPath=${workspaceRoot}",
113-
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
114-
"--log",
115-
"ms-dotnettools.csharp:trace"
116-
],
117-
"env": {
118-
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
119-
"TEST_FILE_FILTER": "${file}"
120-
},
121-
"sourceMaps": true,
122-
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
123-
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
124-
"preLaunchTask": "packageDev",
125-
"internalConsoleOptions": "openOnSessionStart"
126-
},
127100
{
128101
"name": "[Razor Cohost] Run Current File Integration Test",
129102
"type": "extensionHost",
@@ -248,15 +221,6 @@
248221
"args": ["generateOptionsSchema"],
249222
"cwd": "${workspaceFolder}"
250223
},
251-
{
252-
"type": "node",
253-
"request": "launch",
254-
"name": "Razor integration tests",
255-
"preLaunchTask": "build",
256-
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
257-
"args": ["test:integration:razor"],
258-
"cwd": "${workspaceFolder}"
259-
},
260224
{
261225
"type": "node",
262226
"request": "launch",

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
# 2.103.x
77
* Fix indentation after pressing Enter in Razor files (PR: [#8809](https://github.com/dotnet/vscode-csharp/pull/8809))
8+
* Remove non-cohosting editor code (PR: [#8810](https://github.com/dotnet/vscode-csharp/pull/8810))
89

910
# 2.102.x
1011
* Update Roslyn to 5.3.0-2.25568.9 (PR: [#8799](https://github.com/dotnet/vscode-csharp/pull/8799))

l10n/bundle.l10n.json

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,9 @@
6767
"Replace existing build and debug assets?": "Replace existing build and debug assets?",
6868
"Could not locate .NET Core project in '{0}'. Assets were not generated.": "Could not locate .NET Core project in '{0}'. Assets were not generated.",
6969
"Unable to generate assets to build and debug. {0}.": "Unable to generate assets to build and debug. {0}.",
70-
"Cannot load Razor language server because the directory was not found: '{0}'": "Cannot load Razor language server because the directory was not found: '{0}'",
70+
"Cannot load Razor OmniSharp language server because the directory was not found: '{0}'": "Cannot load Razor OmniSharp language server because the directory was not found: '{0}'",
7171
"Razor Log": "Razor Log",
7272
"Could not find '{0}' in or above '{1}'.": "Could not find '{0}' in or above '{1}'.",
73-
"Could not find Razor Language Server executable '{0}' within directory": "Could not find Razor Language Server executable '{0}' within directory",
74-
"Server failed to start after retrying 5 times.": "Server failed to start after retrying 5 times.",
75-
"Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.",
76-
"Tried to send requests while server is not started.": "Tried to send requests while server is not started.",
77-
"Tried to bind on request logic while server is not started.": "Tried to bind on request logic while server is not started.",
78-
"Tried to bind on notification logic while server is not started.": "Tried to bind on notification logic while server is not started.",
79-
"Cannot stop Razor Language Server as it is already stopped.": "Cannot stop Razor Language Server as it is already stopped.",
80-
"Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.",
81-
"Razor HTML Preview": "Razor HTML Preview",
82-
"Unexpected error when attaching to HTML preview window.": "Unexpected error when attaching to HTML preview window.",
83-
"Razor HTML copied to clipboard": "Razor HTML copied to clipboard",
84-
"Report a Razor issue": "Report a Razor issue",
85-
"Host document file path": "Host document file path",
86-
"Virtual document file path": "Virtual document file path",
87-
"Copy Html": "Copy Html",
88-
"Token cancellation requested: {0}": "Token cancellation requested: {0}",
89-
"Synchronization timed out": "Synchronization timed out",
9073
"Report Razor Issue": "Report Razor Issue",
9174
"Unexpected error when attaching to report Razor issue window.": "Unexpected error when attaching to report Razor issue window.",
9275
"You must first start the data collection before copying.": "You must first start the data collection before copying.",
@@ -104,6 +87,7 @@
10487
"Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.": "Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.",
10588
"Copy issue content again": "Copy issue content again",
10689
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
90+
"Report a Razor issue": "Report a Razor issue",
10791
"Non Razor file as active document": "Non Razor file as active document",
10892
"Could not determine CSharp content": "Could not determine CSharp content",
10993
"Could not determine Html content": "Could not determine Html content",
@@ -128,20 +112,10 @@
128112
"Razor.VSCode version": "Razor.VSCode version",
129113
"VSCode version": "VSCode version",
130114
"Extensions": "Extensions",
131-
"Projected CSharp as seen by extension": "Projected CSharp as seen by extension",
132-
"Unable to resolve VSCode's version of CSharp": "Unable to resolve VSCode's version of CSharp",
133-
"Projected Html as seen by extension": "Projected Html as seen by extension",
134-
"Unable to resolve VSCode's version of Html": "Unable to resolve VSCode's version of Html",
135115
"Unable to find Razor extension version.": "Unable to find Razor extension version.",
136116
"Extension": "Extension",
137117
"Author": "Author",
138118
"Version": "Version",
139-
"Razor C# Preview": "Razor C# Preview",
140-
"Unexpected error when attaching to C# preview window.": "Unexpected error when attaching to C# preview window.",
141-
"Razor C# copied to clipboard": "Razor C# copied to clipboard",
142-
"Copy C#": "Copy C#",
143-
"1 reference": "1 reference",
144-
"{0} references": "{0} references",
145119
"Run and Debug: auto-detection found {0} for a launch browser": "Run and Debug: auto-detection found {0} for a launch browser",
146120
"There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.": "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.",
147121
"View Debug Docs": "View Debug Docs",

package.json

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
"compile:razorTextMate": "npx js-yaml src/razor/syntaxes/aspnetcorerazor.tmLanguage.yml > src/razor/syntaxes/aspnetcorerazor.tmLanguage.json",
7373
"test:unit": "npm run compileDev && gulp test:unit",
7474
"test:integration:csharp": "npm run packageDev && gulp test:integration:csharp",
75-
"test:integration:razor": "npm run packageDev && gulp test:integration:razor",
7675
"test:integration:razor:cohost": "npm run packageDev && gulp test:integration:razor:cohost",
7776
"test:integration:devkit": "npm run packageDev && gulp test:integration:devkit",
7877
"test:integration:untrusted": "npm run packageDev && gulp test:integration:untrusted",
@@ -1447,10 +1446,6 @@
14471446
"razorExtension": {
14481447
"description": "%configuration.dotnet.server.componentPaths.razorExtension%",
14491448
"type": "string"
1450-
},
1451-
"razorDevKit": {
1452-
"description": "%configuration.dotnet.server.componentPaths.razorDevKit%",
1453-
"type": "string"
14541449
}
14551450
},
14561451
"default": {}
@@ -1542,14 +1537,6 @@
15421537
"type": "boolean",
15431538
"default": true,
15441539
"description": "%configuration.razor.languageServer.suppressLspErrorToasts%"
1545-
},
1546-
"razor.languageServer.cohostingEnabled": {
1547-
"type": "boolean",
1548-
"default": true,
1549-
"description": "%configuration.razor.languageServer.cohostingEnabled%",
1550-
"tags": [
1551-
"experimental"
1552-
]
15531540
}
15541541
}
15551542
},

package.nls.cs.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"configuration.dotnet.projects.enableFileBasedPrograms": "Umožňuje využívat prostředí „programů založených na souborech“ (dotnet run app.cs) ve verzi Preview.",
6666
"configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Zobrazit informace o poznámkách při zobrazení symbolu.",
6767
"configuration.dotnet.server.componentPaths": "Umožňuje přepsat cestu ke složce pro integrované komponenty jazykového serveru (například přepsat cestu .roslynDevKit v adresáři rozšíření tak, aby používala místně sestavené komponenty).",
68-
"configuration.dotnet.server.componentPaths.razorDevKit": "Přepíše cestu ke složce pro komponentu Razor Dev Kit jazykového serveru",
6968
"configuration.dotnet.server.componentPaths.razorExtension": "Přepíše cestu ke složce pro komponentu rozšíření Razor jazykového serveru",
7069
"configuration.dotnet.server.componentPaths.roslynCopilot": "Přepíše cestu ke složce pro komponentu .roslynCopilot jazykového serveru.",
7170
"configuration.dotnet.server.componentPaths.roslynDevKit": "Přepíše cestu ke složce pro komponentu .roslynDevKit jazykového serveru.",
@@ -125,7 +124,6 @@
125124
"configuration.omnisharp.useEditorFormattingSettings": "Určuje, jestli má server OmniSharp používat nastavení editoru VS Code pro formátování kódu C# (použití tabulátorů, velikost odsazení).",
126125
"configuration.omnisharp.useModernNet.description": "Použijte build serveru OmniSharp pro .NET 6. Tato verze _nepodporuje_ projekty .NET Framework, které nejsou ve stylu sady SDK, včetně Unity. U projektů Framework, .NET Core a .NET 5+, které jsou ve stylu sady SDK, byste měli zaznamenat výrazné zlepšení výkonu.",
127126
"configuration.omnisharp.useModernNet.title": "Použít build serveru OmniSharp pro .NET 6",
128-
"configuration.razor.languageServer.cohostingEnabled": "Povolte společné hostování Razor.",
129127
"configuration.razor.languageServer.debug": "Určuje, jestli se má při spouštění jazykového serveru čekat na připojení ladění.",
130128
"configuration.razor.languageServer.directory": "Přepíše cestu k adresáři jazykového serveru Razor.",
131129
"configuration.razor.languageServer.suppressLspErrorToasts": "Potlačí zobrazování informačních zpráv o chybách, pokud na serveru dojde k chybě, ze které se dá zotavit.",
@@ -261,4 +259,4 @@
261259
"generateOptionsSchema.targetOutputLogPath.description": "Při nastavení této možnosti se text, který cílová aplikace zapisuje do stdout a stderr (např. Console.WriteLine), uloží do zadaného souboru. Tato možnost se bude ignorovat, pokud je konzola nastavená na jinou hodnotu než internalConsole. Příklad: ${workspaceFolder}/out.txt",
262260
"generateOptionsSchema.type.markdownDescription": "Typ kódu, který se má ladit. Může to být buď coreclr pro ladění .NET Core, nebo cclr pro Desktop .NET Framework. clr funguje pouze v systému Windows, protože Desktop Framework je určen pouze pro Windows.",
263261
"viewsWelcome.debug.contents": "[Generování prostředků jazyka C# pro sestavení a ladění](command:dotnet.generateAssets)\r\n\r\nDalší informace o souboru launch.json najdete v tématu [Konfigurace souboru launch.json pro ladění v jazyce C#](https://aka.ms/VSCode-CS-LaunchJson)."
264-
}
262+
}

package.nls.de.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"configuration.dotnet.projects.enableFileBasedPrograms": "Aktiviert die Vorschau für die Erfahrung „dateibasierte Programme“ (dotnet run app.cs).",
6666
"configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Beschreibungsinformationen beim Anzeigen des Symbols anzeigen.",
6767
"configuration.dotnet.server.componentPaths": "Ermöglicht das Überschreiben des Ordnerpfads für eingebaute Komponenten des Sprachservers (z. B. Überschreiben des Pfads .roslynDevKit im Erweiterungsverzeichnis, um lokal erstellte Komponenten zu verwenden)",
68-
"configuration.dotnet.server.componentPaths.razorDevKit": "Überschreibt den Ordnerpfad für die Razor-Dev-Kit-Komponente des Sprachservers",
6968
"configuration.dotnet.server.componentPaths.razorExtension": "Überschreibt den Ordnerpfad für die Razor-Erweiterungskomponente des Sprachservers",
7069
"configuration.dotnet.server.componentPaths.roslynCopilot": "Überschreibt den Ordnerpfad für die .roslynCopilot-Komponente des Sprachservers",
7170
"configuration.dotnet.server.componentPaths.roslynDevKit": "Überschreibt den Ordnerpfad für die Komponente .roslynDevKit des Sprachservers",
@@ -125,7 +124,6 @@
125124
"configuration.omnisharp.useEditorFormattingSettings": "Gibt an, ob OmniSharp VS Code-Editoreinstellungen für C#-Codeformatierung verwenden soll (Verwendung von Registerkarten, Einzugsgröße).",
126125
"configuration.omnisharp.useModernNet.description": "Verwenden Sie den OmniSharp-Build für .NET 6. Diese Version unterstützt _keine_ .NET Framework-Projekte, die nicht im SDK-Stil vorliegen, einschließlich Unity. Framework-Projekte im SDK-Stil, .NET Core- und .NET 5+-Projekte sollten erhebliche Leistungsverbesserungen aufweisen.",
127126
"configuration.omnisharp.useModernNet.title": ".NET 6-Build von OmniSharp verwenden",
128-
"configuration.razor.languageServer.cohostingEnabled": "Razor-Cohosting aktivieren.",
129127
"configuration.razor.languageServer.debug": "Gibt an, ob beim Starten des Sprachservers auf die Debuganfügung gewartet werden soll.",
130128
"configuration.razor.languageServer.directory": "Überschreibt den Pfad zum Razor-Sprachserver-Verzeichnis.",
131129
"configuration.razor.languageServer.suppressLspErrorToasts": "Unterdrückt, dass Fehler-Popups angezeigt werden, wenn auf dem Server ein wiederherstellbarer Fehler auftritt.",
@@ -261,4 +259,4 @@
261259
"generateOptionsSchema.targetOutputLogPath.description": "Bei Festlegung wird Text, den die Zielanwendung in \"stdout\" und \"stderr\" (z. B. Console.WriteLine) schreibt, in der angegebenen Datei gespeichert. Diese Option wird ignoriert, wenn die Konsole auf einen anderen Wert als internalConsole festgelegt ist. Beispiel: \"${workspaceFolder}/out.txt\"",
262260
"generateOptionsSchema.type.markdownDescription": "Geben Sie den Typ des zu debuggenden Codes ein. Dies kann `coreclr` für das .NET Core-Debugging oder `clr` für Desktop .NET Framework sein. `clr` funktioniert nur für Windows, da das Desktopframework nur Windows ist.",
263261
"viewsWelcome.debug.contents": "[C#-Objekte für Build und Debuggen generieren](command:dotnet.generateAssets)\r\n\r\nWeitere Informationen zu launch.json finden Sie unter [Konfigurieren von launch.json für das C#-Debuggen](https://aka.ms/VSCode-CS-LaunchJson)."
264-
}
262+
}

package.nls.es.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"configuration.dotnet.projects.enableFileBasedPrograms": "Habilita la experiencia de vista previa de \"programas basados en archivos\" (dotnet run app.cs).",
6666
"configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Mostrar información de comentarios cuando se muestra el símbolo.",
6767
"configuration.dotnet.server.componentPaths": "Permite invalidar la ruta de acceso de carpeta para los componentes integrados del servidor de lenguaje (por ejemplo, invalidar la ruta de acceso .roslynDevKit en el directorio de extensión para usar componentes compilados localmente).",
68-
"configuration.dotnet.server.componentPaths.razorDevKit": "Invalida la ruta de acceso de la carpeta para el componente Razor Dev Kit del servidor de lenguaje",
6968
"configuration.dotnet.server.componentPaths.razorExtension": "Invalida la ruta de acceso de la carpeta para el componente de extensión Razor del servidor de lenguaje",
7069
"configuration.dotnet.server.componentPaths.roslynCopilot": "Invalida la ruta de acceso de la carpeta para el componente .roslynCopilot del servidor de lenguaje",
7170
"configuration.dotnet.server.componentPaths.roslynDevKit": "Invalida la ruta de acceso de la carpeta para el componente .roslynDevKit del servidor de lenguaje.",
@@ -125,7 +124,6 @@
125124
"configuration.omnisharp.useEditorFormattingSettings": "Especifica si OmniSharp debe usar la configuración VS Code del editor para el formato de código de C# (uso de tabulaciones, tamaño de sangría).",
126125
"configuration.omnisharp.useModernNet.description": "Use la compilación de OmniSharp para .NET 6. Esta versión no admite proyectos de .NET Framework que no sean de tipo SDK, incluido Unity. Los proyectos framework de estilo SDK, .NET Core y .NET 5+ deben ver mejoras significativas en el rendimiento.",
127126
"configuration.omnisharp.useModernNet.title": "Usar la compilación de .NET 6 de OmniSharp",
128-
"configuration.razor.languageServer.cohostingEnabled": "Habilite el cohospedaje de Razor.",
129127
"configuration.razor.languageServer.debug": "Especifica si se debe esperar a que se adjunte la depuración al iniciar el servidor de lenguaje.",
130128
"configuration.razor.languageServer.directory": "Invalida la ruta de acceso al directorio del servidor de lenguaje Razor.",
131129
"configuration.razor.languageServer.suppressLspErrorToasts": "Suprime la visualización de notificaciones del sistema de error si el servidor encuentra un error recuperable.",
@@ -261,4 +259,4 @@
261259
"generateOptionsSchema.targetOutputLogPath.description": "Cuando se establece, el texto que la aplicación de destino escribe en stdout y stderr (por ejemplo, Console.WriteLine) se guardará en el archivo especificado. Esta opción se omite si la consola se establece en un valor distinto de internalConsole. Por ejemplo, \"${workspaceFolder}/out.txt\"",
262260
"generateOptionsSchema.type.markdownDescription": "Escriba el tipo de código que se va a depurar. Puede ser \"coreclr\" para la depuración de .NET Core o \"clr\" para desktop .NET Framework. \"clr\" solo funciona en Windows, ya que el marco de trabajo de escritorio es solo de Windows.",
263261
"viewsWelcome.debug.contents": "[Generar recursos de C# para compilación y depuración](command:dotnet.generateAssets)\r\n\r\nPara obtener más información sobre launch.json, consulte [Configuración de launch.json para la depuración de C#](https://aka.ms/VSCode-CS-LaunchJson)."
264-
}
262+
}

0 commit comments

Comments
 (0)