Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Fixed csproj reference in solution, and fixed folder include#3258

Merged
cwhitten merged 8 commits intomicrosoft:masterfrom
bartbilliet:bartbilliet-patch-1
Jun 3, 2020
Merged

fix: Fixed csproj reference in solution, and fixed folder include#3258
cwhitten merged 8 commits intomicrosoft:masterfrom
bartbilliet:bartbilliet-patch-1

Conversation

@bartbilliet
Copy link
Contributor

@bartbilliet bartbilliet commented Jun 1, 2020 •
edited
Loading

Description

You will see that the partial schema (MultiplyDialog.schema inside customaction/Schema) has been appended to the default sdk.schema file to generate one single consolidated sdk.schema file.

#minor

@bartbilliet bartbilliet changed the title Fixed csproj reference in solution, and fixed folder include Fix: Fixed csproj reference in solution, and fixed folder include Jun 1, 2020
@bartbilliet bartbilliet changed the title Fix: Fixed csproj reference in solution, and fixed folder include fix: Fixed csproj reference in solution, and fixed folder include Jun 1, 2020
@coveralls
Copy link

coveralls commented Jun 1, 2020 •
edited
Loading

Coverage Status

Coverage remained the same at 38.907% when pulling d0d628d on bartbilliet:bartbilliet-patch-1 into 863d738 on microsoft:master.

@a-b-r-o-w-n
Copy link
Contributor

a-b-r-o-w-n commented Jun 1, 2020

@zxyanliu Would you be able to update the error in the documentation for this?

@zxyanliu
Copy link
Contributor

zxyanliu commented Jun 1, 2020

@a-b-r-o-w-n I think I can.

luhan2017
luhan2017 approved these changes Jun 3, 2020
View reviewed changes
Copy link
Contributor

@luhan2017 luhan2017 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this fix :)

@bartbilliet
Copy link
Contributor Author

bartbilliet commented Jun 3, 2020

@luhan2017 Happy to help out :)

@a-b-r-o-w-n a-b-r-o-w-n added the Approved to merge approved, waiting to be merged label Jun 3, 2020
@cwhitten cwhitten merged commit 2eba21d into microsoft:master Jun 3, 2020
@bartbilliet bartbilliet deleted the bartbilliet-patch-1 branch June 3, 2020 17:55
@a-b-r-o-w-n a-b-r-o-w-n mentioned this pull request Jun 3, 2020
Merged
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
@bartbilliet @zxyanliu
@luhan2017 @a-b-r-o-w-n
fix: Fixed csproj reference in solution, and fixed folder include (mi…
ee6a18c 
…crosoft#3258)

* Fixed csproj reference in solution, and fixed folder include

* fix: Fixed csproj reference in solution, and fixed folder include

Co-authored-by: Bart Billiet <bart.billiet@sfpd.fgov.be>
Co-authored-by: Yan Liu <32497439+zxyanliu@users.noreply.github.com>
Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@benbrown benbrown Awaiting requested review from benbrown benbrown is a code owner

@boydc2014 boydc2014 Awaiting requested review from boydc2014 boydc2014 is a code owner

@carlosscastro carlosscastro Awaiting requested review from carlosscastro

1 more reviewer

@luhan2017 luhan2017 luhan2017 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@luhan2017 luhan2017

Labels

Approved to merge approved, waiting to be merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@bartbilliet @coveralls @a-b-r-o-w-n @zxyanliu @luhan2017 @cwhitten