Merge remote-tracking branch 'upstream/main' into NoHostingLikeCohosting

Author: davidwengier

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.103.x
+* Fix indentation after pressing Enter in Razor files (PR: [#8809](https://github.com/dotnet/vscode-csharp/pull/8809))
 * Remove non-cohosting editor code (PR: [#8810](https://github.com/dotnet/vscode-csharp/pull/8810))
 
 # 2.102.x

src/lsptoolshost/profiling/profiling.ts

@@ -113,7 +113,7 @@ async function executeDotNetTraceCommand(
         throw new Error(vscode.l10n.t(`Folder for trace file {0} does not exist`, traceFolder));
     }
 
-    const dotnetTraceArgs = `--process-id ${processId} --clreventlevel informational --providers "Microsoft-DotNETCore-SampleProfiler,Microsoft-Windows-DotNETRuntime"`;
+    const dotnetTraceArgs = `--process-id ${processId} --clreventlevel informational --providers "Microsoft-DotNETCore-SampleProfiler,Microsoft-Windows-DotNETRuntime,Microsoft-CodeAnalysis-General:0xFFFFFFFF:5,Microsoft-CodeAnalysis-Workspaces:0xFFFFFFFF:5,RoslynEventSource:0xFFFFFFFF:5"`;
 
     // Show an input box pre-populated with the default dotnet trace arguments
     const userArgs = await vscode.window.showInputBox({

src/lsptoolshost/razor/razorEndpoints.ts

@@ -45,6 +45,7 @@ import { HtmlDocument } from './htmlDocument';
 import { HtmlForwardedRequest } from './htmlForwardedRequest';
 import { BlazorDebugConfigurationProvider } from '../../razor/src/blazorDebug/blazorDebugConfigurationProvider';
 import { ShowGeneratedDocumentCommand } from './showGeneratedDocumentCommand';
+import { RazorLanguageConfiguration } from '../../razor/src/razorLanguageConfiguration';
 
 export function registerRazorEndpoints(
     context: vscode.ExtensionContext,
@@ -62,6 +63,9 @@ export function registerRazorEndpoints(
     context.subscriptions.push(BlazorDebugConfigurationProvider.register(razorLogger, vscode));
     context.subscriptions.push(ShowGeneratedDocumentCommand.register(roslynLanguageServer));
 
+    const languageConfiguration = new RazorLanguageConfiguration();
+    context.subscriptions.push(languageConfiguration.register());
+
     return;
 
     //