This commit is contained in:
Noah Gilson 2024-05-22 14:43:41 -07:00
Родитель f5c8fcf0c7
Коммит 1dfd093758
4 изменённых файлов: 9 добавлений и 5 удалений

Просмотреть файл

@ -5,4 +5,4 @@
export type DotnetInstallMode = 'sdk' | 'runtime' | 'aspnetcore';
export const DotnetInstallModeList = ['sdk', 'runtime', 'aspnetcore'];
export const DOTNET_INSTALL_MODE_LIST = ['sdk', 'runtime', 'aspnetcore'];

Просмотреть файл

@ -249,7 +249,7 @@ Installs: ${[...this.inProgressInstalls].map(x => x.dotnetInstall.installKey).jo
if(preExistingInstallIndex !== -1)
{
let existingInstall = existingVersions.find(x => IsEquivalentInstallation(x.dotnetInstall, install));
const existingInstall = existingVersions.find(x => IsEquivalentInstallation(x.dotnetInstall, install));
// Did this extension already mark itself as having ownership of this install? If so, we can skip re-adding it.
if(!(existingInstall?.installingExtensions.includes(this.context.acquisitionContext?.requestingExtensionId ?? null)))

Просмотреть файл

@ -6,7 +6,7 @@
import { DotnetCoreAcquisitionWorker } from '../Acquisition/DotnetCoreAcquisitionWorker';
import { looksLikeRuntimeVersion } from '../Acquisition/DotnetInstall';
import { DotnetInstall } from '../Acquisition/DotnetInstall';
import { DotnetInstallModeList } from '../Acquisition/DotnetInstallMode';
import { DOTNET_INSTALL_MODE_LIST } from '../Acquisition/DotnetInstallMode';
import { IAcquisitionWorkerContext } from '../Acquisition/IAcquisitionWorkerContext';
import * as os from 'os';
@ -32,7 +32,7 @@ export function getInstallKeyFromContext(ctx : IAcquisitionWorkerContext | undef
}
export function isRuntimeInstallKey(installKey: string): boolean {
const installKeyVersion = getVersionFromLegacyInstallKey(installKey);
return !(DotnetInstallModeList.filter( (x : string) => x !== 'runtime')).some( (mode) => installKey.includes(mode))
return !(DOTNET_INSTALL_MODE_LIST.filter( (x : string) => x !== 'runtime')).some( (mode) => installKey.includes(mode))
&& looksLikeRuntimeVersion(installKeyVersion);
}

Просмотреть файл

@ -13,5 +13,9 @@
"path": "vscode-dotnet-runtime-library"
}
],
"settings": {}
"settings": {
"cSpell.words": [
"DOTNETINSTALLMODELIST"
]
}
}