updates to VA and Skill templates

Author: lauren-mills

templates/csharp/Skill/Skill/Deployment/Resources/template.json

@@ -166,7 +166,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",

templates/csharp/Skill/Skill/Deployment/Scripts/deploy.ps1

@@ -210,7 +210,7 @@ if (-not $armLuisAuthoringRegion) {
 }
 
 # Get timestamp
-$timestamp = Get-Date -f MMddyyyyHHmmss
+$timestamp = Get-Date -Format MMddyyyyHHmmss
 
 # Create resource group
 Write-Host "> Creating resource group ..." -NoNewline

templates/csharp/Skill/Skill/Deployment/Scripts/luis_functions.ps1

@@ -57,7 +57,7 @@ function UpdateLUIS ($luFile, $appId, $endpoint, $subscriptionKey, $culture, $ve
 {
    $id = $luFile.BaseName
     $outFile = Join-Path $luFile.DirectoryName "$($id).json"
-
+    $appName = "$($name)$($culture)_$($id)"
 
     Write-Host "> Getting hosted $($culture) $($id) LUIS model settings..." -NoNewline
     $luisApp = bf luis:application:show `
@@ -161,4 +161,4 @@ function RunLuisGen($luFile, $outName, $outFolder, $log)
         --className "$($outName)Luis" `
         --out $outFolder `
         --force 2>> $log | Out-Null
-}
+}

templates/csharp/Skill/Skill/Deployment/Scripts/publish.ps1

@@ -50,14 +50,13 @@ if (-not $resourceGroup) {
     $resourceGroup = Read-Host "? Bot Resource Group"
 }
 
+# Get path to csproj file
+$projFile = Get-ChildItem $projFolder `
+    | Where-Object {$_.extension -eq ".csproj" } `
+    | Select-Object -First 1
+
 # Check for existing deployment files
 if (-not (Test-Path (Join-Path $projFolder '.deployment'))) {
-
-	# Get path to csproj file
-	$projFile = Get-ChildItem $projFolder `
-		| Where-Object {$_.extension -eq ".csproj" } `
-		| Select-Object -First 1
-
 	# Add needed deployment files for az
 	az bot prepare-deploy --lang Csharp --code-dir $projFolder --proj-file-path $projFile.name --output json | Out-Null
 }
@@ -70,7 +69,7 @@ if (Test-Path $zipPath) {
 
 # Perform dotnet publish step ahead of zipping up
 $publishFolder = $(Join-Path $projFolder 'bin\release\netcoreapp3.0')
-dotnet publish -c release -o $publishFolder -v q > $logFile
+dotnet publish $projFile -c release -o $publishFolder -v q > $logFile
 
 if($?) {
     # Compress source code

templates/csharp/Skill/Skill/Deployment/Scripts/qna_functions.ps1

@@ -23,7 +23,7 @@ function DeployKB ($name, $luFile, $qnaSubscriptionKey, $qnaEndpoint, $language,
 
     while ($retryAttemptsRemaining -ge 0) {
 		$bfconfig = (bf qnamaker:kb:create `
-			--name $name `
+			--name "$($name)_$($id)" `
 			--subscriptionKey $qnaSubscriptionKey `
             --endpoint $qnaEndpoint `
 			--in $(Join-Path $outFolder $outFile) | ConvertFrom-Json) 2>> $log

templates/csharp/Skill/Skill/Skill.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

templates/csharp/VA/VA/Deployment/Resources/template.json

@@ -216,7 +216,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",

templates/csharp/VA/VA/Deployment/Scripts/deploy.ps1

@@ -210,7 +210,7 @@ if (-not $armLuisAuthoringRegion) {
 }
 
 # Get timestamp
-$timestamp = Get-Date -f MMddyyyyHHmmss
+$timestamp = Get-Date -Format MMddyyyyHHmmss
 
 # Create resource group
 Write-Host "> Creating resource group ..." -NoNewline

templates/csharp/VA/VA/Deployment/Scripts/luis_functions.ps1

@@ -57,7 +57,7 @@ function UpdateLUIS ($luFile, $appId, $endpoint, $subscriptionKey, $culture, $ve
 {
    $id = $luFile.BaseName
     $outFile = Join-Path $luFile.DirectoryName "$($id).json"
-
+    $appName = "$($name)$($culture)_$($id)"
 
     Write-Host "> Getting hosted $($culture) $($id) LUIS model settings..." -NoNewline
     $luisApp = bf luis:application:show `
@@ -161,4 +161,4 @@ function RunLuisGen($luFile, $outName, $outFolder, $log)
         --className "$($outName)Luis" `
         --out $outFolder `
         --force 2>> $log | Out-Null
-}
+}

templates/csharp/VA/VA/Deployment/Scripts/publish.ps1

@@ -50,14 +50,13 @@ if (-not $resourceGroup) {
     $resourceGroup = Read-Host "? Bot Resource Group"
 }
 
+# Get path to csproj file
+$projFile = Get-ChildItem $projFolder `
+    | Where-Object {$_.extension -eq ".csproj" } `
+    | Select-Object -First 1
+
 # Check for existing deployment files
 if (-not (Test-Path (Join-Path $projFolder '.deployment'))) {
-
-	# Get path to csproj file
-	$projFile = Get-ChildItem $projFolder `
-		| Where-Object {$_.extension -eq ".csproj" } `
-		| Select-Object -First 1
-
 	# Add needed deployment files for az
 	az bot prepare-deploy --lang Csharp --code-dir $projFolder --proj-file-path $projFile.name --output json | Out-Null
 }
@@ -70,7 +69,7 @@ if (Test-Path $zipPath) {
 
 # Perform dotnet publish step ahead of zipping up
 $publishFolder = $(Join-Path $projFolder 'bin\release\netcoreapp3.0')
-dotnet publish -c release -o $publishFolder -v q > $logFile
+dotnet publish $projFile -c release -o $publishFolder -v q > $logFile
 
 if($?) {
     # Compress source code