Skip to content

Commit 6cea9da

Browse files
amungeramunger
authored
Merge branch 'main' into aamunger/scratchpadHotExit
2 parents 2aa298a + 8bac540 commit 6cea9da

File tree

289 files changed

+5256
-2243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+5256
-2243
lines changed

‎.configurations/configuration.dsc.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
settings:
2929
Name: 'yarn'
3030
Global: true
31+
PackageDirectory: '${WinGetConfigRoot}\..\'
3132
- resource: Microsoft.WinGet.DSC/WinGetPackage
3233
directives:
3334
description: Install Python 3.10
@@ -55,4 +56,12 @@ properties:
5556
includeRecommended: true
5657
components:
5758
- Microsoft.VisualStudio.Workload.VCTools
59+
- resource: YarnDsc/YarnInstall
60+
dependsOn:
61+
- npm
62+
directives:
63+
description: Install dependencies
64+
allowPrerelease: true
65+
settings:
66+
PackageDirectory: '${WinGetConfigRoot}\..\'
5867
configurationVersion: 0.2.0

‎.vscode/notebooks/my-endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
{
158158
"kind": 2,
159159
"language": "github-issues",
160-
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25"
160+
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar"
161161
},
162162
{
163163
"kind": 1,

‎ThirdPartyNotices.txt

Lines changed: 5 additions & 388 deletions
Large diffs are not rendered by default.

‎build/azure-pipelines/alpine/cli-build-alpine.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ steps:
2222
displayName: Download openssl prebuilt
2323
inputs:
2424
command: custom
25-
customCommand: pack @vscode-internal/[email protected].5
25+
customCommand: pack @vscode-internal/[email protected].8
2626
customRegistry: useFeed
2727
customFeed: "Monaco/openssl-prebuilt"
2828
workingDir: $(Build.ArtifactStagingDirectory)
2929

3030
- script: |
3131
set -e
3232
mkdir $(Build.ArtifactStagingDirectory)/openssl
33-
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
33+
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
3434
displayName: Extract openssl prebuilt
3535
3636
# inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile

‎build/azure-pipelines/darwin/cli-build-darwin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ steps:
2222
displayName: Download openssl prebuilt
2323
inputs:
2424
command: custom
25-
customCommand: pack @vscode-internal/[email protected].5
25+
customCommand: pack @vscode-internal/[email protected].8
2626
customRegistry: useFeed
2727
customFeed: "Monaco/openssl-prebuilt"
2828
workingDir: $(Build.ArtifactStagingDirectory)
2929

3030
- script: |
3131
set -e
3232
mkdir $(Build.ArtifactStagingDirectory)/openssl
33-
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
33+
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
3434
displayName: Extract openssl prebuilt
3535
3636
- script: node build/azure-pipelines/cli/prepare.js

‎build/azure-pipelines/linux/cli-build-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ steps:
2525
displayName: Download openssl prebuilt
2626
inputs:
2727
command: custom
28-
customCommand: pack @vscode-internal/[email protected].5
28+
customCommand: pack @vscode-internal/[email protected].8
2929
customRegistry: useFeed
3030
customFeed: "Monaco/openssl-prebuilt"
3131
workingDir: $(Build.ArtifactStagingDirectory)
3232

3333
- script: |
3434
set -e
3535
mkdir $(Build.ArtifactStagingDirectory)/openssl
36-
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
36+
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
3737
displayName: Extract openssl prebuilt
3838
3939
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:

‎build/azure-pipelines/win32/cli-build-win32.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ steps:
2525
displayName: Download openssl prebuilt
2626
inputs:
2727
command: custom
28-
customCommand: pack @vscode-internal/[email protected].5
28+
customCommand: pack @vscode-internal/[email protected].8
2929
customRegistry: useFeed
3030
customFeed: "Monaco/openssl-prebuilt"
3131
workingDir: $(Build.ArtifactStagingDirectory)
3232

3333
- powershell: |
3434
mkdir $(Build.ArtifactStagingDirectory)/openssl
35-
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
35+
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
3636
displayName: Extract openssl prebuilt
3737
3838
- powershell: node build/azure-pipelines/cli/prepare.js

‎build/gulpfile.reh.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const { compileBuildTask } = require('./gulpfile.compile');
2929
const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
3030
const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
3131
const cp = require('child_process');
32+
const log = require('fancy-log');
3233

3334
const REPO_ROOT = path.dirname(__dirname);
3435
const commit = getVersion(REPO_ROOT);
@@ -163,25 +164,27 @@ function nodejs(platform, arch) {
163164

164165
if (platform === 'win32') {
165166
if (product.nodejsRepository) {
167+
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`);
166168
return assetFromGithub(product.nodejsRepository, nodeVersion, name => name === `win-${arch}-node.exe`)
167169
.pipe(rename('node.exe'));
168170
}
169-
170-
return remote(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org' })
171+
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from https://nodejs.org`);
172+
return remote(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org', verbose: true })
171173
.pipe(rename('node.exe'));
172174
}
173175

174176
if (arch === 'alpine' || platform === 'alpine') {
175177
const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
178+
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
176179
const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
177180
return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
178181
}
179182

180183
if (arch === 'armhf') {
181184
arch = 'armv7l';
182185
}
183-
184-
return remote(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org' })
186+
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from https://nodejs.org`);
187+
return remote(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', verbose: true })
185188
.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
186189
.pipe(filter('**/node'))
187190
.pipe(util.setExecutableBit('**'))
@@ -309,8 +312,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
309312
.pipe(replace('@@COMMIT@@', commit))
310313
.pipe(replace('@@APPNAME@@', product.applicationName))
311314
.pipe(rename(`bin/helpers/browser.cmd`)),
312-
gulp.src('resources/server/bin/server-old.cmd', { base: '.' })
313-
.pipe(rename(`server.cmd`)),
314315
gulp.src('resources/server/bin/code-server.cmd', { base: '.' })
315316
.pipe(rename(`bin/${product.serverApplicationName}.cmd`)),
316317
);
@@ -332,13 +333,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
332333
.pipe(rename(`bin/${product.serverApplicationName}`))
333334
.pipe(util.setExecutableBit())
334335
);
335-
if (type !== 'reh-web') {
336-
result = es.merge(result,
337-
gulp.src('resources/server/bin/server-old.sh', { base: '.' })
338-
.pipe(rename(`server.sh`))
339-
.pipe(util.setExecutableBit()),
340-
);
341-
}
342336
}
343337

344338
return result.pipe(vfs.dest(destination));

‎build/lib/electron.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/lib/electron.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
9191
}
9292

9393
export const config = {
94-
version: product.electronRepository ? '22.5.3' : util.getElectronVersion(),
94+
version: product.electronRepository ? '22.5.5' : util.getElectronVersion(),
9595
productAppName: product.nameLong,
9696
companyName: 'Microsoft Corporation',
9797
copyright: 'Copyright (C) 2023 Microsoft. All rights reserved',
@@ -212,7 +212,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
212212
}
213213

214214
async function main(arch = process.arch): Promise<void> {
215-
const version = product.electronRepository ? '22.5.3' : util.getElectronVersion();
215+
const version = product.electronRepository ? '22.5.5' : util.getElectronVersion();
216216
const electronPath = path.join(root, '.build', 'electron');
217217
const versionFile = path.join(electronPath, 'version');
218218
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

0 commit comments

Comments
 (0)