Skip to content

Commit b4591f3

Browse files
authored
Merge pull request #7651 from dibarbet/require_8_0_10_runtime
Require at least version 8.0.10 of the .net runtime
2 parents 8c32259 + 52c0fcb commit b4591f3

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

azure-pipelines/prereqs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ steps:
1717
# So we avoid installing .NET in those cases.
1818
- ${{ if eq(parameters.installDotNet, true) }}:
1919
- task: UseDotNet@2
20-
displayName: 'Install .NET Core SDKs'
20+
displayName: 'Install .NET SDK'
2121
inputs:
22-
version: '8.x'
22+
version: '8.0.403'
2323

2424
- script: dotnet --info
2525
displayName: Display dotnet info

azure-pipelines/test-matrix.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
steps:
2525
- template: /azure-pipelines/test.yml@self
2626
parameters:
27-
# Prefer the dotnet from the container.
28-
installDotNet: false
27+
installDotNet: true
2928
installAdditionalLinuxDependencies: true
3029
npmCommand: $(npmCommand)

src/lsptoolshost/dotnetRuntimeExtensionResolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
1616
import { readFile } from 'fs/promises';
1717
import { RuntimeInfo } from '../shared/utils/dotnetInfo';
1818

19-
export const DotNetRuntimeVersion = '8.0';
19+
export const DotNetRuntimeVersion = '8.0.10';
2020

2121
interface IDotnetAcquireResult {
2222
dotnetPath: string;
@@ -166,7 +166,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
166166
}
167167

168168
// Verify that the dotnet we found includes a runtime version that is compatible with our requirement.
169-
const requiredRuntimeVersion = semver.parse(`${DotNetRuntimeVersion}.0`);
169+
const requiredRuntimeVersion = semver.parse(`${DotNetRuntimeVersion}`);
170170
if (!requiredRuntimeVersion) {
171171
throw new Error(`Unable to parse minimum required version ${DotNetRuntimeVersion}`);
172172
}

0 commit comments

Comments
 (0)