Merge pull request #3454 from microsoft/lamil/1.0.1

lauren-mills · web-flow · commit 01117d684a48 · 2020-06-08T13:32:43.000-07:00
VA and Skill template updates for 1.0.1
diff --git a/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj b/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
@@ -21,7 +21,7 @@
     <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.Solutions" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/csharp/skill/SkillSample/SkillSample.csproj b/samples/csharp/skill/SkillSample/SkillSample.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>
diff --git a/templates/csharp/Skill/Skill/Deployment/Resources/template.json b/templates/csharp/Skill/Skill/Deployment/Resources/template.json
@@ -166,7 +166,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",
diff --git a/templates/csharp/Skill/Skill/Deployment/Scripts/deploy.ps1 b/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
diff --git a/templates/csharp/Skill/Skill/Deployment/Scripts/luis_functions.ps1 b/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
-}
+}
diff --git a/templates/csharp/Skill/Skill/Deployment/Scripts/publish.ps1 b/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
diff --git a/templates/csharp/Skill/Skill/Deployment/Scripts/qna_functions.ps1 b/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
diff --git a/templates/csharp/Skill/Skill/Skill.csproj b/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>
diff --git a/templates/csharp/VA/VA/Deployment/Resources/template.json b/templates/csharp/VA/VA/Deployment/Resources/template.json
@@ -216,7 +216,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",
diff --git a/templates/csharp/VA/VA/Deployment/Scripts/deploy.ps1 b/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
diff --git a/templates/csharp/VA/VA/Deployment/Scripts/luis_functions.ps1 b/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
-}
+}
diff --git a/templates/csharp/VA/VA/Deployment/Scripts/publish.ps1 b/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
diff --git a/templates/csharp/VA/VA/Deployment/Scripts/qna_functions.ps1 b/templates/csharp/VA/VA/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/templates/csharp/VA/VA/TokenExchange/TokenExchangeSkillHandler.cs b/templates/csharp/VA/VA/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/templates/csharp/VA/VA/VA.csproj b/templates/csharp/VA/VA/VA.csproj
@@ -21,7 +21,7 @@
     <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.Solutions" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@`
`166`	`166`	`"options": {`
`167`	`167`	`"throughput": "[parameters('cosmosDbDatabaseThroughput')]"`
`168`	`168`	`}`
`169`		`- }`
	`169`	`+ },`
	`170`	`+ "condition": "[parameters('useCosmosDb')]"`
`170`	`171`	`},`
`171`	`172`	`{`
`172`	`173`	`"comments": "storage account",`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ if (-not $armLuisAuthoringRegion) {`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`# Get timestamp`
`213`		`-$timestamp = Get-Date -f MMddyyyyHHmmss`
	`213`	`+$timestamp = Get-Date -Format MMddyyyyHHmmss`
`214`	`214`
`215`	`215`	`# Create resource group`
`216`	`216`	`Write-Host "> Creating resource group ..." -NoNewline`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,8 @@`
`216`	`216`	`"options": {`
`217`	`217`	`"throughput": "[parameters('cosmosDbDatabaseThroughput')]"`
`218`	`218`	`}`
`219`		`- }`
	`219`	`+ },`
	`220`	`+ "condition": "[parameters('useCosmosDb')]"`
`220`	`221`	`},`
`221`	`222`	`{`
`222`	`223`	`"comments": "storage account",`