Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/da conflict #6

Merged
merged 5 commits into from
Mar 24, 2020
Merged

Conversation

brianignacio5
Copy link

No description provided.

@brianignacio5 brianignacio5 changed the base branch from master to feature/debug-adapter March 11, 2020 04:22
@an-dr an-dr merged commit 9bf68db into an-dr:feature/debug-adapter Mar 24, 2020
@brianignacio5 brianignacio5 deleted the fix/da-conflict branch April 27, 2020 06:26
an-dr added a commit that referenced this pull request May 18, 2020
* Added a custom Debug Adapter

* fix old configs remove build before debug

* fix debug adapter unit test

* DA python pkgs check (#3)

* read Cmakelists file for project name (VSC-248) (espressif#43)

read build project_description json file for project name

* Feature/localization kv val (VSC-226) (VSC-246) (espressif#41)

* add gulp i18n validation and src missing key log

* rm unused i18n field, add unknown field (espressif#48)

* v0.1.4

* Added a custom Debug Adapter

* fix old configs remove build before debug

* removed outdated extension.test.ts

* fix debug adapter unit test

* removed repeated options

* removed redundant requirements.txt

* made `Upload testing.results.log` always executable

* add adapter python reqs checking

Co-authored-by: Soumesh Banerjee <soumeshbanerjee@live.com>
Co-authored-by: Andrey Gramakov <mail@agramakov.me>

* Fix/da merge (#4)

* read Cmakelists file for project name (VSC-248) (espressif#43)

read build project_description json file for project name

* Feature/localization kv val (VSC-226) (VSC-246) (espressif#41)

* add gulp i18n validation and src missing key log

* rm unused i18n field, add unknown field (espressif#48)

* v0.1.4

* Added a custom Debug Adapter

* fix old configs remove build before debug

* fix debug adapter unit test

* DA python pkgs check (#3)

* read Cmakelists file for project name (VSC-248) (espressif#43)

read build project_description json file for project name

* Feature/localization kv val (VSC-226) (VSC-246) (espressif#41)

* add gulp i18n validation and src missing key log

* rm unused i18n field, add unknown field (espressif#48)

* v0.1.4

* Added a custom Debug Adapter

* fix old configs remove build before debug

* removed outdated extension.test.ts

* fix debug adapter unit test

* removed repeated options

* removed redundant requirements.txt

* made `Upload testing.results.log` always executable

* add adapter python reqs checking

Co-authored-by: Soumesh Banerjee <soumeshbanerjee@live.com>
Co-authored-by: Andrey Gramakov <mail@agramakov.me>

* fix merge issues

* log adapter output

Co-authored-by: Soumesh Banerjee <soumeshbanerjee@live.com>
Co-authored-by: Andrey Gramakov <mail@agramakov.me>

* An dr/feature/debug adapter (#5)

Fix Espressif master merge conflicts

* debug_backend package: removed everything but pygdbmi from the Pipfile

* Fix/da conflict (#6)

* read Cmakelists file for project name (VSC-248) (espressif#43)

read build project_description json file for project name

* Feature/localization kv val (VSC-226) (VSC-246) (espressif#41)

* add gulp i18n validation and src missing key log

* rm unused i18n field, add unknown field (espressif#48)

* v0.1.4

Co-authored-by: Soumesh Banerjee <soumeshbanerjee@live.com>

* Run prettier

* yarn audit fix

Co-authored-by: brian@espressif.com <brian@espressif.com>
Co-authored-by: Brian A. Ignacio <brianignacio5@gmail.com>
Co-authored-by: Soumesh Banerjee <soumeshbanerjee@live.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants