Skip to content

Commit 21c65ea

Browse files
committed
Require version of runtime extension with API fix
1 parent 630078f commit 21c65ea

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/lsptoolshost/dotnetRuntimeExtensionResolver.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { commonOptions, languageServerOptions } from '../shared/options';
1212
import { existsSync } from 'fs';
1313
import { CSharpExtensionId } from '../constants/csharpExtensionId';
1414
import { readFile } from 'fs/promises';
15-
import { IDotnetFindPathContext } from './dotnetRuntimeExtensionApi';
15+
import { IDotnetAcquireResult, IDotnetFindPathContext } from './dotnetRuntimeExtensionApi';
1616

1717
export const DotNetRuntimeVersion = '8.0.10';
1818

@@ -49,8 +49,15 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
4949
},
5050
versionSpecRequirement: 'greater_than_or_equal',
5151
};
52-
const result = await vscode.commands.executeCommand<string>('dotnet.findPath', findPathRequest);
53-
dotnetExecutablePath = result;
52+
const result = await vscode.commands.executeCommand<IDotnetAcquireResult | undefined>(
53+
'dotnet.findPath',
54+
findPathRequest
55+
);
56+
if (result === undefined) {
57+
throw new Error('Failed to locate .NET runtime');
58+
}
59+
60+
dotnetExecutablePath = result.dotnetPath;
5461
}
5562

5663
const hostInfo = {

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export async function activate(
8383
}
8484

8585
const dotnetRuntimeExtensionId = 'ms-dotnettools.vscode-dotnet-runtime';
86-
const requiredDotnetRuntimeExtensionVersion = '2.2.1';
86+
const requiredDotnetRuntimeExtensionVersion = '2.2.2';
8787

8888
const dotnetRuntimeExtension = vscode.extensions.getExtension(dotnetRuntimeExtensionId);
8989
const dotnetRuntimeExtensionVersion = dotnetRuntimeExtension?.packageJSON.version;

0 commit comments

Comments
 (0)