Merge pull request #3820 from southworks/feature/southworks/deprecation-plan/merge-master-into-next

Merge master into next branch

Author: lauren-mills

.github/auto_assign.yml

@@ -8,12 +8,8 @@ addAssignees: false
 reviewers:
   - darrenj
   - lauren-mills
-  - lzc850612 
-  - pavolum
   - peterinnesmsft
   - ryanlengel 
-  - sidmore
-  - taicchoumsft
 
 # A number of reviewers added to the pull request
 # Set 0 to add all the reviewers (default: 0)

.github/workflows/codeql.yml

@@ -0,0 +1,51 @@
+name: "Code scanning - action"
+
+on:
+  pull_request:
+  schedule:
+    - cron: '0 19 * * 0'
+
+jobs:
+  CodeQL-Build:
+
+    # CodeQL runs on ubuntu-latest and windows-latest
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      with:
+         languages: javascript
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

CODE_OF_CONDUCT.md

@@ -0,0 +1,9 @@
+# Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns

docs/Gemfile.lock

@@ -69,7 +69,7 @@ GEM
       jekyll-theme-time-machine (= 0.1.1)
       jekyll-titles-from-headings (= 0.5.1)
       jemoji (= 0.10.2)
-      kramdown (= 1.17.0)
+      kramdown (>= 2.3.1)
       liquid (= 4.0.0)
       listen (= 3.1.5)
       mercenary (~> 0.3)
@@ -206,24 +206,26 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.3)
     minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.13.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.9-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.6)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.6-x64-mingw32)
+      racc (~> 1.4)
     octicons (9.1.1)
       nokogiri (>= 1.6.3.1)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
+    racc (1.5.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)

docs/_data/button.yml

@@ -177,34 +177,26 @@ enable_msteams:
 
 # Enable speech
 enable_speech_uwp:
-  title: Create a voice-first virtual assistant with the Speech SDK, UWP
-  text: Develop a C# Universal Windows Platform (UWP) application by using the Speech SDK.
+  title: Create a Voice Assistant with the Speech SDK in C# UWP
+  text: This quickstart will connect to a previously authored and configured bot to enable a voice assistant experience from the client application.
   button: Learn more
-  ref: 'https://docs.microsoft.com/en-us/azure/cognitive-services/speech-service/quickstart-virtual-assistant-csharp-uwp'
+  ref: 'https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/quickstart/csharp/uwp/virtual-assistant'
   ext_ref: true
   img: *cs_img
   alt: *cs_alt
 enable_speech_java:
-  title: Create a voice-first virtual assistant with the Speech SDK, Java
-  text: Develop a Java console application by using the Cognitive Services Speech SDK.
+  title: Using Voice Assistant in Java on Windows or Linux
+  text: This sample demonstrates how to recognize speech for custom voice assistants and receive activity responses.
   button: Learn more
-  ref: 'https://docs.microsoft.com/en-us/azure/cognitive-services/speech-service/quickstart-virtual-assistant-java-jre'
+  ref: 'https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/quickstart/java/jre/virtual-assistant'
   ext_ref: true
   img: *java_img
   alt: *java_alt
-enable_speech_android_java:
-  title: Create a voice-first virtual assistant in Java on Android by using the Speech SDK
-  text: Build a voice-first virtual assistant with Java for Android using the Speech SDK.
-  button: Learn more
-  ref: 'https://docs.microsoft.com/en-us/azure/cognitive-services/speech-service/quickstart-virtual-assistant-java-android'
-  ext_ref: true
-  img: *android_img
-  alt: *android_alt
 enable_speech_android:
   title: Virtual Assistant Client on Android
   text: Connect your Direct Line Speech-enabled bot to a sample Android application.
   button: Learn more
-  ref: 'https://docs.microsoft.com/en-us/microsoftteams/platform/get-started/get-started-app-studio'
+  ref: 'https://microsoft.github.io/botframework-solutions/clients-and-channels/clients/virtual-assistant-client'
   ext_ref: true
   img: *android_img
   alt: *android_alt
@@ -227,25 +219,6 @@ enable_msteams_app_studio:
   img: *msteams_img
   alt: *msteams_alt
 
-# CICD
-azure_pipelines:
-  title: What is Azure Pipelines?
-  text: Azure Pipelines is a cloud service that you can use to automatically build and test your code project and make it available to other users
-  button: Learn more
-  ref: 'https://docs.microsoft.com/en-us/azure/devops/pipelines/get-started/what-is-azure-pipelines?view=azure-devops'
-  ext_ref: true
-enable_cd:
-  title: Enable continuous deployment
-  text: Use release pipelines in Azure DevOps to continuously deliver your bot solution
-  button: Learn more
-  ref: 'solution-accelerators/tutorials/enable-continuous-deployment/1-intro/'
-release_pipelines:
-  title: What are release pipelines?
-  text: Release pipelines in Azure Pipelines help your team continuously deliver software to your customers at a faster pace and with lower risk
-  button: Learn more
-  ref: 'https://docs.microsoft.com/en-us/azure/devops/pipelines/release/?view=azure-devops'
-  ext_ref: true
-
 # Telemetry
 telemetry_add:
   title: Add telemetry to your bot

docs/_docs/clients-and-channels/clients/virtual-assistant-client.md

@@ -37,7 +37,6 @@ There are two configuration files used to provide your environment settings.
 {
   "SpeechSubscriptionKey": "SPEECH_SERVICE_SUBSCRIPTION_KEY", // Replace with your Speech Service subscription key
   "SpeechRegion": "westus2",
-  "BotId": "DIRECT_LINE_SPEECH_SECRET_KEY", // Replace with your Direct Line Speech secret
   "CustomCommandsAppId": "", // Optional, if you are connecting to a Custom Commands application
   "CustomVoiceDeploymentIds": "", // Optional, to point to custom voices
   "CustomSREndpointId": "", // Optional, to point to a customized speech recognition endpoint

docs/_docs/clients-and-channels/tutorials/enable-speech/4-integrate-speech-channel.md

@@ -15,6 +15,6 @@ order: 4
 
 ## Option B: Using a sample Cognitive Services Voice Assistant client
 1. Download the [latest release from the Cognitive Services Voice Assistant repository](https://github.com/Azure-Samples/Cognitive-Services-Voice-Assistant/releases).
-1. Follow the [instructions on getting started](https://github.com/Azure-Samples/Cognitive-Services-Voice-Assistant/tree/master/samples/clients/csharp-wpf#getting-started) to set up your environment and connect to your Virtual Assistant.
+1. Follow the [instructions on getting started](https://github.com/Azure-Samples/Cognitive-Services-Voice-Assistant/tree/master/clients/csharp-wpf#getting-started) to set up your environment and connect to your Virtual Assistant.
 
 ![Direct Line Speech Client Configuration]({{site.baseurl}}/assets/images/dlspeechclient.png)

docs/_docs/clients-and-channels/tutorials/enable-speech/6-next-steps.md

@@ -15,9 +15,5 @@ This tutorial is based on sample applications provided by the Cognitive Services
 <div class="card-deck">
     {% include button.html params=site.data.button.enable_speech_uwp %}
     {% include button.html params=site.data.button.enable_speech_java %}
-</div>
-
-<div class="card-deck py-4">
-    {% include button.html params=site.data.button.enable_speech_android_java %}
     {% include button.html params=site.data.button.enable_speech_android %}
 </div>

docs/_docs/help/known-issues.md

@@ -157,3 +157,16 @@ The workaround at this time is to run this ahead of any of the Virtual Assistant
 ```
 $env:PATH += ":/users/YOUR_USER_NAME/.dotnet/tools"
 ```
+
+## Dispatch refresh failed with Exit Code 1 Error using ErrorActionPreference = Stop in PowerShell
+There is a known issue in the `dispatch refresh` executed in the `update_cognitive_models.ps1` of the C#/TypeScript bots, that if the user has configured `$ErrorActionPreference = Stop` in PowerShell, it will stop the execution raising the __Exit Code 1 Error__.
+
+As a workaround the `$ErrorActionPreference` should be changed to `Continue`
+``` powershell
+$ErrorActionPreference = 'Continue'
+```
+
+See the following related documents:
+- [#3662](https://github.com/microsoft/botframework-solutions/issues/3662) - `update_cognitive_models.ps1 - dispatch refresh failed with Exit Code 1 Error in Deployment Automation`
+- [microsoft/botbuilder-tools#1474](https://github.com/microsoft/botbuilder-tools/issues/1474) - `Dispatch] Dispatch refresh fails using ErrorActionPreference set as Stop`
+- [Preference Variables](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-7)

docs/_docs/overview/skills.md

@@ -8,13 +8,13 @@ toc: true
 # {{ page.title }}
 {:.no_toc}
 
-Bot Framework Skills are re-usable conversational skill building-blocks covering conversational use-cases enabling you to add extensive functionality to a Bot within minutes. Skills include language understanding (LUIS) models, dialogs and integration code and delivered as source code enabling you to customize and extend as required. At this time we provide Calendar, Email, To Do, Point of Interest skills and a number of other experimental skills.
+Bot Framework Skills are re-usable conversational skill building-blocks covering conversational use-cases enabling you to add extensive functionality to a Bot within minutes. Skills include [Language Understanding](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/what-is-luis) (LUIS) models, dialogs and integration code, delivered as source code enabling you to customize and extend as required. At this time we provide Calendar, Email, To Do, Point of Interest skills and a number of other experimental skills.
 
 A Skill is like a standard conversational bot but with the ability to be plugged in to a broader solution. This can be a complex Virtual Assistant or perhaps an Enterprise Bot seeking to stitch together multiple bots within an organization.
 
 Apart from some minor differences that enable this special invocation pattern, a Skill looks and behaves like a regular bot. The same protocol is maintained between two bots to ensure a consistent approach. Skills for common scenarios like productivity and navigation can be used as-is or customized however a customer prefers.
 
->The Skill implementations currently provided are in C# only but the remote invocation nature of the Skills does enable you to invoke C# based Skills from a typescript Bot project.
+>The Skill implementations currently provided are in C# only but the remote invocation nature of the Skills does enable you to invoke C# based Skills from a TypeScript Bot project.
 
 ## Available Skill samples
 
@@ -33,7 +33,7 @@ The following Skill samples are available out of the box, each with deployment s
 ### Experimental Skills
 
 These experimental Bot Framework Skills are early prototypes to help bring Skill concepts to life for demonstrations and proof-of-concepts.
-By their very nature these Skill are not complete, with only English support. If you have any feedback on these Skills, please [open a new issue](https://github.com/microsoft/botframework-solutions/issues/new/choose) on the Bot Framework Solutions repository.
+By their very nature these Skills are not complete, with only English support. If you have any feedback on these Skills, please [open a new issue](https://github.com/microsoft/botframework-skills/issues/new/choose) on the Bot Framework Skills repository.
 
 - [Automotive]({{site.baseurl}}/skills/samples/automotive)
 - [Bing Search]({{site.baseurl}}/skills/samples/bing-search)