Skip to content

Commit

Permalink
4.9.1 cherry pick (#821)
Browse files Browse the repository at this point in the history
* Update dialog:merge tests around projects (#784)

* Updating tests.

* Merge branch '4.9' into chrimc/test
Add nuget semver.

* Change test to avoid checking path parts.

* Follow package.json dependencies.

* Fix merge match.

* fix (#792)

Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@MININT-GO8OQNV.redmond.corp.microsoft.com>

* Fix to remove validation. (#793)

Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@Vishwacs-MBP.guest.corp.microsoft.com>

* fix the priority of stdin and in (#796)

* fix the priority of stdin and in

* fix the same issue in bf luis:generate

* repalce all priority between stdin and --in

* fix logic

* remove only in luis build tests

* Fix for direct luis direct version publish  (#798)

* Remove LUIS sdk and replace with direct http request

* Removing unused line of code

* fix (#802)

Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@MININT-GO8OQNV.redmond.corp.microsoft.com>

* fix (#803)

Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@MININT-GO8OQNV.redmond.corp.microsoft.com>
Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>

* Various fixes to bf-lu (#813)

* various fixes.

* fixes

* updates

* updates

* fix for luis:build issue.

* updates for nDepth reference resolver.

* Update luis:build to create result using luis()

Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@MININT-GO8OQNV.redmond.corp.microsoft.com>
Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@Vishwacs-MBP.guest.corp.microsoft.com>
Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@za-lyshange1811.africa.corp.microsoft.com>

* Set build version

* resolve qnamaker build issues (#812)

* write out endpointKeys to console for qnamaker build

* qnamaker:build do not write .dialog if no --out is specified

* fix typo

Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>

* resolve luis build issues (#804)

* luis build do not write dialogs if no --out specified

* qnamaker:build do not write .dialog if no --out is specified

* fix suffix issue in luis build

* revert qnamaker changes in this PR and add to another

* fix typo

Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>

* Adding missing code lost in merges

* Fixing merge

* Adding missing test files

* Fixing readme files

Co-authored-by: Chris McConnell <chrimc@microsoft.com>
Co-authored-by: Vishwac Sena Kannan <vishwack@hotmail.com>
Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@MININT-GO8OQNV.redmond.corp.microsoft.com>
Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@Vishwacs-MBP.guest.corp.microsoft.com>
Co-authored-by: Fei Chen <43032123+feich-ms@users.noreply.github.com>
Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@za-lyshange1811.africa.corp.microsoft.com>
  • Loading branch information
7 people authored May 27, 2020
1 parent ae06f14 commit f23dae0
Show file tree
Hide file tree
Showing 63 changed files with 1,538 additions and 514 deletions.
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@
"dialog:merge",
"tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/*.csproj",
"-o",
"${env:TEMP}/app.schema"
"${env:TEMP}/app.schema",
"--verbose"
],
"internalConsoleOptions": "openOnSessionStart",
"cwd": "${workspaceFolder}/../botbuilder-dotnet"
Expand Down
2 changes: 1 addition & 1 deletion build/botframework-cli-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pr:
jobs:
- job: CLI
variables:
buildVersion: '4.9.0'
buildVersion: '4.9.1-RC0'
_version: ${{coalesce(variables.version, variables.buildVersion)}}

steps:
Expand Down
2 changes: 1 addition & 1 deletion build/botframework-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pr:
jobs:
- job: CLI
variables:
buildVersion: '4.9.0'
buildVersion: '4.9.1-RC0'
_version: ${{coalesce(variables.version, variables.buildVersion)}}

steps:
Expand Down
136 changes: 131 additions & 5 deletions common/config/rush/pnpm-lock.yaml

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

Loading

0 comments on commit f23dae0

Please sign in to comment.