diff --git a/Composer/packages/electron-server/package.json b/Composer/packages/electron-server/package.json
index 148915ee46..bb2bd8a73f 100644
--- a/Composer/packages/electron-server/package.json
+++ b/Composer/packages/electron-server/package.json
@@ -49,7 +49,7 @@
"@types/rimraf": "^2.0.2",
"cross-env": "7.0.3",
"electron": "14.2.6",
- "electron-builder": "^22.6.0",
+ "electron-builder": "^23.6.0",
"globby": "^11.0.1",
"js-yaml": "^3.13.1",
"mock-fs": "^4.10.1",
diff --git a/Composer/packages/electron-server/resources/entitlements-keychain.plist b/Composer/packages/electron-server/resources/entitlements-keychain.plist
index f5ec040689..6a03f624bd 100644
--- a/Composer/packages/electron-server/resources/entitlements-keychain.plist
+++ b/Composer/packages/electron-server/resources/entitlements-keychain.plist
@@ -10,6 +10,8 @@
com.apple.security.cs.allow-dyld-environment-variables
+ com.apple.security.cs.disable-executable-page-protection
+
keychain-access-groups
UBF8T346G9.com.microsoft.identity.universalstorage
diff --git a/Composer/packages/electron-server/resources/entitlements.plist b/Composer/packages/electron-server/resources/entitlements.plist
index be8b7163da..6e06826a62 100644
--- a/Composer/packages/electron-server/resources/entitlements.plist
+++ b/Composer/packages/electron-server/resources/entitlements.plist
@@ -10,5 +10,7 @@
com.apple.security.cs.allow-dyld-environment-variables
+ com.apple.security.cs.disable-executable-page-protection
+
diff --git a/Composer/packages/electron-server/scripts/common.js b/Composer/packages/electron-server/scripts/common.js
index 2177f3a81d..fdcb6ad877 100644
--- a/Composer/packages/electron-server/scripts/common.js
+++ b/Composer/packages/electron-server/scripts/common.js
@@ -1,12 +1,14 @@
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license.
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
/** Hashes a file asynchronously */
const path = require('path');
-const fsp = require('fs-extra');
-const yaml = require('js-yaml');
const fs = require('fs');
const crypto = require('crypto');
+
+const fsp = require('fs-extra');
+const yaml = require('js-yaml');
+
const packageJson = require('../package.json');
async function writeToDist(err, files, fileName) {
@@ -26,7 +28,7 @@ async function writeToDist(err, files, fileName) {
path: releaseFileName,
sha512,
};
- const ymlStr = yaml.safeDump(ymlInfo);
+ const ymlStr = yaml.dump(ymlInfo);
const ymlPath = path.join(__dirname, `../dist/${fileName}`);
fsp.writeFileSync(ymlPath, ymlStr);
}
diff --git a/Composer/yarn-berry.lock b/Composer/yarn-berry.lock
index 61e949e0cc..9232020d76 100644
--- a/Composer/yarn-berry.lock
+++ b/Composer/yarn-berry.lock
@@ -3825,7 +3825,7 @@ __metadata:
crypto: ^1.0.1
debug: 4.1.1
electron: 14.2.6
- electron-builder: ^22.6.0
+ electron-builder: ^23.6.0
electron-updater: 4.2.5
fix-path: ^3.0.0
format-message: 6.2.4
@@ -4618,16 +4618,18 @@ __metadata:
languageName: node
linkType: hard
-"@electron/universal@npm:1.0.5":
- version: 1.0.5
- resolution: "@electron/universal@npm:1.0.5"
+"@electron/universal@npm:1.2.1":
+ version: 1.2.1
+ resolution: "@electron/universal@npm:1.2.1"
dependencies:
"@malept/cross-spawn-promise": ^1.1.0
- asar: ^3.0.3
+ asar: ^3.1.0
debug: ^4.3.1
dir-compare: ^2.4.0
fs-extra: ^9.0.1
- checksum: 64eae3bbbfa422f28dbc1e92d12d954059cec7dac9ecc3ecad2c7895bb6cd10d30e8b3848092bfba8815bc71b60393a42f792751e50b9b5f643d6f1d03826b86
+ minimatch: ^3.0.4
+ plist: ^3.0.4
+ checksum: 9a7d98cf2b8414ff0274384fef1b72b5a545a0feb7ce03163d2e2ee1b13e4f7064dfe7147cdd652708a1314d1b5e68acdd907847a1747866ec8d2d3e757ec1f7
languageName: node
linkType: hard
@@ -8655,43 +8657,44 @@ __metadata:
languageName: node
linkType: hard
-"app-builder-bin@npm:3.7.1":
- version: 3.7.1
- resolution: "app-builder-bin@npm:3.7.1"
- checksum: aae6152d7e7e6eabe35e5430f8b4733cc713bd3f80fdb861c5b675ebc8951aa26b520821d27c5ee31f05e850cdfd9b923b58064307f1ae583fb4e7434d380209
+"app-builder-bin@npm:4.0.0":
+ version: 4.0.0
+ resolution: "app-builder-bin@npm:4.0.0"
+ checksum: c3c8fd85c371b7a396c1bb1160ab2e3231ba4309abea5b36a5b366e42511e347c65a33ff50d56f4960b337833d539c263137b0ba131e2fa268c32edeb6c9f683
languageName: node
linkType: hard
-"app-builder-lib@npm:22.14.13":
- version: 22.14.13
- resolution: "app-builder-lib@npm:22.14.13"
+"app-builder-lib@npm:23.6.0":
+ version: 23.6.0
+ resolution: "app-builder-lib@npm:23.6.0"
dependencies:
7zip-bin: ~5.1.1
"@develar/schema-utils": ~2.6.5
- "@electron/universal": 1.0.5
+ "@electron/universal": 1.2.1
"@malept/flatpak-bundler": ^0.4.0
async-exit-hook: ^2.0.1
bluebird-lst: ^1.0.9
- builder-util: 22.14.13
- builder-util-runtime: 8.9.2
+ builder-util: 23.6.0
+ builder-util-runtime: 9.1.1
chromium-pickle-js: ^0.2.0
- debug: ^4.3.2
- ejs: ^3.1.6
- electron-osx-sign: ^0.5.0
- electron-publish: 22.14.13
+ debug: ^4.3.4
+ ejs: ^3.1.7
+ electron-osx-sign: ^0.6.0
+ electron-publish: 23.6.0
form-data: ^4.0.0
- fs-extra: ^10.0.0
- hosted-git-info: ^4.0.2
+ fs-extra: ^10.1.0
+ hosted-git-info: ^4.1.0
is-ci: ^3.0.0
- isbinaryfile: ^4.0.8
+ isbinaryfile: ^4.0.10
js-yaml: ^4.1.0
lazy-val: ^1.0.5
- minimatch: ^3.0.4
+ minimatch: ^3.1.2
read-config-file: 6.2.0
sanitize-filename: ^1.6.3
- semver: ^7.3.5
+ semver: ^7.3.7
+ tar: ^6.1.11
temp-file: ^3.4.0
- checksum: a32a5ef25b3f70ddcd9b6ba0691221b9e66b0b0a4e1c28e9dc90854d7dcd0183445af55132587458963202afe40b1860b705558b990622d9e5953931b0de2572
+ checksum: da3cc9f24e127add651197076c5fa2f68bc7979bcd6a441df7f69629e96bf3aca3118d61c63a85d382a824748f8056a7639464f07b1ded09db53ff1c4b3101be
languageName: node
linkType: hard
@@ -8948,9 +8951,9 @@ __metadata:
languageName: node
linkType: hard
-"asar@npm:^3.0.3":
- version: 3.1.0
- resolution: "asar@npm:3.1.0"
+"asar@npm:^3.1.0":
+ version: 3.2.0
+ resolution: "asar@npm:3.2.0"
dependencies:
"@types/glob": ^7.1.1
chromium-pickle-js: ^0.2.0
@@ -8962,7 +8965,7 @@ __metadata:
optional: true
bin:
asar: bin/asar.js
- checksum: facc80845639fa4f9e1d1aa40b96adbd1e8b6fee0725d287e8c8e30a69b235cd5b7131b7b09ff700da06c919dd0595b373e372c55722808f983fdb71ef0d5399
+ checksum: f7d30b45970b053252ac124230bf319459d0728d7f6dedbe2f765cd2a83792d5a716d2c3f2861ceda69372b401f335e1f46460335169eadd0e91a0904a4f5a15
languageName: node
linkType: hard
@@ -10374,29 +10377,29 @@ __metadata:
languageName: node
linkType: hard
-"builder-util-runtime@npm:8.9.2":
- version: 8.9.2
- resolution: "builder-util-runtime@npm:8.9.2"
+"builder-util-runtime@npm:9.1.1":
+ version: 9.1.1
+ resolution: "builder-util-runtime@npm:9.1.1"
dependencies:
- debug: ^4.3.2
+ debug: ^4.3.4
sax: ^1.2.4
- checksum: 35adcd6162e2ed16635ff7b7ecc353e400dcbbb3e7cd01823bfefc7256cefca8c820f62d15a0f7dbee1c7495a5f1fba4e0e238857a79b48d5f6bd35064f27208
+ checksum: 3458f9c8accad6e934c841cffa93f5d4b342c22b10b9c1a2eb3fd44ca96ea2c662b1048f9a075da9b8a4fada17206887b7e92ebdca331b1071520916e013e245
languageName: node
linkType: hard
-"builder-util@npm:22.14.13":
- version: 22.14.13
- resolution: "builder-util@npm:22.14.13"
+"builder-util@npm:23.6.0":
+ version: 23.6.0
+ resolution: "builder-util@npm:23.6.0"
dependencies:
7zip-bin: ~5.1.1
"@types/debug": ^4.1.6
"@types/fs-extra": ^9.0.11
- app-builder-bin: 3.7.1
+ app-builder-bin: 4.0.0
bluebird-lst: ^1.0.9
- builder-util-runtime: 8.9.2
+ builder-util-runtime: 9.1.1
chalk: ^4.1.1
cross-spawn: ^7.0.3
- debug: ^4.3.2
+ debug: ^4.3.4
fs-extra: ^10.0.0
http-proxy-agent: ^5.0.0
https-proxy-agent: ^5.0.0
@@ -10405,7 +10408,7 @@ __metadata:
source-map-support: ^0.5.19
stat-mode: ^1.0.0
temp-file: ^3.4.0
- checksum: 6d72cc1f0bf7e72debe70049dede2a5eac302fb98b87eb7e60b7feed8631dc66877821367d5e7a87aea881f937a565c25e4e24042b421ef12c1d2afa8b7cc02d
+ checksum: 138fb9abed01ea2e5ac895e6a6ed75310ca6c89e0050483c81801b052f61b42ae5a042f457088b6e205ec8b4403b1ff3a325955f110255afb4da2310e3cf14ad
languageName: node
linkType: hard
@@ -11112,6 +11115,17 @@ __metadata:
languageName: node
linkType: hard
+"cliui@npm:^8.0.1":
+ version: 8.0.1
+ resolution: "cliui@npm:8.0.1"
+ dependencies:
+ string-width: ^4.2.0
+ strip-ansi: ^6.0.1
+ wrap-ansi: ^7.0.0
+ checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56
+ languageName: node
+ linkType: hard
+
"clone-buffer@npm:^1.0.0":
version: 1.0.0
resolution: "clone-buffer@npm:1.0.0"
@@ -13270,27 +13284,27 @@ __metadata:
languageName: node
linkType: hard
-"dmg-builder@npm:22.14.13":
- version: 22.14.13
- resolution: "dmg-builder@npm:22.14.13"
+"dmg-builder@npm:23.6.0":
+ version: 23.6.0
+ resolution: "dmg-builder@npm:23.6.0"
dependencies:
- app-builder-lib: 22.14.13
- builder-util: 22.14.13
- builder-util-runtime: 8.9.2
- dmg-license: ^1.0.9
+ app-builder-lib: 23.6.0
+ builder-util: 23.6.0
+ builder-util-runtime: 9.1.1
+ dmg-license: ^1.0.11
fs-extra: ^10.0.0
iconv-lite: ^0.6.2
js-yaml: ^4.1.0
dependenciesMeta:
dmg-license:
optional: true
- checksum: 01be77f99b9309e356e3ae4fbccc294c4f1dcb65b9b21c434807cbaa9d0c22b2338a5b688bba1b277e0110ac33dd1eb126f4267d09382b1fa12d0878162ac648
+ checksum: 3e37a4b191cf40c9c7b97d07408c2bf58e7632d78de0dc49a142fb7c68670fd2a7123f31ee8803b3cd100f38feea7b785c28698dfaace508254659d81ecc0b80
languageName: node
linkType: hard
-"dmg-license@npm:^1.0.9":
- version: 1.0.10
- resolution: "dmg-license@npm:1.0.10"
+"dmg-license@npm:^1.0.11":
+ version: 1.0.11
+ resolution: "dmg-license@npm:1.0.11"
dependencies:
"@types/plist": ^3.0.1
"@types/verror": ^1.10.3
@@ -13610,32 +13624,32 @@ __metadata:
languageName: node
linkType: hard
-"electron-builder@npm:^22.6.0":
- version: 22.14.13
- resolution: "electron-builder@npm:22.14.13"
+"electron-builder@npm:^23.6.0":
+ version: 23.6.0
+ resolution: "electron-builder@npm:23.6.0"
dependencies:
"@types/yargs": ^17.0.1
- app-builder-lib: 22.14.13
- builder-util: 22.14.13
- builder-util-runtime: 8.9.2
+ app-builder-lib: 23.6.0
+ builder-util: 23.6.0
+ builder-util-runtime: 9.1.1
chalk: ^4.1.1
- dmg-builder: 22.14.13
+ dmg-builder: 23.6.0
fs-extra: ^10.0.0
is-ci: ^3.0.0
lazy-val: ^1.0.5
read-config-file: 6.2.0
- update-notifier: ^5.1.0
- yargs: ^17.0.1
+ simple-update-notifier: ^1.0.7
+ yargs: ^17.5.1
bin:
electron-builder: cli.js
install-app-deps: install-app-deps.js
- checksum: 1c5179ca9c4db3886377f86b6aa00db703180358134fefbf4c32daa54ed2620c47bf5495d0e4ee12bd3694dd7d3553a6561f088d2e5ab571b9e9b2f07ff594f2
+ checksum: 227f8fb9c9bb11a11d999f2ade6a5cd1afb720d6ff5053c88b4be62d1265b6268c8f6b4b3b8ad6d0a7261d57ea5acd6619ef301b843865f260b616c474cf8cbd
languageName: node
linkType: hard
-"electron-osx-sign@npm:^0.5.0":
- version: 0.5.0
- resolution: "electron-osx-sign@npm:0.5.0"
+"electron-osx-sign@npm:^0.6.0":
+ version: 0.6.0
+ resolution: "electron-osx-sign@npm:0.6.0"
dependencies:
bluebird: ^3.5.0
compare-version: ^0.1.2
@@ -13646,22 +13660,22 @@ __metadata:
bin:
electron-osx-flat: bin/electron-osx-flat.js
electron-osx-sign: bin/electron-osx-sign.js
- checksum: ca1e55d8cb0987b78bfaf197860e73f7e6266cb219f3d6fd32f25665a8393efb284115db9e2246b42f75cdf6163c148060aff8a02960f4f810c6502d6f7d447c
+ checksum: b688f9efb013670b4226cff7c38101e7b1384ea44e1ab203259995f1eefc019c63aa18e936217a76d33b5a5a452b987ab3d86a56a961294582ce42acbb950de6
languageName: node
linkType: hard
-"electron-publish@npm:22.14.13":
- version: 22.14.13
- resolution: "electron-publish@npm:22.14.13"
+"electron-publish@npm:23.6.0":
+ version: 23.6.0
+ resolution: "electron-publish@npm:23.6.0"
dependencies:
"@types/fs-extra": ^9.0.11
- builder-util: 22.14.13
- builder-util-runtime: 8.9.2
+ builder-util: 23.6.0
+ builder-util-runtime: 9.1.1
chalk: ^4.1.1
fs-extra: ^10.0.0
lazy-val: ^1.0.5
mime: ^2.5.2
- checksum: 66cf15ad52c9dea67d744eb9080c20d43792a734f4e524b8ffc676e8ce9541a2fe4b11a25e4bd3f48e670160e72edfc7eeb77767e843232f4454075ee91d2475
+ checksum: 70473d800f0607b5ffc32473e87004079fe3e5f133242bb498dcff0be89bfaa4ce967860809e12b97ce216b1e907649a8a916b7483daf7a00ea28db3d665878e
languageName: node
linkType: hard
@@ -15995,6 +16009,17 @@ __metadata:
languageName: node
linkType: hard
+"fs-extra@npm:^10.1.0":
+ version: 10.1.0
+ resolution: "fs-extra@npm:10.1.0"
+ dependencies:
+ graceful-fs: ^4.2.0
+ jsonfile: ^6.0.1
+ universalify: ^2.0.0
+ checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50
+ languageName: node
+ linkType: hard
+
"fs-extra@npm:^3.0.0":
version: 3.0.1
resolution: "fs-extra@npm:3.0.1"
@@ -17084,7 +17109,7 @@ __metadata:
languageName: node
linkType: hard
-"hosted-git-info@npm:^4.0.1, hosted-git-info@npm:^4.0.2":
+"hosted-git-info@npm:^4.0.1, hosted-git-info@npm:^4.1.0":
version: 4.1.0
resolution: "hosted-git-info@npm:4.1.0"
dependencies:
@@ -18581,13 +18606,20 @@ __metadata:
languageName: node
linkType: hard
-"isbinaryfile@npm:^4.0.0, isbinaryfile@npm:^4.0.8":
+"isbinaryfile@npm:^4.0.0":
version: 4.0.8
resolution: "isbinaryfile@npm:4.0.8"
checksum: 606e3bb648d1a0dee23459d1d937bb2560e66a5281ec7c9ff50e585402d73321ac268d0f34cb7393125b3ebc4c7962d39e50a01cdb8904b52fce08b7ccd2bf9f
languageName: node
linkType: hard
+"isbinaryfile@npm:^4.0.10":
+ version: 4.0.10
+ resolution: "isbinaryfile@npm:4.0.10"
+ checksum: a6b28db7e23ac7a77d3707567cac81356ea18bd602a4f21f424f862a31d0e7ab4f250759c98a559ece35ffe4d99f0d339f1ab884ffa9795172f632ab8f88e686
+ languageName: node
+ linkType: hard
+
"isexe@npm:^2.0.0":
version: 2.0.0
resolution: "isexe@npm:2.0.0"
@@ -25761,7 +25793,7 @@ __metadata:
languageName: node
linkType: hard
-"semver@npm:7.0.0":
+"semver@npm:7.0.0, semver@npm:~7.0.0":
version: 7.0.0
resolution: "semver@npm:7.0.0"
bin:
@@ -25799,6 +25831,17 @@ __metadata:
languageName: node
linkType: hard
+"semver@npm:^7.3.7":
+ version: 7.5.2
+ resolution: "semver@npm:7.5.2"
+ dependencies:
+ lru-cache: ^6.0.0
+ bin:
+ semver: bin/semver.js
+ checksum: 3fdf5d1e6f170fe8bcc41669e31787649af91af7f54f05c71d0865bb7aa27e8b92f68b3e6b582483e2c1c648008bc84249d2cd86301771fe5cbf7621d1fe5375
+ languageName: node
+ linkType: hard
+
"semver@npm:^7.3.8":
version: 7.3.8
resolution: "semver@npm:7.3.8"
@@ -26082,6 +26125,15 @@ __metadata:
languageName: node
linkType: hard
+"simple-update-notifier@npm:^1.0.7":
+ version: 1.1.0
+ resolution: "simple-update-notifier@npm:1.1.0"
+ dependencies:
+ semver: ~7.0.0
+ checksum: 1012e9b6c504e559a948078177b3eedbb9d7e4d15878e2bda56314d08db609ca5da485be4ac9f838759faae8057935ee0246fcdf63f1233c86bd9fecb2a5544b
+ languageName: node
+ linkType: hard
+
"sirv@npm:^1.0.7":
version: 1.0.19
resolution: "sirv@npm:1.0.19"
@@ -30024,6 +30076,13 @@ __metadata:
languageName: node
linkType: hard
+"yargs-parser@npm:^21.1.1":
+ version: 21.1.1
+ resolution: "yargs-parser@npm:21.1.1"
+ checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c
+ languageName: node
+ linkType: hard
+
"yargs@npm:^13.0.0, yargs@npm:^13.3.2":
version: 13.3.2
resolution: "yargs@npm:13.3.2"
@@ -30057,9 +30116,9 @@ __metadata:
languageName: node
linkType: hard
-"yargs@npm:^17.0.1":
- version: 17.3.1
- resolution: "yargs@npm:17.3.1"
+"yargs@npm:^17.3.1":
+ version: 17.5.1
+ resolution: "yargs@npm:17.5.1"
dependencies:
cliui: ^7.0.2
escalade: ^3.1.1
@@ -30068,22 +30127,22 @@ __metadata:
string-width: ^4.2.3
y18n: ^5.0.5
yargs-parser: ^21.0.0
- checksum: 64fc2e32c56739f1d14d2d24acd17a6944c3c8e3e3558f09fc1953ac112e868cc16013d282886b9d5be22187f8b9ed4f60741a6b1011f595ce2718805a656852
+ checksum: 00d58a2c052937fa044834313f07910fd0a115dec5ee35919e857eeee3736b21a4eafa8264535800ba8bac312991ce785ecb8a51f4d2cc8c4676d865af1cfbde
languageName: node
linkType: hard
-"yargs@npm:^17.3.1":
- version: 17.5.1
- resolution: "yargs@npm:17.5.1"
+"yargs@npm:^17.5.1":
+ version: 17.7.2
+ resolution: "yargs@npm:17.7.2"
dependencies:
- cliui: ^7.0.2
+ cliui: ^8.0.1
escalade: ^3.1.1
get-caller-file: ^2.0.5
require-directory: ^2.1.1
string-width: ^4.2.3
y18n: ^5.0.5
- yargs-parser: ^21.0.0
- checksum: 00d58a2c052937fa044834313f07910fd0a115dec5ee35919e857eeee3736b21a4eafa8264535800ba8bac312991ce785ecb8a51f4d2cc8c4676d865af1cfbde
+ yargs-parser: ^21.1.1
+ checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
languageName: node
linkType: hard