Merge pull request microsoft#3458 from microsoft/next

1.0.1 Release
zhamppx97 · Jun 9, 2020 · a6b2b60 · a6b2b60
2 parents c013d77 + 1b09e31
commit a6b2b60
Show file tree

Hide file tree

Showing 65 changed files with 14,920 additions and 677 deletions.
diff --git a/.gitignore b/.gitignore
@@ -361,6 +361,7 @@ ASALocalRun/
 **/.deployment
 **/ComposerDialogs/generated
 **/ComposerDialogs/settings
+**/VirtualAssistant/generated
 
 # Zip files
 *.7z

diff --git a/docs/_docs/skills/tutorials/create-skill/csharp/7-add-your-skill.md b/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.
 

diff --git a/docs/_docs/skills/tutorials/create-skill/typescript/6-add-your-skill.md b/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.

diff --git a/...arp/assistants/enterprise-assistant/VirtualAssistantSample/Deployment/Scripts/publish.ps1 b/...arp/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

diff --git a/...sistants/enterprise-assistant/VirtualAssistantSample/Deployment/Scripts/qna_functions.ps1 b/...sistants/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

diff --git a/...rp/assistants/hospitality-assistant/VirtualAssistantSample/Deployment/Scripts/publish.ps1 b/...rp/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

diff --git a/...istants/hospitality-assistant/VirtualAssistantSample/Deployment/Scripts/qna_functions.ps1 b/...istants/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

diff --git a/...rp/assistants/virtual-assistant/VirtualAssistantSample/Deployment/Resources/template.json b/...rp/assistants/virtual-assistant/VirtualAssistantSample/Deployment/Resources/template.json
@@ -216,7 +216,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",

diff --git a/.../csharp/assistants/virtual-assistant/VirtualAssistantSample/Deployment/Scripts/deploy.ps1 b/.../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

diff --git a/...csharp/assistants/virtual-assistant/VirtualAssistantSample/Deployment/Scripts/publish.ps1 b/...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

diff --git a/.../assistants/virtual-assistant/VirtualAssistantSample/Deployment/Scripts/qna_functions.ps1 b/.../assistants/virtual-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

diff --git a/...tants/virtual-assistant/VirtualAssistantSample/TokenExchange/TokenExchangeSkillHandler.cs b/...tants/virtual-assistant/VirtualAssistantSample/TokenExchange/TokenExchangeSkillHandler.cs
@@ -15,6 +15,7 @@
 using Microsoft.Bot.Schema;
 using Microsoft.Bot.Solutions.Skills;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 
@@ -31,6 +32,7 @@ public class TokenExchangeSkillHandler : SkillHandler
         private readonly SkillConversationIdFactoryBase _conversationIdFactory;
 
         public TokenExchangeSkillHandler(
+            IServiceProvider serviceProvider,
             BotAdapter adapter,
             IBot bot,
             IConfiguration configuration,
@@ -39,14 +41,13 @@ public TokenExchangeSkillHandler(
             SkillHttpClient skillClient,
             ICredentialProvider credentialProvider,
             AuthenticationConfiguration authConfig,
-            ITokenExchangeConfig tokenExchangeConfig,
             IChannelProvider channelProvider = null,
             ILogger logger = null)
             : base(adapter, bot, conversationIdFactory, credentialProvider, authConfig, channelProvider, logger)
         {
             _adapter = adapter;
             _tokenExchangeProvider = adapter as IExtendedUserTokenProvider;
-            _tokenExchangeConfig = tokenExchangeConfig;
+            _tokenExchangeConfig = serviceProvider.GetService<ITokenExchangeConfig>();
             _skillsConfig = skillsConfig;
             _skillClient = skillClient;
             _conversationIdFactory = conversationIdFactory;

diff --git a/.../csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj b/.../csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
@@ -14,14 +14,14 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.1" />
-    <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.Builder.LanguageGeneration" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/csharp/skill/SkillSample/Deployment/Resources/template.json b/samples/csharp/skill/SkillSample/Deployment/Resources/template.json
@@ -166,7 +166,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",

diff --git a/samples/csharp/skill/SkillSample/Deployment/Scripts/deploy.ps1 b/samples/csharp/skill/SkillSample/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

diff --git a/samples/csharp/skill/SkillSample/Deployment/Scripts/publish.ps1 b/samples/csharp/skill/SkillSample/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

diff --git a/samples/csharp/skill/SkillSample/Deployment/Scripts/qna_functions.ps1 b/samples/csharp/skill/SkillSample/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

diff --git a/samples/csharp/skill/SkillSample/SkillSample.csproj b/samples/csharp/skill/SkillSample/SkillSample.csproj
@@ -9,13 +9,13 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.1" />
-    <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.Builder.AI.Luis" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sdk/csharp/libraries/microsoft.bot.solutions/Microsoft.Bot.Solutions.csproj b/sdk/csharp/libraries/microsoft.bot.solutions/Microsoft.Bot.Solutions.csproj
@@ -42,15 +42,15 @@
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.2" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Configuration" Version="4.9.1" />
-    <PackageReference Include="Microsoft.Bot.Schema" Version="4.9.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Configuration" Version="4.9.3" />
+    <PackageReference Include="Microsoft.Bot.Schema" Version="4.9.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />