Merge branch 'next' of https://github.com/microsoft/botframework-solutions into next

Author: lauren-mills

templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/_package.json

@@ -27,7 +27,7 @@
         "botbuilder-azure": "^4.9.0",
         "botbuilder-dialogs": "^4.9.0",
         "botbuilder-lg": "^4.9.0",
-        "bot-solutions": "^1.0.0-rc1",
+        "bot-solutions": "^1.0.0",
         "botframework-config": "^4.9.0",
         "botframework-connector": "^4.9.0",
         "i18next": "^15.0.6",

templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/deployment/scripts/deploy.ps1

@@ -10,7 +10,8 @@ Param(
 	[switch] $createLuisAuthoring,
     [string] $luisAuthoringKey,
     [string] $luisAuthoringRegion,
-    [string] $armLuisAuthoringRegion,
+	[string] $armLuisAuthoringRegion,
+	[string] $luisEndpoint,
     [switch] $useGov,
 	[string] $languages = "en-us",
     [string] $qnaEndpoint = "https://westus.api.cognitive.microsoft.com/qnamaker/v4.0",

templates/typescript/generator-bot-virtualassistant/generators/skill/templates/sample-skill/_package.json

@@ -24,7 +24,7 @@
         "botbuilder-applicationinsights": "^4.9.0",
         "botbuilder-azure": "^4.9.0",
         "botbuilder-dialogs": "^4.9.0",
-        "bot-solutions": "^1.0.0-rc1",
+        "bot-solutions": "^1.0.0",
         "botframework-config": "^4.9.0",
         "botframework-connector": "^4.9.0",
         "dotenv": "^6.0.0",

templates/typescript/samples/sample-assistant/deployment/scripts/deploy.ps1

@@ -10,7 +10,8 @@ Param(
 	[switch] $createLuisAuthoring,
     [string] $luisAuthoringKey,
     [string] $luisAuthoringRegion,
-    [string] $armLuisAuthoringRegion,
+	[string] $armLuisAuthoringRegion,
+	[string] $luisEndpoint,
     [switch] $useGov,
 	[string] $languages = "en-us",
     [string] $qnaEndpoint = "https://westus.api.cognitive.microsoft.com/qnamaker/v4.0",