Skip to content

Commit 92cf6f4

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into pr/97266
2 parents 2681b9d + 756e105 commit 92cf6f4

238 files changed

Lines changed: 5576 additions & 3642 deletions

File tree

Some content is hidden

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

‎build/.cachesalt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2019-08-30T20:24:23.714Z
1+
2020-10-05T20:24:23.714Z

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ steps:
6666
artifactName: crash-dump-macos
6767
targetPath: .build/crashes
6868
displayName: 'Publish Crash Reports'
69-
condition: succeededOrFailed()
69+
continueOnError: true
70+
condition: failed()
7071

7172
- task: PublishTestResults@2
7273
displayName: Publish Tests Results

‎build/azure-pipelines/darwin/entitlements.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,13 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>com.apple.security.cs.allow-jit</key>
6+
<true/>
7+
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
<true/>
9+
<key>com.apple.security.cs.disable-library-validation</key>
10+
<true/>
11+
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
<true/>
513
</dict>
614
</plist>

‎build/azure-pipelines/darwin/helper-entitlements.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.disable-library-validation</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎build/azure-pipelines/darwin/helper-gpu-entitlements.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
<dict>
55
<key>com.apple.security.cs.allow-jit</key>
66
<true/>
7+
<key>com.apple.security.cs.disable-library-validation</key>
8+
<true/>
79
</dict>
810
</plist>

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ steps:
157157
artifactName: crash-dump-macos
158158
targetPath: .build/crashes
159159
displayName: 'Publish Crash Reports'
160-
condition: succeededOrFailed()
160+
continueOnError: true
161+
condition: failed()
161162

162163
- script: |
163164
set -e
@@ -172,6 +173,7 @@ steps:
172173
security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
173174
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
174175
codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist "$APP_ROOT"/*.app
176+
codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper.app"
175177
codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-gpu-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (GPU).app"
176178
codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-plugin-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (Plugin).app"
177179
codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-renderer-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (Renderer).app"
@@ -241,6 +243,13 @@ steps:
241243
SessionTimeout: 60
242244
displayName: Notarization
243245

246+
- script: |
247+
set -e
248+
APP_ROOT=$(agent.builddirectory)/VSCode-darwin
249+
APP_NAME="`ls $APP_ROOT | head -n 1`"
250+
"$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --version
251+
displayName: Verify start after signing
252+
244253
- script: |
245254
set -e
246255
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
@@ -251,6 +260,11 @@ steps:
251260
./build/azure-pipelines/darwin/publish.sh
252261
displayName: Publish
253262

263+
- script: |
264+
yarn gulp upload-vscode-configuration
265+
displayName: Upload configuration (for Bing settings search)
266+
continueOnError: true
267+
254268
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
255269
displayName: 'Component Detection'
256270
continueOnError: true

‎build/azure-pipelines/darwin/publish.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,3 @@ node build/azure-pipelines/common/createAsset.js \
2222
# node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" x64 "$VSCODE_HOCKEYAPP_ID_MACOS"
2323
# Skip hockey app because build failure.
2424
# https://github.com/microsoft/vscode/issues/90491
25-
26-
# upload configuration
27-
yarn gulp upload-vscode-configuration

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ steps:
7575
artifactName: crash-dump-linux
7676
targetPath: .build/crashes
7777
displayName: 'Publish Crash Reports'
78-
condition: succeededOrFailed()
79-
78+
continueOnError: true
79+
condition: failed()
80+
8081
- task: PublishTestResults@2
8182
displayName: Publish Tests Results
8283
inputs:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ steps:
145145
artifactName: crash-dump-linux
146146
targetPath: .build/crashes
147147
displayName: 'Publish Crash Reports'
148-
condition: succeededOrFailed()
148+
continueOnError: true
149+
condition: failed()
149150

150151
- script: |
151152
set -e

‎build/azure-pipelines/product-compile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ steps:
7676
set -e
7777
yarn generate-github-config
7878
displayName: Generate GitHub config
79-
condition: succeeded()
8079
env:
8180
OSS_GITHUB_ID: "a5d3c261b032765a78de"
8281
OSS_GITHUB_SECRET: $(oss-github-client-secret)
@@ -94,6 +93,7 @@ steps:
9493
VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
9594
GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
9695
GITHUB_APP_SECRET: $(github-app-client-secret)
96+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
9797

9898
- script: |
9999
set -e

0 commit comments

Comments
 (0)