Merge pull request #3458 from microsoft/next

1.0.1 Release

Author: lauren-mills

.gitignore

@@ -361,6 +361,7 @@ ASALocalRun/
 **/.deployment
 **/ComposerDialogs/generated
 **/ComposerDialogs/settings
+**/VirtualAssistant/generated
 
 # Zip files
 *.7z

docs/_docs/skills/tutorials/create-skill/csharp/7-add-your-skill.md

@@ -22,7 +22,7 @@ To add your new Skill to your assistant we provide the [botskills](https://www.n
 Run the following command from a command prompt **within the directory of your assistant/Bot**. 
 
 ```bash
-botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --cs
+botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --cs --luisFolder "path-to-lu-folder"
 ```
 Remember to re-publish your assistant to Azure after you’ve added a Skill unless you plan on testing locally only.
 

docs/_docs/skills/tutorials/create-skill/typescript/6-add-your-skill.md

@@ -22,7 +22,7 @@ To add your new Skill to your assistant we provide the [botskills](https://www.n
 Run the following command from a command prompt **within the directory of your assistant/Bot**. 
 
 ```bash
-botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --ts
+botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --ts --luisFolder "path-to-lu-folder"
 ```
 
 Remember to re-publish your assistant to Azure after you’ve added a Skill unless you plan on testing locally only.

samples/csharp/assistants/enterprise-assistant/VirtualAssistantSample/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

samples/csharp/assistants/enterprise-assistant/VirtualAssistantSample/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

samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample/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

samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample/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

samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/Deployment/Resources/template.json

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

samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/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

samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/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