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

[4.4] Miscellaneous template updates #1179

Merged
merged 16 commits into from
Apr 29, 2019
Merged

[4.4] Miscellaneous template updates #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ebc9f59
Fix captialization error with luis.cs files
lauren-mills Apr 25, 2019
28382c0
updated to latest packages
lauren-mills Apr 25, 2019
4f45af2
updated skill template packages
lauren-mills Apr 25, 2019
867b6c8
added languages param to deploy
lauren-mills Apr 25, 2019
fdef836
skill template updates
lauren-mills Apr 25, 2019
fbfcb19
include remove skill script in template
lauren-mills Apr 25, 2019
5ad7736
change general id in skill template
lauren-mills Apr 25, 2019
46bc279
updated deploy script to support multiple languages
lauren-mills Apr 25, 2019
41552b8
fixed skill template tests
lauren-mills Apr 26, 2019
daff7fc
added pwsh min version to scripts
lauren-mills Apr 26, 2019
7190b90
stopped breaking if skill exists
lauren-mills Apr 26, 2019
af76c71
added logic to clean storage account name
lauren-mills Apr 26, 2019
37f566b
updated skill template with clean storage account name
lauren-mills Apr 26, 2019
1cc4fbc
removed extra mainDialog singleton
lauren-mills Apr 26, 2019
e915c95
Merge branch '4.4' into lamil/4.4_skill_updates
lauren-mills Apr 26, 2019
cb102f2
Merge branch '4.4' into lamil/4.4_skill_updates
lauren-mills Apr 26, 2019
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 templates/Skill-Template/csharp/Sample/SkillSample.Tests/MainDialogTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ await GetTestFlow()
public async Task Test_Unhandled_Message()
{
await GetTestFlow()
.Send(string.Empty)
.Send(GeneralUtterances.None)
.AssertReply(DidntUnderstandMessage())
.StartTestAsync();
}
Expand Down
2 changes: 1 addition & 1 deletion templates/Skill-Template/csharp/Sample/SkillSample.Tests/SkillTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public virtual void Initialize()
{
LuisServices = new Dictionary<string, IRecognizer>
{
{ "general", GeneralTestUtil.CreateRecognizer() },
{ "General", GeneralTestUtil.CreateRecognizer() },
{ "skill", SkillTestUtil.CreateRecognizer() }
}
}
Expand Down
172 changes: 71 additions & 101 deletions ...s/Skill-Template/csharp/Sample/SkillSample.Tests/Utterances/GeneralUtterances.Designer.cs
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions templates/Skill-Template/csharp/Sample/SkillSample.Tests/Utterances/GeneralUtterances.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@
<data name="Help" xml:space="preserve">
<value>help</value>
</data>
<data name="None" xml:space="preserve">
<value>unknown</value>
</data>
<data name="Reject" xml:space="preserve">
<value>no</value>
</data>
Expand Down
9 changes: 5 additions & 4 deletions templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Resources/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
}
},
"variables": {
"botEndpoint": "[concat('https://', toLower(parameters('botWebAppName')), '.azurewebsites.net/api/messages')]"
"botEndpoint": "[concat('https://', toLower(parameters('botWebAppName')), '.azurewebsites.net/api/messages')]",
"cleanStorageAccountName": "[toLower(take(replace(replace(parameters('storageAccountName'), '-', ''), '_', ''), 24))]"
},
"resources": [
{
Expand Down Expand Up @@ -107,7 +108,7 @@
"type": "Microsoft.Storage/storageAccounts",
"kind": "StorageV2",
"apiVersion": "2018-07-01",
"name": "[parameters('storageAccountName')]",
"name": "[variables('cleanStorageAccountName')]",
"location": "[parameters('location')]",
"sku": {
"name": "Standard_LRS"
Expand Down Expand Up @@ -141,8 +142,8 @@
"location": "[parameters('location')]",
"properties": {
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', parameters('appServicePlanName'))]",
"webSocketsEnabled" : true,
"siteConfig": {
"webSocketsEnabled": true,
"appSettings": [
{
"name": "MicrosoftAppId",
Expand Down Expand Up @@ -200,7 +201,7 @@
"storage": {
"type": "object",
"value": {
"connectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccountName'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2018-07-01').keys[0].value, ';EndpointSuffix=core.windows.net')]",
"connectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('cleanStorageAccountName'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('cleanStorageAccountName')), '2018-07-01').keys[0].value, ';EndpointSuffix=core.windows.net')]",
"container": "transcripts"
}
},
Expand Down
2 changes: 2 additions & 0 deletions templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#Requires -Version 6

Param(
[string] $name,
[string] $resourceGroup,
Expand Down
2 changes: 2 additions & 0 deletions ...s/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy_cognitive_models.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#Requires -Version 6

Param(
[string] $name,
[string] $luisAuthoringRegion,
Expand Down
2 changes: 1 addition & 1 deletion templates/Skill-Template/csharp/Sample/SkillSample/Dialogs/MainDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public MainDialog(
var localeConfig = _services.CognitiveModelSets[locale];

// check general luis intent
localeConfig.LuisServices.TryGetValue("general", out var luisService);
localeConfig.LuisServices.TryGetValue("General", out var luisService);

if (luisService == null)
{
Expand Down
4 changes: 2 additions & 2 deletions templates/Skill-Template/csharp/Sample/SkillSample/SkillSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.4.0-preview27" />
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.0-preview27" />
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.4.0-preview35" />
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.0-preview35" />
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
Expand Down
Loading