diff --git a/patches/version-0-release.patch b/patches/version-0-release.patch index fb4fe8a..80488c5 100644 --- a/patches/version-0-release.patch +++ b/patches/version-0-release.patch @@ -1,23 +1,23 @@ diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js -index 4f00317..e5d08e5 100644 +index e0df76f..04354d8 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js -@@ -307,2 +307,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -310,2 +310,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const name = product.nameShort; + const release = packageJson.release; -@@ -310,3 +311,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -313,3 +314,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' }) - .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' })) + .pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined, type: 'module' })) .pipe(es.through(function (file) { -@@ -318,3 +319,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -321,3 +322,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const productJsonStream = gulp.src(['product.json'], { base: '.' }) - .pipe(json({ commit, date: readISODate('out-build'), version })) + .pipe(json({ commit, date: readISODate('out-build'), version, release })) .pipe(es.through(function (file) { diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index 030c39a..51772c9 100644 +index a63f693..62e0080 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -261,3 +261,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op @@ -73,7 +73,7 @@ index 98175f5..afacbe3 100644 + RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`, NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''), diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts -index ac7c552..8cfc209 100644 +index ebd9e43..d9a0ca6 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -58,2 +58,3 @@ export interface IProductConfiguration { @@ -104,26 +104,26 @@ index 1a2a619..2a8d683 100644 + release: pkg.release }); diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts -index 039233d..c8ced77 100644 +index b809503..21601c0 100644 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts -@@ -23,2 +23,3 @@ import { ResultKind } from '../../../../platform/keybinding/common/keybindingRes - import { CancellationToken } from '../../../../base/common/cancellation.js'; +@@ -22,2 +22,3 @@ import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaul + import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js'; +import { getReleaseString } from '../../../../workbench/common/release.js'; -@@ -80,2 +81,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler { +@@ -79,2 +80,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler { const detailString = (useAgo: boolean): string => { + const releaseString = getReleaseString(); + return localize('aboutDetail', -@@ -86,3 +89,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler { +@@ -85,3 +88,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler { navigator.userAgent - ); + ).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`); }; diff --git a/src/vs/workbench/common/release.ts b/src/vs/workbench/common/release.ts new file mode 100644 -index 0000000..2a8ea57 +index 0000000..82dbe6a --- /dev/null +++ b/src/vs/workbench/common/release.ts @@ -0,0 +1,14 @@ @@ -142,7 +142,7 @@ index 0000000..2a8ea57 + return LABELS[language] ?? DEFAULT_LABEL; +} diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts -index 6c61a59..e76a188 100644 +index 6c61a59..d58f8fc 100644 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts @@ -15,2 +15,3 @@ import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals diff --git a/patches/windows/policies.patch b/patches/windows/policies.patch index 57ac2bb..a8d3a82 100644 --- a/patches/windows/policies.patch +++ b/patches/windows/policies.patch @@ -22,21 +22,21 @@ index 01541e8..5b67f2b 100644 +!@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node diff --git a/build/lib/policies.js b/build/lib/policies.js -index 1560dc7..07c7348 100644 +index d52015c..39a4001 100644 --- a/build/lib/policies.js +++ b/build/lib/policies.js -@@ -61,3 +61,3 @@ class BasePolicy { +@@ -64,3 +64,3 @@ class BasePolicy { return [ - ``, + ``, ` `, -@@ -373,3 +373,3 @@ function renderADMX(regKey, versions, categories, policies) { +@@ -376,3 +376,3 @@ function renderADMX(regKey, versions, categories, policies) { - + diff --git a/build/lib/policies.ts b/build/lib/policies.ts -index f602c8a..11919c9 100644 +index 57941d8..50c1843 100644 --- a/build/lib/policies.ts +++ b/build/lib/policies.ts @@ -80,3 +80,3 @@ abstract class BasePolicy implements Policy { @@ -59,18 +59,18 @@ index f9f120a..db61adc 100644 + '@vscodium/policy-watcher', '@vscode/proxy-agent', diff --git a/package-lock.json b/package-lock.json -index 99a6c49..0997218 100644 +index 4963a5e..f297c0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,3 +18,2 @@ "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.8", - "@vscode/proxy-agent": "^0.30.0", + "@vscode/proxy-agent": "^0.31.0", @@ -29,2 +28,3 @@ "@vscode/windows-registry": "^1.1.0", + "@vscodium/policy-watcher": "^1.1.8-2501211616", "@xterm/addon-clipboard": "^0.2.0-beta.79", -@@ -2830,22 +2830,2 @@ +@@ -2831,22 +2831,2 @@ }, - "node_modules/@vscode/policy-watcher": { - "version": "1.1.8", @@ -93,7 +93,7 @@ index 99a6c49..0997218 100644 - } - }, "node_modules/@vscode/proxy-agent": { -@@ -3264,2 +3244,22 @@ +@@ -3247,2 +3227,22 @@ }, + "node_modules/@vscodium/policy-watcher": { + "version": "1.1.8-2501211616", @@ -117,14 +117,14 @@ index 99a6c49..0997218 100644 + }, "node_modules/@webassemblyjs/ast": { diff --git a/package.json b/package.json -index 2a79290..a924360 100644 +index 53c9113..f92420a 100644 --- a/package.json +++ b/package.json @@ -76,3 +76,3 @@ "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.8", + "@vscodium/policy-watcher": "^1.1.8-2501211616", - "@vscode/proxy-agent": "^0.30.0", + "@vscode/proxy-agent": "^0.31.0", diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt index ee0a24b..881ce36 100644 --- a/src/vs/base/test/node/uri.perf.data.txt diff --git a/product.json b/product.json index bf9e0a0..0174fc5 100644 --- a/product.json +++ b/product.json @@ -210,14 +210,10 @@ "treeViewMarkdownMessage" ], "GitHub.copilot": [ - "inlineCompletionsAdditions", - "interactive", - "terminalDataWriteEvent" + "inlineCompletionsAdditions" ], "GitHub.copilot-nightly": [ - "inlineCompletionsAdditions", - "interactive", - "terminalDataWriteEvent" + "inlineCompletionsAdditions" ], "GitHub.copilot-chat": [ "interactive", @@ -225,14 +221,14 @@ "terminalExecuteCommandEvent", "terminalSelection", "terminalQuickFixProvider", - "chatProvider", "chatParticipantAdditions", "defaultChatParticipant", "embeddings", + "chatEditing", "chatVariableResolver", + "chatProvider", "mappedEditsProvider", "aiRelatedInformation", - "chatEditing", "codeActionAI", "findTextInFiles", "textSearchProvider", @@ -247,9 +243,9 @@ "findFiles2", "extensionsAny", "authLearnMore", - "chatReadonlyPromptReference", "testObserver", "aiTextSearchProvider", + "chatReadonlyPromptReference", "documentFiltersExclusive", "chatParticipantPrivate", "contribDebugCreateConfiguration", @@ -271,9 +267,6 @@ "textSearchProvider", "timeline" ], - "GitHub.copilot-nes": [ - "inlineEdit" - ], "ms-python.gather": [ "notebookCellExecutionState" ], @@ -323,6 +316,7 @@ "redhat.java": [ "documentPaste" ], + "vscjava.vscode-java-pack": [], "ms-dotnettools.csdevkit": [ "inlineCompletionsAdditions" ], @@ -341,6 +335,9 @@ "chatParticipantAdditions", "languageModelSystem" ], + "ms-toolsai.datawrangler": [], + "ms-vscode.vscode-commander": [], + "ms-vscode.vscode-websearchforcopilot": [], "ms-vscode.vscode-copilot-data-analysis": [ "chatVariableResolver", "chatProvider" diff --git a/upstream/stable.json b/upstream/stable.json index c0b5ccb..80b20a2 100644 --- a/upstream/stable.json +++ b/upstream/stable.json @@ -1,4 +1,4 @@ { - "tag": "1.96.4", - "commit": "cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba" + "tag": "1.97.0", + "commit": "33fc5a94a3f99ebe7087e8fe79fbe1d37a251016" }