Skip to content

Commit

Permalink
cherry pick r13 lg orchestrator dialog (#1199)
Browse files Browse the repository at this point in the history
* Switch to axios to support proxy server when merging. (#1190)

* Switch to axios to support proxy server when merging.
Normalize sorting to reduce variation.

* modify https proxy setting

* refactor

* fix lint

* fix lint

Co-authored-by: Chris McConnell <chrimc>
Co-authored-by: cosmicshuai <shuai_uf@outlook.com>

* Update orchestrator-core reference to 4.13.0 + fix for orchestrator:add (#1197)

* Update package.json

* Update datasourcehelper.ts

* Update add.ts

* Update pnpm-lock.yaml

* Update botbuilder-lg to 4.13.0 (#1198)

Co-authored-by: Chris McConnell <chrimc@microsoft.com>
Co-authored-by: cosmicshuai <shuai_uf@outlook.com>
Co-authored-by: Tien Suwandy <tiens@microsoft.com>
  • Loading branch information
4 people committed Apr 15, 2021
1 parent bf75952 commit 6ad0e74
Show file tree
Hide file tree
Showing 19 changed files with 873 additions and 493 deletions.
20 changes: 20 additions & 0 deletions .vscode/launch.json
Expand Up @@ -157,6 +157,26 @@
"./packages/lu/lib/**"
]
},
{
"type": "node",
"request": "launch",
"name": "Dialog merge root-package schema",
"preLaunchTask": "${defaultBuildTask}",
"program": "${workspaceFolder}/packages/dialog/bin/run",
"outputCapture": "std",
"outFiles": [
"./packages/dialog/lib/**"
],
"args": [
"dialog:merge",
"npm/node_modules/root-package/package.json",
"-o",
"oracles/root-package",
"--verbose"
],
"internalConsoleOptions": "openOnSessionStart",
"cwd": "${workspaceFolder}/packages/dialog/test/commands/dialog/"
},
{
"type": "node",
"request": "launch",
Expand Down

0 comments on commit 6ad0e74

Please sign in to comment.