Skip to content

Commit 8e2ec5a

Browse files
authored
Revert "remove UpdateMode policy (microsoft#150357)" (microsoft#152155)
This reverts commit 73dda0c.
1 parent 4192006 commit 8e2ec5a

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

build/azure-pipelines/win32/product-build-win32.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,13 @@ steps:
127127
exec { node build/azure-pipelines/mixin }
128128
displayName: Mix in quality
129129
130+
- powershell: |
131+
. build/azure-pipelines/win32/exec.ps1
132+
$ErrorActionPreference = "Stop"
133+
exec { node build\lib\policies }
134+
displayName: Generate Group Policy definitions
135+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
136+
130137
- powershell: |
131138
. build/azure-pipelines/win32/exec.ps1
132139
$ErrorActionPreference = "Stop"

build/gulpfile.vscode.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,9 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
331331
result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
332332
.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
333333

334+
result = es.merge(result, gulp.src('.build/policies/win32/**', { base: '.build/policies/win32' })
335+
.pipe(rename(f => f.dirname = `policies/${f.dirname}`)));
336+
334337
} else if (platform === 'linux') {
335338
result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
336339
.pipe(replace('@@PRODNAME@@', product.nameLong))

src/vs/platform/update/common/update.config.contribution.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ configurationRegistry.registerConfiguration({
2727
localize('manual', "Disable automatic background update checks. Updates will be available if you manually check for updates."),
2828
localize('start', "Check for updates only on startup. Disable automatic background update checks."),
2929
localize('default', "Enable automatic update checks. Code will check for updates automatically and periodically.")
30-
]
30+
],
31+
policy: {
32+
name: 'UpdateMode',
33+
minimumVersion: '1.67',
34+
}
3135
},
3236
'update.channel': {
3337
type: 'string',

0 commit comments

Comments
 (0)