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.

Sign up for GitHub

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

Jump to bottom

fix: azure publish failed #4423

Merged
merged 3 commits into from
Oct 19, 2020
Merged

fix: azure publish failed #4423

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b266a27
fix azure publish
lei9444 Oct 19, 2020
4e6b980
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
lei9444 Oct 19, 2020
d0ba695
Merge branch 'main' into azurepublish
cwhitten Oct 19, 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
2 changes: 1 addition & 1 deletion Composer/packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@bfc/lg-languageserver": "*",
"@bfc/lu-languageserver": "*",
"@bfc/shared": "*",
"@microsoft/bf-dispatcher": "^4.11.0-beta.20201015.008a3a4",
"@microsoft/bf-dispatcher": "^4.11.0-beta.20201016.393c6b2",
"@microsoft/bf-generate-library": "^4.10.0-daily.20201015.174962",
"@microsoft/bf-lu": "^4.11.0-dev.20201013.7ccb128",
"archiver": "^5.0.2",
Expand Down
8 changes: 4 additions & 4 deletions Composer/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2980,10 +2980,10 @@
fs-extra "^7.0.1"
tslib "~1.10.0"

"@microsoft/bf-dispatcher@^4.11.0-beta.20201015.008a3a4":
version "4.11.0-beta.20201015.008a3a4"
resolved "https://registry.yarnpkg.com/@microsoft/bf-dispatcher/-/bf-dispatcher-4.11.0-beta.20201015.008a3a4.tgz#a80b68b8a123653ae52e35cde25cb2d1d1b98390"
integrity sha512-EN1hdAKSh8siN4UDuhMsM5QJtVlAj5X6peiXB8z18rPNL7oyGUFzgEfUoQ9ZqfWpRUasz1Zj8sAyoFS76NpkGQ==
"@microsoft/bf-dispatcher@^4.11.0-beta.20201016.393c6b2":
version "4.11.0-beta.20201016.393c6b2"
resolved "https://registry.yarnpkg.com/@microsoft/bf-dispatcher/-/bf-dispatcher-4.11.0-beta.20201016.393c6b2.tgz#7dab414752f8711fed37ae5625c38fdd0192eddb"
integrity sha512-pR1vVy17riuTos33IvQfDCmGG8xFmNoPUEb376kXITTtugNWVXgsD62P+thk0EAeegr7lCohNk+Zy3rfJ9lgvQ==
dependencies:
"@microsoft/bf-lu" next
"@oclif/command" "~1.5.19"
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-dev.20201013.7ccb128",
"@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/luisAndQnA.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export class LuisAndQnaPublish {
// Assign the appropriate account to each of the applicable LUIS apps for this bot.
// DOCS HERE: https://westus.dev.cognitive.microsoft.com/docs/services/5890b47c39e2bb17b84a55ff/operations/5be32228e8473de116325515
for (const dialogKey in luisAppIds) {
const luisAppId = luisAppIds[dialogKey];
const luisAppId = luisAppIds[dialogKey].appId;
this.logger({
status: BotProjectDeployLoggerType.DEPLOY_INFO,
message: `Assigning to luis app id: ${luisAppId}`,
Expand Down
25 changes: 25 additions & 0 deletions extensions/azurePublish/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,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-dev.20201013.7ccb128":
version "4.11.0-dev.20201014.d8a6b54"
resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.11.0-dev.20201014.d8a6b54.tgz#59bdb6e94e54307f76ccadd606ca9e61b6ee4aed"
Expand Down Expand Up @@ -877,6 +899,9 @@ buffer@^5.1.0, buffer@^5.5.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
dependencies:
base64-js "^1.0.2"
ieee754 "^1.1.4"

cardinal@^2.1.1:
version "2.1.1"
Expand Down
2 changes: 1 addition & 1 deletion extensions/runtimes/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default async (composer: any): Promise<void> => {
key: 'csharp-azurewebapp',
name: 'C#',
startCommand: 'dotnet run --project azurewebapp',
path: path.resolve(__dirname, '../../../../runtime/dotnet'),
path: path.resolve(__dirname, '../../../runtime/dotnet'),
build: async (runtimePath: string, _project: any) => {
composer.log(`BUILD THIS C# PROJECT! at ${runtimePath}...`);
composer.log('Run dotnet user-secrets init...');
Expand Down