这是indexloc提供的服务,不要输入任何密码
Skip to content

code-oss: bump to 1.102.0 #25421

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.

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
Jul 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Origin: https://gitlab.com/kalilinux/packages/code-oss/-/raw/kali/master/debian/patches/Set-enableTelemetry-to-false-by-default.patch
Origin: https://gitlab.com/kalilinux/packages/code-oss/-/raw/440bc47403c82affa67b13e421cbe2afc0e4eeda/debian/patches/Set-enableTelemetry-to-false-by-default.patch
From: Sophie Brun <sophie@offensive-security.com>
Date: Fri, 26 Mar 2021 09:35:52 +0100
Date: Fri, 11 Apr 2025 09:34:57 +0200
Subject: Disable Telemetry to false by default

Forwarded: not-needed
Expand All @@ -9,24 +9,24 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index e10d846..33f6c67 100644
index 4c72d65..ced284b 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -212,7 +212,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
],
'markdownDescription': getTelemetryLevelSettingDescription(),
- 'default': TelemetryConfiguration.ON,
+ 'default': TelemetryConfiguration.OFF,
'restricted': true,
'scope': ConfigurationScope.APPLICATION,
'tags': ['usesOnlineServices', 'telemetry']
@@ -233,7 +233,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
!product.privacyStatementUrl ?
localize('telemetry.enableTelemetry', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made.", product.nameLong) :
localize('telemetry.enableTelemetryMd', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made. [Read more]({1}) about what we collect and our privacy statement.", product.nameLong, product.privacyStatementUrl),
- 'default': true,
+ 'default': false,
'restricted': true,
'markdownDeprecationMessage': localize('enableTelemetryDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated in favor of the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
'scope': ConfigurationScope.APPLICATION,
@@ -209,7 +209,7 @@ configurationRegistry.registerConfiguration({
'properties': {
[TELEMETRY_SETTING_ID]: {
'type': 'string',
- 'enum': [TelemetryConfiguration.ON, TelemetryConfiguration.ERROR, TelemetryConfiguration.CRASH, TelemetryConfiguration.OFF],
+ 'enum': [TelemetryConfiguration.OFF, TelemetryConfiguration.ERROR, TelemetryConfiguration.CRASH, TelemetryConfiguration.OFF],
'enumDescriptions': [
localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."),
localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."),
@@ -229,7 +229,7 @@ configurationRegistry.registerConfiguration({
},
'telemetry.feedback.enabled': {
type: 'boolean',
- default: true,
+ default: false,
description: localize('telemetry.feedback.enabled', "Enable feedback mechanisms such as the issue reporter, surveys, and feedback options in features like Copilot Chat."),
policy: {
name: 'EnableFeedback',
14 changes: 7 additions & 7 deletions x11-packages/code-oss/0002-remove-more-telemetry.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Subject: Remove more telemetry
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
index 896ddc2..4b15027 100644
index e5cec6f..9c9e169 100644
--- a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -144,7 +144,7 @@ registry.registerConfiguration({
@@ -111,7 +111,7 @@ registry.registerConfiguration({
'workbench.settings.enableNaturalLanguageSearch': {
'type': 'boolean',
'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
Expand All @@ -21,11 +21,11 @@ index 896ddc2..4b15027 100644
'scope': ConfigurationScope.WINDOW,
'tags': ['usesOnlineServices']
},
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index 7ae5494..8e86929 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -269,7 +269,7 @@ import { applicationConfigurationNodeBase } from 'vs/workbench/common/configurat
diff --git a/src/vs/workbench/electron-browser/desktop.contribution.ts b/src/vs/workbench/electron-browser/desktop.contribution.ts
index 008bc5e..b231c72 100644
--- a/src/vs/workbench/electron-browser/desktop.contribution.ts
+++ b/src/vs/workbench/electron-browser/desktop.contribution.ts
@@ -330,7 +330,7 @@
'telemetry.enableCrashReporter': {
'type': 'boolean',
'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),
Expand Down
2 changes: 1 addition & 1 deletion x11-packages/code-oss/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/microsoft/vscode
TERMUX_PKG_DESCRIPTION="Visual Studio Code - OSS"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@licy183"
TERMUX_PKG_VERSION="1.101.2"
TERMUX_PKG_VERSION="1.102.0"
TERMUX_PKG_SRCURL=git+https://github.com/microsoft/vscode
TERMUX_PKG_GIT_BRANCH="$TERMUX_PKG_VERSION"
TERMUX_PKG_DEPENDS="electron-for-code-oss, libx11, libxkbfile, libsecret, ripgrep"
Expand Down