[TypeScript][Samples] Generate samples with the latest version of the generator

templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/test/helpers/botTestBase.js

@@ -80,6 +80,7 @@ async function getTestAdapterDefault(settings) {
     };
     const botServices = new BotServices(botSettings);
     const onboardingStateAccessor = userState.createProperty('OnboardingState');
+    const skillContextAccessor = userState.createProperty('skillContext');
     const onboardingDialog = new OnboardingDialog(botServices, onboardingStateAccessor, telemetryClient)  
     const escalateDialog = new EscalateDialog(botServices, telemetryClient);
     const cancelDialog = new CancelDialog();
@@ -91,6 +92,7 @@ async function getTestAdapterDefault(settings) {
         escalateDialog,
         cancelDialog,
         skillDialogs,
+        skillContextAccessor,
         onboardingStateAccessor,
         telemetryClient
     );

templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/deployment/resources/template.json

@@ -181,13 +181,6 @@
                 "https://hosting.onecloud.azure-test.net/"
             ]
           }
-        ],
-        "cors": {
-          "allowedOrigins": [
-              "https://botservice.hosting.portal.azure.net",
-              "https://botservice-ms.hosting.portal.azure.net",
-              "https://hosting.onecloud.azure-test.net/"
-          ]
         }
       },
       "dependsOn": [
@@ -212,26 +205,16 @@
         "developerAppInsightsApplicationId": "[reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).ApplicationId]"
       }
     },
-    "dependsOn": [
-      "[resourceId('Microsoft.Web/serverfarms', parameters('appServicePlanName'))]"
-    ]
-  },
-  {
-    "comments": "bot service",
-    "type": "Microsoft.BotService/botServices",
-    "kind": "sdk",
-    "apiVersion": "2018-07-12",
-    "name": "[parameters('botServiceName')]",
-    "location": "global",
-    "sku": {
-      "name": "[parameters('botServiceSku')]"
-    },
-    "properties": {
-      "displayName": "[parameters('botServiceName')]",
-      "endpoint": "[variables('botEndpoint')]",
-      "msaAppId": "[parameters('microsoftAppId')]",
-      "developerAppInsightKey": "[reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).InstrumentationKey]",
-      "developerAppInsightsApplicationId": "[reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).ApplicationId]"
+    {
+      "comments": "Cognitive service key for all LUIS apps.",
+      "type": "Microsoft.CognitiveServices/accounts",
+      "kind": "LUIS",
+      "apiVersion": "2017-04-18",
+      "name": "[parameters('luisServiceName')]",
+      "location": "[parameters('luisServiceLocation')]",
+      "sku": {
+        "name": "[parameters('luisServiceSku')]"
+      }
     }
   ],
   "outputs": {
@@ -270,4 +253,4 @@
       }
     }
   }
-}
+}

templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/deployment/scripts/deploy_cognitive_models.ps1

@@ -197,7 +197,7 @@ foreach ($language in $languageArr)
 	if ($useQna) {
 		if (Test-Path $(Join-Path $PSScriptRoot .. 'resources' 'QnA' $langCode)) {
 			# Deploy QnA Maker KBs
-			$qnaFiles = Get-ChildItem "$(Join-Path $PSScriptRoot .. 'resources' 'qnA' $langCode)" -Recurse | Where {$_.extension -eq ".lu"} 
+			$qnaFiles = Get-ChildItem "$(Join-Path $PSScriptRoot .. 'resources' 'QnA' $langCode)" -Recurse | Where {$_.extension -eq ".lu"} 
 
 			if ($qnaFiles) {
 				$config | Add-Member -MemberType NoteProperty -Name knowledgeBases -Value @()

templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/src/dialogs/_mainDialog.ts

@@ -249,7 +249,7 @@ export class MainDialog extends RouterDialog {
     protected async populateStateFromSemanticAction(context: TurnContext): Promise<void> {
         // Example of populating local state with data passed through semanticAction out of Activity
         // const activity: Activity = context.activity;
-        // const semanticAction: SemanticAction | undefined  = activity.semanticAction;
+        // const semanticAction: SemanticAction | undefined = activity.semanticAction;
 
         // if (semanticAction != null && semanticAction.Entities.ContainsKey("location"))
         // {

templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/src/services/botServices.ts

@@ -1,11 +1,11 @@
 /**
  * Copyright(c) Microsoft Corporation.All rights reserved.
  * Licensed under the MIT License.
-*/
+ */
 
 import { BotTelemetryClient } from 'botbuilder';
 import { LuisApplication, LuisPredictionOptions, LuisRecognizer, QnAMaker, QnAMakerEndpoint } from 'botbuilder-ai';
-import {ICognitiveModelConfiguration, ICognitiveModelSet } from 'botbuilder-solutions';
+import { ICognitiveModelConfiguration, ICognitiveModelSet } from 'botbuilder-solutions';
 import { DispatchService, LuisService, QnaMakerService } from 'botframework-config';
 import { IBotSettings } from './botSettings';
 

templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/resources/template.json

@@ -244,7 +244,7 @@
         "endpoint": "[variables('botEndpoint')]",
         "isStreamingSupported": true,
         "msaAppId": "[parameters('microsoftAppId')]",
-        "developerAppInsightKey": "[reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).InstrumentationKey]",
+        "developerAppInsightKey": "[reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).instrumentationKey]",
         "developerAppInsightsApplicationId": "[reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).ApplicationId]"
       }
     },