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

VS build #347

Merged
merged 5 commits into from
Mar 7, 2023
Merged

Conversation

Hadatko
Copy link
Member

@Hadatko Hadatko commented Feb 9, 2023

Pull request

Choose Correct

  • bug
  • feature

Describe the pull request

build VS project

To Reproduce

Expected behavior

Screenshots

Desktop (please complete the following information):

  • OS:
  • eRPC Version:

Steps you didn't forgot to do

  • I checked if other PR isn't solving this issue.
  • I read Contribution details and did appropriate actions.
  • PR code is tested.
  • PR code is formatted.
  • Allow edits from maintainers pull request option is set (recommended).

Additional context

Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
@Hadatko Hadatko added this to the 1.11.0 milestone Feb 9, 2023
@Hadatko Hadatko self-assigned this Feb 9, 2023
@Hadatko Hadatko force-pushed the feature/VSbuild branch 5 times, most recently from 9e88b00 to f3e0428 Compare February 9, 2023 14:27
@Hadatko
Copy link
Member Author

Hadatko commented Feb 9, 2023

This looks working too. I disabled some artefacts as we don't need two apps per OS just one. Consider merge after: #344

Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
@Hadatko
Copy link
Member Author

Hadatko commented Mar 7, 2023

Hi @MichalPrincNXP are you solving merge conflicts by yourself?

@MichalPrincNXP
Copy link
Member

Hi @MichalPrincNXP are you solving merge conflicts by yourself?

Yes, sorry I already did it, however, the automatic merge of erpcgen\Makefile is not correct, may you please update it again, I am sorry for confusion.

Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
@MichalPrincNXP MichalPrincNXP merged commit 11f2a0a into EmbeddedRPC:develop Mar 7, 2023
@MichalPrincNXP
Copy link
Member

Thank you Dusan for the effort and sorry for the compilation with the merge.

@Hadatko Hadatko deleted the feature/VSbuild branch March 7, 2023 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants