Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into tyriar/34103_241101

Browse Source
This commit is contained in:
Daniel Imms
2024-11-04 06:14:10 -08:00
committed by GitHub
parent 926cc8c5e5 231d37338a
commit dfb1316350
58 changed files with 856 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/code/electron-main/app.ts
View File

@@ -102,7 +102,7 @@ import { ExtensionsScannerService } from '../../platform/extensionManagement/nod
import { UserDataProfilesHandler } from '../../platform/userDataProfile/electron-main/userDataProfilesHandler.js';
import { ProfileStorageChangesListenerChannel } from '../../platform/userDataProfile/electron-main/userDataProfileStorageIpc.js';
import { Promises, RunOnceScheduler, runWhenGlobalIdle } from '../../base/common/async.js';
import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from '../../platform/telemetry/electron-main/telemetryUtils.js';
import { resolveMachineId, resolveSqmId, resolvedevDeviceId, validatedevDeviceId } from '../../platform/telemetry/electron-main/telemetryUtils.js';
import { ExtensionsProfileScannerService } from '../../platform/extensionManagement/node/extensionsProfileScannerService.js';
import { LoggerChannel } from '../../platform/log/electron-main/logIpc.js';
import { ILoggerMainService } from '../../platform/log/electron-main/loggerService.js';
@@ -1373,6 +1373,9 @@ export class CodeApplication extends Disposable {
if (isMacintosh && app.runningUnderARM64Translation) {
this.windowsMainService?.sendToFocused('vscode:showTranslatedBuildWarning');
}
// Validate Device ID is up to date
validatedevDeviceId(this.stateService, this.logService);
}
private async installMutex(): Promise<void> {