[automated] Merge branch 'main' => 'prerelease' (#8139)

Author: dotnet-policy-service[bot]

CHANGELOG.md

@@ -3,6 +3,13 @@
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
+# 2.73.x
+* Bump Roslyn to 5.0.0-1.25204.1 (PR: [#8138](https://github.com/dotnet/vscode-csharp/pull/8138))
+  * [View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/1a06295e3cd3e57be2c79953f16db724db119a4f...ad1c386da419e0d6fe9f25a1f41e5cc2368964e7?w=1)
+* Don't show duplicate toast if C# Dev Kit fails to activate (PR: [#8135](https://github.com/dotnet/vscode-csharp/pull/8135))
+* Bump xamlTools to 17.14.36004.3 (PR: [#8134](https://github.com/dotnet/vscode-csharp/pull/8134))
+* Acquire aspnetcore runtime when using Dev Kit to avoid double acquisition (PR: [#8132](https://github.com/dotnet/vscode-csharp/pull/8132))
+
 # 2.72.x
 * Revert xamlTools to 17.14.35913.250 (PR: [#8121](https://github.com/dotnet/vscode-csharp/pull/8121))
 * Update Roslyn to 4.14.0-3.25178.1 (PR: [#8103](https://github.com/dotnet/vscode-csharp/pull/8103))

package.json

@@ -37,11 +37,11 @@
     }
   },
   "defaults": {
-    "roslyn": "4.14.0-3.25178.1",
+    "roslyn": "5.0.0-1.25204.1",
     "omniSharp": "1.39.12",
     "razor": "9.0.0-preview.25177.4",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.14.35913.250"
+    "xamlTools": "17.14.36004.3"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",

src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionApi.ts

@@ -24,7 +24,7 @@ export interface IDotnetFindPathContext {
 /**
  * https://github.com/dotnet/vscode-dotnet-runtime/blob/main/vscode-dotnet-runtime-library/src/IDotnetAcquireContext.ts
  */
-interface IDotnetAcquireContext {
+export interface IDotnetAcquireContext {
     version: string;
     requestingExtensionId?: string;
     errorConfiguration?: AcquireErrorConfiguration;
@@ -49,7 +49,7 @@ enum AcquireErrorConfiguration {
 /**
  * https://github.com/dotnet/vscode-dotnet-runtime/blob/main/vscode-dotnet-runtime-library/src/Acquisition/DotnetInstallMode.ts
  */
-type DotnetInstallMode = 'sdk' | 'runtime' | 'aspnetcore';
+export type DotnetInstallMode = 'sdk' | 'runtime' | 'aspnetcore';
 
 /**
  * https://github.com/dotnet/vscode-dotnet-runtime/blob/main/vscode-dotnet-runtime-library/src/DotnetVersionSpecRequirement.ts

src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionResolver.ts

@@ -12,8 +12,14 @@ import { languageServerOptions } from '../../shared/options';
 import { existsSync } from 'fs';
 import { CSharpExtensionId } from '../../constants/csharpExtensionId';
 import { readFile } from 'fs/promises';
-import { IDotnetAcquireResult, IDotnetFindPathContext } from './dotnetRuntimeExtensionApi';
+import {
+    DotnetInstallMode,
+    IDotnetAcquireContext,
+    IDotnetAcquireResult,
+    IDotnetFindPathContext,
+} from './dotnetRuntimeExtensionApi';
 import { DotNetRuntimeExtensionId } from '../../checkDotNetRuntimeExtensionVersion';
+import { getCSharpDevKit } from '../../utils/getCSharpDevKit';
 
 const DotNetMajorVersion = '9';
 const DotNetMinorVersion = '0';
@@ -41,14 +47,18 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
             return this.hostInfo;
         }
 
+        const usingDevkit = getCSharpDevKit() !== undefined;
+        // If we're using devkit, acquire aspnetcore as well - this avoids two separate acquisitions (devkit requires aspnetcore).
+        const runtimeMode: DotnetInstallMode = usingDevkit ? 'aspnetcore' : 'runtime';
+
         this.channel.appendLine(`Locating .NET runtime version ${DotNetRuntimeVersion}`);
         const extensionArchitecture = (await this.getArchitectureFromTargetPlatform()) ?? process.arch;
         const findPathRequest: IDotnetFindPathContext = {
             acquireContext: {
                 version: DotNetRuntimeVersion,
                 requestingExtensionId: CSharpExtensionId,
                 architecture: extensionArchitecture,
-                mode: 'runtime',
+                mode: runtimeMode,
             },
             versionSpecRequirement: 'greater_than_or_equal',
             // Reject previews because we are not setting `DOTNET_ROLL_FORWARD_TO_PRERELEASE` when starting the server.
@@ -62,7 +72,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
             this.channel.appendLine(
                 `Did not find .NET ${DotNetRuntimeVersion} on path, falling back to acquire runtime via ${DotNetRuntimeExtensionId}`
             );
-            acquireResult = await this.acquireDotNetProcessDependencies();
+            acquireResult = await this.acquireDotNetProcessDependencies(runtimeMode);
         }
 
         const dotnetExecutablePath = acquireResult.dotnetPath;
@@ -103,21 +113,22 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
      * Acquires the .NET runtime if it is not already present.
      * @returns The path to the .NET runtime
      */
-    private async acquireRuntime(): Promise<IDotnetAcquireResult> {
+    private async acquireRuntime(mode: DotnetInstallMode): Promise<IDotnetAcquireResult> {
         // The runtime extension doesn't support specifying a patch versions in the acquire API, so we only use major.minor here.
         // That is generally OK, as acquisition will always acquire the latest patch version.
         const dotnetAcquireVersion = `${DotNetMajorVersion}.${DotNetMinorVersion}`;
-        let status = await vscode.commands.executeCommand<IDotnetAcquireResult>('dotnet.acquireStatus', {
+
+        const acquireContext: IDotnetAcquireContext = {
             version: dotnetAcquireVersion,
             requestingExtensionId: CSharpExtensionId,
-        });
+            mode: mode,
+        };
+
+        let status = await vscode.commands.executeCommand<IDotnetAcquireResult>('dotnet.acquireStatus', acquireContext);
         if (status === undefined) {
             await vscode.commands.executeCommand('dotnet.showAcquisitionLog');
 
-            status = await vscode.commands.executeCommand<IDotnetAcquireResult>('dotnet.acquire', {
-                version: dotnetAcquireVersion,
-                requestingExtensionId: CSharpExtensionId,
-            });
+            status = await vscode.commands.executeCommand<IDotnetAcquireResult>('dotnet.acquire', acquireContext);
             if (!status) {
                 throw new Error('Could not resolve the dotnet path!');
             }
@@ -130,8 +141,8 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
      * Acquires the .NET runtime and any other dependencies required to spawn a particular .NET executable.
      * @param path The path to the entrypoint assembly. Typically a .dll.
      */
-    private async acquireDotNetProcessDependencies(): Promise<IDotnetAcquireResult> {
-        const acquireResult = await this.acquireRuntime();
+    private async acquireDotNetProcessDependencies(mode: DotnetInstallMode): Promise<IDotnetAcquireResult> {
+        const acquireResult = await this.acquireRuntime(mode);
 
         const args = [this.getServerPath(this.platformInfo)];
         // This will install any missing Linux dependencies.

test/lsptoolshost/integrationTests/formatting.integration.test.ts

@@ -39,6 +39,7 @@ describe(`Formatting Tests`, () => {
             'using Options;',
             'using System;',
             'namespace Formatting;',
+            '',
             'class DocumentFormatting',
             '{',
             '    public int Property1',
@@ -108,6 +109,7 @@ describe(`Formatting Tests`, () => {
             'using System;',
             'using Options;',
             'namespace Formatting;',
+            '',
             'class DocumentFormatting',
             '{',
             '    public int Property1',
@@ -134,6 +136,7 @@ describe(`Formatting Tests`, () => {
             'using Options;',
             'using System;',
             'namespace Formatting;',
+            '',
             'class DocumentFormatting',
             '{',
             '    public int Property1',

test/lsptoolshost/integrationTests/formattingEditorConfig.integration.test.ts

@@ -39,6 +39,7 @@ describe(`Formatting With EditorConfig Tests`, () => {
 
         const expectedText = [
             'namespace Formatting;',
+            '',
             'class DocumentFormattingWithEditorConfig {',
             '    public int Property1 {',
             '        get; set;',

version.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.72",
+    "version": "2.73",
     "publicReleaseRefSpec": [
         "^refs/heads/release$",
         "^refs/heads/prerelease$",