Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require at least version 8.0.10 of the .net runtime #7651

Merged
merged 2 commits into from
Oct 10, 2024
Merged

Require at least version 8.0.10 of the .net runtime #7651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2526a8
Require at least version 8.0.10 of the .net runtime
dibarbet Oct 9, 2024
52c0fcb
Ensure tests use 8.0.10 runtime
dibarbet Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure-pipelines/prereqs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ steps:
# So we avoid installing .NET in those cases.
- ${{ if eq(parameters.installDotNet, true) }}:
- task: UseDotNet@2
displayName: 'Install .NET Core SDKs'
displayName: 'Install .NET SDK'
inputs:
version: '8.x'
version: '8.0.403'

- script: dotnet --info
displayName: Display dotnet info
Expand Down
3 changes: 1 addition & 2 deletions azure-pipelines/test-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
steps:
- template: /azure-pipelines/test.yml@self
parameters:
# Prefer the dotnet from the container.
installDotNet: false
installDotNet: true
installAdditionalLinuxDependencies: true
npmCommand: $(npmCommand)
4 changes: 2 additions & 2 deletions src/lsptoolshost/dotnetRuntimeExtensionResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
import { readFile } from 'fs/promises';
import { RuntimeInfo } from '../shared/utils/dotnetInfo';

export const DotNetRuntimeVersion = '8.0';
export const DotNetRuntimeVersion = '8.0.10';

interface IDotnetAcquireResult {
dotnetPath: string;
Expand Down Expand Up @@ -166,7 +166,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
}

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