Skip to content

Commit

Permalink
Merge branch 'develop' into feat/apex-oas
Browse files Browse the repository at this point in the history
# Conflicts:
#	lerna.json
#	package-lock.json
#	packages/salesforcedx-apex-debugger/package.json
#	packages/salesforcedx-apex-replay-debugger/package.json
#	packages/salesforcedx-sobjects-faux-generator/package.json
#	packages/salesforcedx-test-utils-vscode/package.json
#	packages/salesforcedx-utils-vscode/package.json
#	packages/salesforcedx-utils/package.json
#	packages/salesforcedx-visualforce-language-server/package.json
#	packages/salesforcedx-visualforce-markup-language-server/package.json
#	packages/salesforcedx-vscode-apex-debugger/package.json
#	packages/salesforcedx-vscode-apex-replay-debugger/package.json
#	packages/salesforcedx-vscode-apex/out/apex-jorje-lsp.jar
#	packages/salesforcedx-vscode-apex/package.json
#	packages/salesforcedx-vscode-apex/package.nls.ja.json
#	packages/salesforcedx-vscode-apex/package.nls.json
#	packages/salesforcedx-vscode-apex/src/languageServer.ts
#	packages/salesforcedx-vscode-apex/src/settings.ts
#	packages/salesforcedx-vscode-core/package.json
#	packages/salesforcedx-vscode-expanded/package.json
#	packages/salesforcedx-vscode-lightning/package.json
#	packages/salesforcedx-vscode-lwc/package.json
#	packages/salesforcedx-vscode-soql/package.json
#	packages/salesforcedx-vscode-visualforce/package.json
#	packages/salesforcedx-vscode/package.json
#	packages/system-tests/package.json
  • Loading branch information
peternhale committed Dec 17, 2024
2 parents 24c366b + effb332 commit 87c7b4c
Show file tree
Hide file tree
Showing 67 changed files with 349 additions and 271 deletions.
22 changes: 11 additions & 11 deletions SHA256.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ make sure that their SHA values match the values in the list below.
following the instructions at
https://code.visualstudio.com/docs/editor/extension-gallery#_common-questions.
For example, download,
https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/62.5.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/62.9.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.

2. From a terminal, run:

shasum -a 256 <location_of_the_downloaded_file>

3. Confirm that the SHA in your output matches the value in this list of SHAs.

3fe30d9990763bd51eda35529f8608e6a0086d24ec2ab685fbc3e7bb0b991a67 salesforcedx-vscode-62.5.1.vsix
0df3f7c3a24a27fccc58184e98b8c96287dccaf8f6ac26ee108b2d93f686029e salesforcedx-vscode-apex-62.5.1.vsix
59c468a558a6d60c0bd260f161566ed71f7d3ad20bd5bd01846acedfa887f2a4 salesforcedx-vscode-apex-debugger-62.5.1.vsix
e36f63b8614bc0accdd5f252fdc56b924b3c6152049a6b81c0f275c0854731af salesforcedx-vscode-apex-replay-debugger-62.5.1.vsix
1c87c4a06339886ac1c2a5d08d32c34b04ace6c64fff6db5f14de0d7de224550 salesforcedx-vscode-core-62.5.1.vsix
83bd16c097e95ae238b79ce690cb8b799d5415d8cc1a0bdf39130faa904466cc salesforcedx-vscode-expanded-62.5.1.vsix
b497f3f0511cb0a5e88631ba114f94f6379100d503895992d9c85a383caaaa21 salesforcedx-vscode-lightning-62.5.1.vsix
6cd21e17bc39893b225695baf39f57d717ba110715665a6f5d9da930368968b7 salesforcedx-vscode-lwc-62.5.1.vsix
4061f13f7ff6f4f6410a5a5eab4edc1d707bf158a4bcc8493612eea956b1754d salesforcedx-vscode-soql-62.5.1.vsix
5fc5a13a351379bfc865dd484d321d849ff67298613545467f3c24e2df81ba76 salesforcedx-vscode-visualforce-62.5.1.vsix
40650dd21bb0d645870d6517350e4db3425659fe9518069b9700ad82c9438ea3 salesforcedx-vscode-62.9.1.vsix
014619a627fd65d0db02cc94de81c98eeda836a3b53a2e736b845eae37ce6ec4 salesforcedx-vscode-apex-62.9.1.vsix
aa6dcf52ab634c8efec204eb351542ea70f3b44b1cae7ef815a2616f6ad8a11a salesforcedx-vscode-apex-debugger-62.9.1.vsix
1b29d934781775e7b4c2e246909c20994c78a2392c3e850ec345adc74175a140 salesforcedx-vscode-apex-replay-debugger-62.9.1.vsix
b55cb5febfe5be023ff02056ca7181c7c88c53904e2da80311a5a35c798a08d7 salesforcedx-vscode-core-62.9.1.vsix
eff8e5afd842547cf6b690086fbde2d209c116a02a90c51c209592f74f5765b5 salesforcedx-vscode-expanded-62.9.1.vsix
8268422ebeb3340670651f399943fa38bf39ce4b5eeac76592b32d375aad3746 salesforcedx-vscode-lightning-62.9.1.vsix
7c275998fd98d6e475d96dc90409a8f89e528898d4a6a82017e6c13701d3cf3c salesforcedx-vscode-lwc-62.9.1.vsix
a5ce2a1bd0e71b7872ee9a227f63bd4c93cc7987824a309708dfe0e2f724622c salesforcedx-vscode-soql-62.9.1.vsix
e11642f021381fba9e84e08821aba64bc8a46931f559ab4a371d59b66e38ae3e salesforcedx-vscode-visualforce-62.9.1.vsix


4. Change the filename extension for the file that you downloaded from .zip to
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "62.8.0",
"version": "62.10.0",
"command": {
"version": {
"allowBranch": [
Expand Down
109 changes: 59 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 87c7b4c

Please sign in to comment.