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

fix: Bot publish to azure failed in cross train step #4660

Merged
boydc2014 merged 4 commits into from
Nov 4, 2020
Merged

fix: Bot publish to azure failed in cross train step #4660

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34ad7f0
fix: azure publish fail
lei9444 Nov 4, 2020
cfcf41c
Merge branch 'main' into azurepublish
lei9444 Nov 4, 2020
933dbaa
Merge branch 'main' into azurepublish
boydc2014 Nov 4, 2020
2aafa71
Merge branch 'main' into azurepublish
boydc2014 Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Composer/packages/server/src/models/bot/botProject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ export class BotProject implements IBotProject {
skills: this.skills,
diagnostics: this.diagnostics,
settings: this.settings,
filesWithoutRecognizers: Array.from(this.files.values()).filter(({ name }) => !isRecognizer(name)),
};
};

Expand Down
2 changes: 1 addition & 1 deletion extensions/azurePublish/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@bfc/indexers": "../../Composer/packages/lib/indexers",
"@bfc/shared": "../../Composer/packages/lib/shared",
"@botframework-composer/types": "0.0.1",
"@microsoft/bf-lu": "^4.11.0-rc.20201030.a9f9b96",
"@microsoft/bf-lu": "4.11.0-dev.20201005.7e5e1b8",
"@microsoft/bf-luis-cli": "^4.10.0-dev.20200721.8bb21ac",
"@types/archiver": "3.1.0",
"@types/fs-extra": "8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion extensions/azurePublish/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export default async (composer: ExtensionRegistration): Promise<void> => {
*/
private init = async (project: any, srcTemplate: string, resourcekey: string, runtime: any) => {
// point to the declarative assets (possibly in remote storage)
const botFiles = project.getProject().files;
const botFiles = project.getProject().filesWithoutRecognizers;
const botFolder = this.getBotFolder(resourcekey, this.mode);
const runtimeFolder = this.getRuntimeFolder(resourcekey);

Expand Down
22 changes: 22 additions & 0 deletions extensions/azurePublish/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,28 @@
semver "^5.5.1"
tslib "^1.10.0"

"@microsoft/bf-lu@4.11.0-dev.20201005.7e5e1b8":
version "4.11.0-dev.20201005.7e5e1b8"
resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.11.0-dev.20201005.7e5e1b8.tgz#62f9a37bb8340456e41853e179f2941dab9dfc87"
integrity sha1-Yvmje7g0BFbkGFPhefKUHaud/Ic=
dependencies:
"@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1"
"@azure/ms-rest-azure-js" "2.0.1"
"@types/node-fetch" "~2.5.5"
antlr4 "^4.7.2"
chalk "2.4.1"
console-stream "^0.1.1"
deep-equal "^1.0.1"
delay "^4.3.0"
fs-extra "^8.1.0"
get-stdin "^6.0.0"
globby "^10.0.1"
intercept-stdout "^0.1.2"
lodash "^4.17.19"
node-fetch "~2.6.0"
semver "^5.5.1"
tslib "^1.10.0"

"@microsoft/bf-lu@^4.11.0-rc.20201030.a9f9b96":
version "4.11.0-rc.20201030.a9f9b96"
resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.11.0-rc.20201030.a9f9b96.tgz#9fcb2a18d66bcef74eabc98f06df4574215c402f"
Expand Down