Skip to content

Update to VS Code 1.48.2 #2000

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

Merged
merged 1 commit into from
Aug 26, 2020
Merged

Update to VS Code 1.48.2 #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions ci/dev/vscode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ index da4fa3e9d0..50f3e1144f 100644

function processLib() {
diff --git a/package.json b/package.json
index e52e3ff548..2f3b55398b 100644
index 226f51a1ec..5c4e5af5f6 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,11 @@
Expand Down Expand Up @@ -265,9 +265,7 @@ index e52e3ff548..2f3b55398b 100644
+ "resolutions": {
+ "minimist": "^1.2.5"
}
-}
\ No newline at end of file
+}
}
diff --git a/product.json b/product.json
index 2b884d18f3..518b935b83 100644
--- a/product.json
Expand Down
2 changes: 1 addition & 1 deletion lib/vscode
Open in desktop
Submodule vscode updated 19 files
+1 −1 build/gulpfile.vscode.js
+1 −1 build/win32/code.iss
+1 −1 extensions/npm/package.json
+20 −1 extensions/npm/src/features/packageJSONContribution.ts
+1 −6 extensions/npm/src/npmMain.ts
+0 −16 extensions/npm/src/tasks.ts
+3 −3 package.json
+1 −0 src/vs/platform/userDataSync/common/abstractSynchronizer.ts
+9 −5 src/vs/platform/userDataSync/common/keybindingsMerge.ts
+1 −1 src/vs/platform/userDataSync/common/keybindingsSync.ts
+1 −0 src/vs/platform/userDataSync/common/userDataSync.ts
+4 −0 src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
+64 −0 src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
+10 −1 src/vs/workbench/common/memento.ts
+5 −1 src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
+5 −5 src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+1 −1 src/vs/workbench/contrib/webview/browser/pre/main.js
+6 −2 src/vs/workbench/services/textfile/browser/textFileService.ts
+1 −1 src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts