Qiowu/fix calendar adaptive card (#1042)

* Adapt i18next to load locales from other solutions (#979)

* [Skill Template][TypeScript] Fix Placeholder replacements (#1002)

* Fix deploymentScripts paths

* Update placeholder replacements for bot.recipe files

* Add tests for the bot.recipe files

* Automotive: Use YAML instead of JSON files for list of settings (#1008)

* add locale bots files to copy (#1009)

* make adapters transient (#1011)

* address warnings (stylecop) (#1012)

* [Virtual Assistant][TypeScript] Update core functionality (#999)

* Update CognitiveModels and DepoymentScripts

* Add resources files

* Update dialogs

* Update remaining 'assistant' files

* Update authentication, middleware and responses

* Update proactive, skills, util and extensions folders, index.ts and npm-srinkwrap files

* Fix some TSLint warnings

* Add backgroundTaskQueue

* Update logic for using skills with InProc approach

* docs(README): correct Bot Framework link (#1015)

* fix qna inputhint issue (#1014)

* move Microsoft.Bot.Builder.Solutions into a subfolder under lib/csharp (#1019)

* Add dynamic list card support in microsoft.bot.builder.solutions (#1017)

* add card support

* resolve merge conflict

* Add deployment steps for VA (#1025)

* Update INTRO_PATH to be Mac/unix friendly (#1021)

Running the Enterprise Template project in VS Code on a Mac throws a runtime error due to the Intro.json file not being found caused by the Windows forward-slash not being interpreted into the path.

Swapping the forward-slashes for back-slashes solves this issue and continues to function on Windows w/out issue.

* [Virtual Assistant][TypeScript] Implement SampleSkill to test Virtual Assistant (#1024)

* Merge branch 'southworks/virtual-assistant/sample-skill' into southworks/virtual-assistant/test-migration-with-sampleskill

* Fix for latest changes

* Fix minimum score for topIntent in sampleSkill

* Fix SampleSkill index

* Fix SampleSkill to work as standalone bot

* Fix tslint warnings

* Fix for i18next implementation and minor fix in ResponseManager initialization

* [Virtual Assistant][TypeScript] Implement Virtual Assistant Tests (#1007)

* Accept test bot files

* Add nock dependency

* Add rush test script

* Add mock resources

* Add nockFixtures

* Add test environment

* Add mocha file to run the tests

* Add configuration test files

* Add Assistant tests

* Implement i18next

* Adaptive Card update for VA (#1022)

* Added MainDialogResponses for new intro card text, GreetingCardModel for card properties, image assets for card.

* Added MainDialogResponses for new intro card text, GreetingCardModel for card properties, image assets for card.

* Removed intro json
Added user greeting cards mapping to model.
Updated onboarding dialog to only ask for name for quick personalisation & to remember returning user.

* added translated strings for main dialgo responses

* Updated image assets and passing wwwroot references to cards.
Updated VA tests

* Removed bad merge

* revert _accessors name

* Removed incorrect spaces in zh-cn responses

* Updated to aka.ms links

* Fix build bug from VA & replace asset images (#1035)

* Fixed .t4 reference causing build bug
Removes png images and replaces with base64 samples

* Removed HttpContext and ImagePathLocation dependencies in VA

* Added shared ResponseIdCollection resource

* Point of Interest Adaptive Cards (#1037)

* Added new POIDetails card

* Header: using new method of bg image set to a single column for the entire header.
Background: full white bg.
Adjusted the image dimensions to Azure maps results to match new card and maintain consistent card heights.

* Removed poi source enum and replaced with string
Updated cards.

* Adding hashset of providers

* Updated returning uesr greeting

* Updated Powered by string for maps

* Updated unit tests

* Added localization for poi shared strings.

* fixed directory refs in solutions

* [Skill Template][TypeScript] Implement tests and fixes (#1038)

* Update the _index.ts file and add placeholders

* Implement standalone functionality

* Fix responseManager initialization and reorder imports

* Add tests to the generator for the index changes

* Update Skill Template, rename resources files

* Update generator-botbuilder-skill

* Add new tests for the generator-botbuilder-skill

* [Skill Template][TypeScript] Fix Placeholder replacements (#1002)

* Fix deploymentScripts paths

* Update placeholder replacements for bot.recipe files

* Add tests for the bot.recipe files

* Add the main functionality and structure of the tests

* Implement i18next, fix tslint errors

* Update generator-botbuilder-skill to use new template files

* Add generator-botbuilder-skill tests

* Add new placeholders for testAdapter initialization

* Delete duplicated variable

* [Email Skill]Adaptive Card update with Graph API (#1029)

* adaptive card prototype

* test

* add detail card

* overall card support

* add default avatar

* apply new cards with condition

* add recipient icon display support

* show important and attachment icon

* add locale support

* modify icon size to fit bg image

* Added id and medium spacing to the email overview by condition card

* Delete ResponseManager.cs

* updated nuget to latest

* update with new design

* fix UT

* add google support

* fix comments

* fix google api but

* fix adaptive card

* fix as comments

* fix comments

README.md

@@ -1,6 +1,6 @@
 # ![Conversational AI Solutions](./docs/media/conversationalai_solutions_header.png)
 
-This repository is the home for a set of templates and solutions to help build conversational experiences using [Azure Bot Service](https://aka.ms/azurebotservice) and [Bot Framework](https://botframework).
+This repository is the home for a set of templates and solutions to help build conversational experiences using [Azure Bot Service](https://aka.ms/azurebotservice) and [Bot Framework](https://botframework.com).
 
 ## Templates
 
@@ -13,7 +13,7 @@ Enterprise Template | A high quality conversational experience requires a founda
 Name | Description | Link 
 ------------ | ------------- | :-----------:
 Virtual Assistant | Customers and partners have a significant need to deliver a conversational assistant tailored to their brand, personalized to their users, and made available across a broad range of canvases and devices. <br/><br/> 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.| [Get Started](./docs/virtual-assistant/README.md)
-Analytics | Gain key insights into your bot’s health and behavior with the Conversational AI Analytics solutions. Review available telemetry, sample Application Insights queries, and Power BI dashboards to understand the full breadth of your bot’s conversations with users. | [Get Started](./docs/analytics/README.md)
+Analytics | Gain key insights into your bot’s health and behavior with the Conversational AI Analytics solutions. Review available telemetry, sample Application Insights queries, and Power BI dashboards to understand the full breadth of your bot’s conversations with users. | [Get Started](./docs/analytics/README.md)
 
 ## Contributing
 
@@ -30,4 +30,4 @@ For more information see the [Code of Conduct FAQ](https://opensource.microsoft.
 contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
 
 ## License
-Copyright (c) Microsoft Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation. All rights reserved.

docs/skills/automotive.md

@@ -115,53 +115,38 @@ The Automotive Skill surfaces setting changes for testing purposes through an ev
 
 ### Customising Vehicle Settings
 
-Available vehicle settings are defined in a supporting metadata file which you can find in this location:  `automotiveskill\Dialogs\VehicleSettings\Resources\available_settings.json`.
+Available vehicle settings are defined in a supporting metadata file which you can find in this location:  `automotiveskill\Dialogs\VehicleSettings\Resources\available_settings.yaml`.
 
-To add an new setting along with appropriate setting values it's easily expressed in JSON. The example below shows a new Volume control setting with the ability to Set, Increase, Decrease and Mute the volume.
+To add an new setting along with appropriate setting values it's easily expressed in YAML. The example below shows a new Volume control setting with the ability to Set, Increase, Decrease and Mute the volume.
 
 ```
-  {
-    "allowsAmount": true,
-    "amounts": [ { "unit": "" } ],
-    "canonicalName": "Set Volume",
-    "values": [
-      {
-        "canonicalName": "Set",
-        "requiresAmount": true
-      },
-      {
-        "changesSignOfAmount": true,
-        "canonicalName": "Decrease"
-      },
-      {
-        "canonicalName": "Increase",
-        "antonym": "Decrease"
-      },
-      {
-        "canonicalName": "Mute"
-      }
-    ]
-  }
- ```
+canonicalName: Volume
+values:
+  - canonicalName: Set
+    requiresAmount: true
+  - canonicalName: Decrease
+    changesSignOfAmount: true
+  - canonicalName: Increase
+    antonym: Decrease
+  - canonicalName: Mute
+allowsAmount: true
+amounts:
+  - unit: ''
+```
 
  For key settings you may wish to prompt for confirmation, safety settings for example. This can be specified through a `requiresConfirmation` property as shown below.
 
 ```
- {
-    "canonicalName": "Lane Change Alert",
-    "values": [
-      {
-        "canonicalName": "Off",
-        "requiresConfirmation": true
-      },
-      { "canonicalName": "On" }
-    ]
-  },
+canonicalName: Lane Change Alert
+values:
+  - canonicalName: Off
+    requiresConfirmation: true
+  - canonicalName: On
 ```
 
 ### Deploying the Skill in local-mode
 
-The Automotive skill is not added by default when deploying the Virtual Assistant as this is a domain specific skill. 
+The Automotive skill is not added by default when deploying the Virtual Assistant as this is a domain specific skill.
 
 Run this PowerShell script to deploy your shared resources and LUIS models.
 
@@ -238,18 +223,18 @@ Follow the instructions below to add the Automotive Skill to an existing Virtual
         ```
     - Add dispatch references to the core LUIS intents for the skill within the **assistant\CognitiveModels\en\dispatch.lu** file as shown below. Only the vehicle settings model is required for dispatch. This enables the Dispatcher to understand your new capabilities and route utterances to your skill
         ```
-        # l_Automotive 
+        # l_Automotive
         - [VEHICLE_SETTINGS_CHANGE](../../../../skills/automotiveskill/automotiveskill/CognitiveModels/LUIS/en/settings_dispatch.lu#VEHICLE_SETTINGS_CHANGE)
         ```
 2. Run the following script to deploy the new Automotive Skill LUIS models and to update the dispatcher.
     ```
     pwsh.exe -ExecutionPolicy Bypass -File DeploymentScripts\update_published_models.ps1 -locales "en-us"
     ```
 3. In Virtual Assistant, add the skill configuration entry (in an earlier section) to **appsettings.json**. This tells the Virtual Assistant that there is a new skill available for use.
-   
+
 4. Run the LuisGen tool to update the strongly-typed Dispatch class (Dispatch.cs) to reflect the additional dispatch target.
     ```
-    LUISGen DeploymentScripts\en\dispatch.luis -cs Dispatch -o Dialogs\Shared\Resources 
+    LUISGen DeploymentScripts\en\dispatch.luis -cs Dispatch -o Dialogs\Shared\Resources
     ```
 5. Update **MainDialog.cs** within your Assistant project with the dispatch intent for your skill (l_automotive). This can be found in the assistant/dialogs/main folder of your project.
     ![](../media/skills_maindialogupdate.jpg)

docs/virtual-assistant/gettingstarted.md

@@ -200,7 +200,7 @@ The [Add Authentication to your bot](https://docs.microsoft.com/en-us/azure/bot-
     -  `Notes.ReadWrite`
     -  `People.Read`
     -  `Tasks.ReadWrite`
-    -  `User.Read`  
+    -  `User.ReadBasic.All`  
  -  Click Add Permissions at the bottom to apply the changes.
 
 Next you need to create the Authentication Connection for your Bot. Ensure you use the same combination of Scopes that you provided in the above command. The first command shown below will retrieve the appId (ApplicationId) and appPassword (Client Secret) that you need to complete this step.
@@ -210,7 +210,7 @@ The commands shown below assume you have used the deployment process and your re
 ```shell
 msbot get production --secret YOUR_SECRET
 
-az bot authsetting create --resource-group YOUR_BOT_NAME --name YOUR_BOT_NAME --setting-name "YOUR_AUTH_CONNECTION_DISPLAY_NAME" --client-id "YOUR_APPLICATION_ID" --client-secret "YOUR_APPLICATION_PASSWORD" --service Aadv2 --parameters clientId="YOUR_APPLICATION_ID" clientSecret="YOUR_APPLICATION_PASSWORD" tenantId=common --provider-scope-string "Calendars.ReadWrite Mail.ReadWrite Mail.Send Tasks.ReadWrite Notes.ReadWrite People.Read User.Read Contacts.Read" 
+az bot authsetting create --resource-group YOUR_BOT_NAME --name YOUR_BOT_NAME --setting-name "YOUR_AUTH_CONNECTION_DISPLAY_NAME" --client-id "YOUR_APPLICATION_ID" --client-secret "YOUR_APPLICATION_PASSWORD" --service Aadv2 --parameters clientId="YOUR_APPLICATION_ID" clientSecret="YOUR_APPLICATION_PASSWORD" tenantId=common --provider-scope-string "Calendars.ReadWrite Mail.ReadWrite Mail.Send Tasks.ReadWrite Notes.ReadWrite People.Read User.ReadBasic.All Contacts.Read" 
 ```  
 
 > NOTE: Take special care when running the `authsetting` commands to correctly escape special characters in your client secret key (or parameters that contain special characters).