Merge branch 'next' into feature/southworks/deprecation-plan/merge-next-into-master

Author: Batta32

docs/_docs/overview/virtual-assistant-solution.md

@@ -12,7 +12,7 @@ toc: true
 
 Customers and partners have increasing need to deliver advanced conversational assistant experiences tailored to their brand, personalized to their users, and made available across a broad range of canvases and devices. Continuing Microsoft's open-sourced approach towards the Bot Framework SDK, the open-source Virtual Assistant solution provides you with a set of core foundational capabilities and full control over the end user experience and data.
 
-At its core the [Virtual Assistant]({{site.baseurl}}//overview/virtual-assistant-template) (available in C# and TypeScript) is a project template with the best practices for developing a bot on the Microsoft Azure platform.
+At its core, the [Virtual Assistant]({{site.baseurl}}//overview/virtual-assistant-template) (available in C# and TypeScript) is a project template with the best practices for developing a bot on the Microsoft Azure platform.
 
 Common assistant scenarios are provided as reusable conversational skills, increasing developer productivity and enabling a vibrant ecosystem of reusable components. Individual skills can be added to an assistant to enable new scenarios, extending the Virtual Assistant experience with reusable [Bot Framework Skills]({{site.baseurl}}/overview/skills), for example: finding a point of interest, checking off an item on a to-do list, or replying to an email. Skills are fully customizable and consist of language models and responses for multiple languages, dialogs, and code.
 

docs/_docs/solution-accelerators/tutorials/view-analytics/3-open-template.md

@@ -28,16 +28,16 @@ order: 3
 
 ## Additional Telemetry
 
-By default, a Virtual Assistant or Skill template based project doesn't collect personally identifiable information (e.g. Conversation drill-down and transcripts) which will lead to the respective sections in the PowerBI dashboard to not show information. If you wish to collect this information make the following change to `Startup.cs`
+By default, a Virtual Assistant or Skill template based project collects personally identifiable information (e.g. Conversation drill-down and transcripts) which will lead to the respective sections in the PowerBI dashboard to function as expected. If you wish to not collect this information make the following change to `appsettings.json`
 
 Change this entry:
 
 ```csharp
-    services.AddSingleton<TelemetryLoggerMiddleware>();
+    "logPersonalInfo": true
 ```
 
 To the following:
 
 ```csharp
-    services.AddSingleton<TelemetryLoggerMiddleware>(s=>new TelemetryLoggerMiddleware(s.GetService<IBotTelemetryClient>(), true));
+    "logPersonalInfo": false
 ```

docs/_docs/virtual-assistant/handbook/deployment-scripts.md

@@ -42,11 +42,13 @@ This script orchestrates the deployment of all Azure Resources and Cognitive Mod
 | armLuisAuthoringRegion | The region to deploy LUIS authoring resource in Azure (**only required for Azure Gov deployments**) | No |
 | luisEndpoint | The LUIS endpoint for deploying and managing LUIS applications. Required if **createLuisAuthoring** is set to false. | No |
 | useGov | Flag indicating if the deployment is targeting the Azure Government Cloud. Defaults to **false**.| No |
-| qnaEndpoint | Endpoint for deploying QnA Maker knowledge bases (**only required for Azure Gov deployments**). | No |
+| qnaEndpoint | Endpoint for deploying QnA Maker knowledge bases (**only required for Azure Gov deployments. See note below for more information.**). | No |
 | languages | Specifies which languages to deploy cognitive models in a comma separated string (e.g. "en-us,de-de,es-es"). Defaults to "en-us". | No |
 | projDir | Location to save **appsettings.json** and **cognitivemodels.json** configuration files. Defaults to current directory. | No |
 | logFile | Log file for any errors that occur during script execution. Defaults to **Deployment** folder with the name of `deploy_log.txt`.| No |
 
+> Note: QnA Maker requires three Azure resources, a QnA Maker Cognitive Service subscription, an Azure Search resource, and an Azure web app. The Cognitive Service subscription can only be deployed in West US for Azure Commercial deployments, therefore the QnA Maker endpoint will be the same for all regions unless the service is being deployed for Azure Government.
+
 ### deploy_cognitive_models.ps1
 {:.no_toc}
 
@@ -161,9 +163,9 @@ Any of the following parameters in the ARM template can be overridden with your
 | contentModeratorName | [name]-cm-[suffix] |
 | contentModeratorSku | S0 |
 | contentModeratorLocation | Resource group location |
-| luisRuntimeName | [name]-luisruntime-[suffix] |
-| luisRuntimeSku | S0 |
-| luisServiceLocation | Resource group location |
+| luisPredictionName | [name]-luisprediction-[suffix] |
+| luisPredictionSku | S0 |
+| luisPredictionLocation | Resource group location |
 | useLuisAuthoring | True |
 | luisAuthoringName | [name]-luisauthoring-[suffix] |
 | luisAuthoringSku | F0 |
@@ -400,3 +402,22 @@ If you have an existing LUIS application that you want to use in your Virtual As
       // Run LUIS recognition on General model and store result in turn state.
       var luisResult = await localizedServices.LuisServices["luis-app-id"].RecognizeAsync<YourLUIS.cs>(innerDc.Context, cancellationToken);
       ```
+
+## How do I add support for additional languages to my existing Virtual Assistant?
+If you would like to add support for additional languages to your existing Virtual Assistant, please refer to the following steps.
+
+1. Run the following command from your project directory. Replace "locale" with one or more of the supported language codes (en-us, it-it, de-de, es-es, fr-fr, or zh-cn). The values for the remaining parameters can be found in appsettings.json after Virtual Assistant deployment.
+
+    ```
+      .\Deployment\Scripts\deploy_cognitive_models.ps1 `
+        -languages "locale" `
+        -name 'base-name-of-luis-model' `
+        -resourceGroup 'resouce-group-for-luis-resource' `
+        -luisAuthoringRegion 'luis-authoring-region' `
+        -luisAuthoringKey 'luis-authoring-key' `
+        -luisAccountName 'luis-account-name' `
+        -luisAccountRegion 'luis-account-region' `
+        -luisSubscriptionKey 'luis-subscription-key' `
+        -luisEndpoint 'luis-endpoint' `
+        -qnaSubscriptionKey 'qna-subscription-key'
+    ```

docs/assets/analytics/virtual-assistant-analytics-sample.pbit

@@ -1 +1,2 @@
 /build
+!**/gradle/wrapper/gradle-wrapper.jar

samples/android/clients/EventCompanion/app/.gitignore

@@ -0,0 +1,6 @@
+#Tue Aug 18 14:34:24 CST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip

samples/android/clients/EventCompanion/app/gradle/wrapper/gradle-wrapper.jar

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files