From b2526a89e488589a3d6fcaf5e76bf5dd2a5235ab Mon Sep 17 00:00:00 2001 From: David Barbet Date: Wed, 9 Oct 2024 13:53:33 -0700 Subject: [PATCH 1/2] Require at least version 8.0.10 of the .net runtime --- src/lsptoolshost/dotnetRuntimeExtensionResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts b/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts index 2198309088..5c458d22c6 100644 --- a/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts +++ b/src/lsptoolshost/dotnetRuntimeExtensionResolver.ts @@ -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; @@ -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}`); } From 52c0fcba731f8cef2028834928e1f54db3563974 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Thu, 10 Oct 2024 12:32:55 -0700 Subject: [PATCH 2/2] Ensure tests use 8.0.10 runtime --- azure-pipelines/prereqs.yml | 4 ++-- azure-pipelines/test-matrix.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/azure-pipelines/prereqs.yml b/azure-pipelines/prereqs.yml index 09285359e3..3fd02fba33 100644 --- a/azure-pipelines/prereqs.yml +++ b/azure-pipelines/prereqs.yml @@ -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 diff --git a/azure-pipelines/test-matrix.yml b/azure-pipelines/test-matrix.yml index dacf360ff8..20cd7fb5b2 100644 --- a/azure-pipelines/test-matrix.yml +++ b/azure-pipelines/test-matrix.yml @@ -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) \ No newline at end of file