Skip to content

Commit 0e04a04

Browse files
author
Loïc Mangeonjean
committed
feat: update to VSCode 1.124.0
1 parent 4bef130 commit 0e04a04

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
},
3232
"config": {
3333
"vscode": {
34-
"version": "1.124.0",
35-
"ref": "1.124.0",
36-
"commit": "1b50d58d73426c9171299ec4037d01365d995b78"
34+
"version": "1.124.2",
35+
"ref": "1.124.2",
36+
"commit": "6928394f91b684055b873eecb8bc281365131f1c"
3737
},
3838
"monaco": {
3939
"ref": "v0.55.1",

vscode-patches/0022-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ to be able to register the file before
1010
1 file changed, 60 insertions(+), 48 deletions(-)
1111

1212
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
13-
index 13453678183..c392afc7f7e 100644
13+
index 82fce39afed..e5ecaf1a6be 100644
1414
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
1515
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
16-
@@ -3,77 +3,89 @@
16+
@@ -3,78 +3,90 @@
1717
* Licensed under the MIT License. See License.txt in the project root for license information.
1818
*--------------------------------------------------------------------------------------------*/
1919

@@ -42,7 +42,7 @@ index 13453678183..c392afc7f7e 100644
4242
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
4343
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
4444
+import { IDialogService, IFileDialogService, IPromptButton } from '../../../../platform/dialogs/common/dialogs.js';
45-
+import { ExtensionGalleryResourceType, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
45+
+import { ExtensionGalleryResourceType, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifestService, ExtensionGalleryServiceUrlConfigKey, IExtensionGalleryManifest } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
4646
import {
4747
- IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions,
4848
- InstallExtensionEvent, DidUninstallExtensionEvent, InstallOperation, WEB_EXTENSION_TAG, InstallExtensionResult,
@@ -142,8 +142,9 @@ index 13453678183..c392afc7f7e 100644
142142
import { IViewsService } from '../../../services/views/common/viewsService.js';
143143
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
144144
-import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
145-
-import { ExtensionGalleryResourceType, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
145+
-import { ExtensionGalleryResourceType, ExtensionGalleryServiceUrlConfigKey, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
146146
-import { fromNow } from '../../../../base/common/date.js';
147+
import { hash } from '../../../../base/common/hash.js';
147148
-import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
148149
+import { ShowCurrentReleaseNotesActionId } from '../../update/common/update.js';
149150
+import { AutoCheckUpdatesConfigurationKey, AutoRestartConfigurationKey, AutoUpdateConfigurationKey, AutoUpdateConfigurationValue, ExtensionRuntimeActionType, ExtensionRuntimeState, ExtensionState, HasOutdatedExtensionsContext, IExtension, IExtensionsNotification, IExtensionsViewPaneContainer, IExtensionsWorkbenchService, InstallExtensionOptions, VIEWLET_ID } from '../common/extensions.js';

vscode-patches/0083-fix-make-product-field-optional.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ index 195e57481c6..2d26f00b061 100644
122122
additionalMessage = defaultAgent?.metadata.additionalWelcomeMessage;
123123
}
124124
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
125-
index c392afc7f7e..dc13df8b2af 100644
125+
index e5ecaf1a6be..2502b8a9da9 100644
126126
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
127127
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
128-
@@ -2833,7 +2833,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
128+
@@ -2872,7 +2872,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
129129
}
130130

131131
const extensionsToUninstall: UninstallExtensionInfo[] = [{ extension: extension.local }];
@@ -135,7 +135,7 @@ index c392afc7f7e..dc13df8b2af 100644
135135
if (packExtension.local && !extensionsToUninstall.some(e => areSameExtensions(e.extension.identifier, packExtension.identifier))) {
136136
extensionsToUninstall.push({ extension: packExtension.local });
137137
diff --git a/src/vs/workbench/services/accounts/browser/defaultAccount.ts b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
138-
index d65c2fb81b7..15ccf0c0361 100644
138+
index 8f4e86487df..0c03912111d 100644
139139
--- a/src/vs/workbench/services/accounts/browser/defaultAccount.ts
140140
+++ b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
141141
@@ -136,14 +136,16 @@ export class DefaultAccountService extends Disposable implements IDefaultAccount
@@ -168,7 +168,7 @@ index d65c2fb81b7..15ccf0c0361 100644
168168
return {
169169
...this.defaultAccountConfig.authenticationProvider.default,
170170
enterprise: false
171-
@@ -1125,8 +1131,11 @@ class DefaultAccountProviderContribution extends Disposable implements IWorkbenc
171+
@@ -1174,8 +1180,11 @@ class DefaultAccountProviderContribution extends Disposable implements IWorkbenc
172172
@IDefaultAccountService defaultAccountService: IDefaultAccountService,
173173
) {
174174
super();

0 commit comments

Comments
 (0)