Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 3cb034f

Browse files
Batta32VictorGrycuk
authored and
lauren-mills
committed
[TypeScript] Migrate latest changes of ARM & deploy scripts, update [email protected] (#3443)
* Update BotBuilder version in both templates * Update BotBuilder version in both samples * Update BotBuilder in Sample Assistant * Update BotBuilder version in Sample Skill * Update BotBuilder in Bot Solutions * Update scripts * declaring $appName in UpdateLUIS * Fix to ARM Template to respect useComosDb on database * Fix deploy scripts with PowerShell Core 7.1 * Update QnA Knowledgebase naming logic in qna_functions.ps1 * Fix update of template.json for VA and Skill * Integrate [email protected] * Replace luisApp.name with appName Co-authored-by: Victor Grycuk <[email protected]> Co-authored-by: Victor <[email protected]>
1 parent 03eab77 commit 3cb034f

File tree

22 files changed

+2818
-1293
lines changed

22 files changed

+2818
-1293
lines changed

‎sdk/typescript/libraries/bot-solutions/package-lock.json‎

Lines changed: 951 additions & 402 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/typescript/libraries/bot-solutions/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
"@azure/cognitiveservices-luis-authoring": "^2.1.0",
2727
"adaptivecards": "^1.1.3",
2828
"azure-cognitiveservices-contentmoderator": "^4.0.0",
29-
"botbuilder": "^4.9.0",
30-
"botbuilder-ai": "^4.9.0",
31-
"botbuilder-azure": "^4.9.0",
32-
"botbuilder-dialogs": "^4.9.0",
33-
"botframework-config": "^4.9.0",
34-
"botframework-connector": "^4.9.0",
35-
"botbuilder-lg": "^4.9.0",
29+
"botbuilder": "^4.9.2",
30+
"botbuilder-ai": "^4.9.2",
31+
"botbuilder-azure": "^4.9.2",
32+
"botbuilder-dialogs": "^4.9.2",
33+
"botframework-config": "^4.9.2",
34+
"botframework-connector": "^4.9.2",
35+
"botbuilder-lg": "^4.9.2",
3636
"dayjs": "1.8.17",
3737
"jwks-rsa": "1.5.0",
3838
"ms-rest-azure": "^2.5.0",

‎templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/_package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"dependencies": {
2222
"@microsoft/microsoft-graph-client": "^1.3.0",
2323
"@microsoft/microsoft-graph-types": "^1.5.0",
24-
"botbuilder": "^4.9.0",
25-
"botbuilder-ai": "^4.9.0",
26-
"botbuilder-applicationinsights": "^4.9.0",
27-
"botbuilder-azure": "^4.9.0",
28-
"botbuilder-dialogs": "^4.9.0",
29-
"botbuilder-lg": "^4.9.0",
24+
"botbuilder": "^4.9.2",
25+
"botbuilder-ai": "^4.9.2",
26+
"botbuilder-applicationinsights": "^4.9.2",
27+
"botbuilder-azure": "^4.9.2",
28+
"botbuilder-dialogs": "^4.9.2",
29+
"botbuilder-lg": "^4.9.2",
3030
"bot-solutions": "^1.0.0",
31-
"botframework-config": "^4.9.0",
32-
"botframework-connector": "^4.9.0",
31+
"botframework-config": "^4.9.2",
32+
"botframework-connector": "^4.9.2",
3333
"i18next": "^15.0.6",
3434
"i18next-node-fs-backend": "^2.1.1",
3535
"restify": "^8.5.1"

‎templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/deployment/resources/template.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@
216216
"options": {
217217
"throughput": "[parameters('cosmosDbDatabaseThroughput')]"
218218
}
219-
}
219+
},
220+
"condition": "[parameters('useCosmosDb')]"
220221
},
221222
{
222223
"comments": "storage account",

‎templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/deployment/scripts/deploy.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ if (-not $armLuisAuthoringRegion) {
133133
}
134134

135135
# Get timestamp
136-
$timestamp = Get-Date -f MMddyyyyHHmmss
136+
$timestamp = Get-Date -Format MMddyyyyHHmmss
137137

138138
# Create resource group
139139
Write-Host "> Creating resource group ..." -NoNewline

‎templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/deployment/scripts/luis_functions.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ function UpdateLUIS ($lu_file, $appId, $version, $language, $region, $authoringK
6666
{
6767
$id = $lu_file.BaseName
6868
$outFile = Join-Path $lu_file.DirectoryName "$($id).json"
69+
$appName = "$($name)$($culture)_$($id)"
6970

7071
if ($gov)
7172
{
@@ -86,7 +87,7 @@ function UpdateLUIS ($lu_file, $appId, $version, $language, $region, $authoringK
8687

8788
Write-Host "> Parsing $($language) $($id) LU file ..." -NoNewline
8889
($output = bf luis:convert `
89-
--name $luisApp.name `
90+
--name $appName `
9091
--in $lu_file `
9192
--culture $luisApp.culture `
9293
--out $outFile `

‎templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/deployment/scripts/qna_functions.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function DeployKB ($name, $luFile, $qnaSubscriptionKey, $qnaEndpoint, $language,
2323

2424
while ($retryAttemptsRemaining -ge 0) {
2525
$bfconfig = (bf qnamaker:kb:create `
26-
--name $name `
26+
--name "$($name)_$($id)" `
2727
--subscriptionKey $qnaSubscriptionKey `
2828
--endpoint $qnaEndpoint `
2929
--in $(Join-Path $outFolder $outFile) | ConvertFrom-Json) 2>> $log

‎templates/typescript/generator-bot-virtualassistant/generators/skill/templates/sample-skill/_package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"test-coverage-ci": "nyc --reporter=cobertura mocha --reporter mocha-junit-reporter"
2020
},
2121
"dependencies": {
22-
"botbuilder": "^4.9.0",
23-
"botbuilder-ai": "^4.9.0",
24-
"botbuilder-applicationinsights": "^4.9.0",
25-
"botbuilder-azure": "^4.9.0",
26-
"botbuilder-dialogs": "^4.9.0",
22+
"botbuilder": "^4.9.2",
23+
"botbuilder-ai": "^4.9.2",
24+
"botbuilder-applicationinsights": "^4.9.2",
25+
"botbuilder-azure": "^4.9.2",
26+
"botbuilder-dialogs": "^4.9.2",
2727
"bot-solutions": "^1.0.0",
28-
"botframework-config": "^4.9.0",
29-
"botframework-connector": "^4.9.0",
28+
"botframework-config": "^4.9.2",
29+
"botframework-connector": "^4.9.2",
3030
"dotenv": "^6.0.0",
3131
"i18next": "^15.0.6",
3232
"i18next-node-fs-backend": "^2.1.1",

‎templates/typescript/generator-bot-virtualassistant/generators/skill/templates/sample-skill/deployment/resources/template.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@
166166
"options": {
167167
"throughput": "[parameters('cosmosDbDatabaseThroughput')]"
168168
}
169-
}
169+
},
170+
"condition": "[parameters('useCosmosDb')]"
170171
},
171172
{
172173
"comments": "storage account",

‎templates/typescript/generator-bot-virtualassistant/generators/skill/templates/sample-skill/deployment/scripts/deploy.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ if (-not $armLuisAuthoringRegion) {
133133
}
134134

135135
# Get timestamp
136-
$timestamp = Get-Date -f MMddyyyyHHmmss
136+
$timestamp = Get-Date -Format MMddyyyyHHmmss
137137

138138
# Create resource group
139139
Write-Host "> Creating resource group ..." -NoNewline

0 commit comments

Comments
 (0)