latest upstream changes (#8)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

.github/Tasks/Pull-Request-Commenter/Default/default.txt

@@ -1,5 +1,14 @@
 Thank you for raising a pull request. Please ensure you have have completed the following:
 
+#### General
 - [ ] I have commented my code, particularly in hard-to-understand areas	
 - [ ] I have added or updated the appropriate tests	
-- [ ] I have updated related documentation
+- [ ] I have updated related documentation
+
+#### Bots
+- [ ] I have validated that new and updated responses use appropriate [Speak](https://docs.microsoft.com/en-us/azure/bot-service/dotnet/bot-builder-dotnet-text-to-speech?view=azure-bot-service-3.0) and [InputHint](https://docs.microsoft.com/en-us/azure/bot-service/dotnet/bot-builder-dotnet-add-input-hints?view=azure-bot-service-3.0) properties to ensure a high-quality speech-first experience
+- [ ] I have replicated language model changes across the English, French, Italian, German, Spanish, and Chinese `.lu` files and validated that deployment is successful
+
+#### Deployment Scripts
+- [ ] I have replicated my changes in the **Virtual Assistant Template** and **Sample** projects
+- [ ] I have replicated my changes in the **Skill Template** and **Sample** projects

.github/release-drafter.yml

@@ -0,0 +1,8 @@
+name-template: v$NEXT_PATCH_VERSION
+tag-template: v$NEXT_PATCH_VERSION
+branches:
+  - master
+template: |
+  ## What’s Changed
+
+  $CHANGES

docs/reference/knownissues.md

@@ -110,3 +110,14 @@ Then the bot will recreate the state `-documents` when it starts if it doesn't e
 ## If Visual Studio 2019 Preview is installed, node-gyp cannot find MSBuild.exe
 
 This is a known issue with node-gyp: [nodejs/node-gyp#1663](https://github.com/nodejs/node-gyp/issues/1663). Uninstalling Visual Studio 2019 Preview fixes the issue.
+
+## Botskills CLI tool can't resolve trailing backslash in any of the arguments using Command Prompt as terminal
+
+There is a known issue in the `Botskills` CLI tool during the command's execution when any of the arguments contains a **trailing backslash** using the `Command Prompt` as terminal. This is due to a parsing issue in the shell.
+
+Example of the `connect` command with a trailing backslash in the `luisFolder` argument:
+``` bash
+botskills connect --botName "<YOUR_VA_NAME>" --localManifest "<YOUR_LOCAL_MANIFEST_FILE>" --luisFolder "<YOUR_LUIS_FOLDER_PATH>\" --ts
+```
+
+So, to avoid this, it's highly recommended to use `PowerShell 6` to execute the CLI tool commands. Also, you can remove the trailing backslash of the argument.

lib/typescript/botskills/src/functionality/connectSkill.ts

@@ -138,10 +138,10 @@ export class ConnectSkill {
                 // Parse LU file
                 this.logger.message(`Parsing ${luisApp} LU file...`);
                 const ludownParseCommand: string[] = ['ludown', 'parse', 'toluis'];
-                ludownParseCommand.push(...['--in', luFilePath]);
-                ludownParseCommand.push(...['--luis_culture', configuration.language]);
-                ludownParseCommand.push(...['--out_folder', configuration.luisFolder]);
-                ludownParseCommand.push(...['--out', `"${luisFile}"`]);
+                ludownParseCommand.push(...[`--in "${luFilePath}"`]);
+                ludownParseCommand.push(...[`--luis_culture "${configuration.language}"`]);
+                ludownParseCommand.push(...[`--out_folder "${configuration.luisFolder}"`]);
+                ludownParseCommand.push(...[`--out "${luisFile}"`]);
 
                 await this.runCommand(ludownParseCommand, `Parsing ${luisApp} LU file`);
 

lib/typescript/botskills/src/functionality/refreshSkill.ts

@@ -60,8 +60,8 @@ export class RefreshSkill {
 
             const luisgenCommand: string[] = ['luisgen'];
             luisgenCommand.push(this.dispatchJsonFilePath);
-            luisgenCommand.push(...[`-${configuration.lgLanguage}`, `"DispatchLuis"`]);
-            luisgenCommand.push(...['-o', configuration.lgOutFolder]);
+            luisgenCommand.push(...[`-${configuration.lgLanguage} "DispatchLuis"`]);
+            luisgenCommand.push(...[`-o "${configuration.lgOutFolder}"`]);
 
             await this.runCommand(luisgenCommand, `Executing luisgen for the ${configuration.dispatchName} file`);
         } catch (err) {

skills/src/csharp/automotiveskill/automotiveskill/Deployment/Scripts/publish.ps1

@@ -33,12 +33,24 @@ if (Test-Path $zipPath) {
 	Remove-Item $zipPath -Force | Out-Null
 }
 
-# Compress source code
-Get-ChildItem -Path "$($projFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
-
-# Publish zip to Azure
-Write-Host "> Publishing to Azure ..."
-(az webapp deployment source config-zip `
-	--resource-group $resourceGroup `
-	--name $name `
-	--src $zipPath) 2>> $logFile | Out-Null
+# Perform dotnet publish step ahead of zipping up
+$publishFolder = $(Join-Path $projFolder 'bin\Release\netcoreapp2.2')
+dotnet publish -c release -o $publishFolder -v q > $logFile
+
+if($?) 
+{     
+	# Compress source code
+	Get-ChildItem -Path "$($publishFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
+
+	# Publish zip to Azure
+	Write-Host "> Publishing to Azure ..." -ForegroundColor Green
+	(az webapp deployment source config-zip `
+		--resource-group $resourceGroup `
+		--name $name `
+		--src $zipPath) 2>> $logFile | Out-Null
+} 
+else 
+{       
+	Write-Host "! Could not deploy automatically to Azure. Review the log for more information." -ForegroundColor DarkRed
+	Write-Host "! Log: $($logFile)" -ForegroundColor DarkRed    
+}       

skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/publish.ps1

@@ -33,12 +33,24 @@ if (Test-Path $zipPath) {
 	Remove-Item $zipPath -Force | Out-Null
 }
 
-# Compress source code
-Get-ChildItem -Path "$($projFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
-
-# Publish zip to Azure
-Write-Host "> Publishing to Azure ..."
-(az webapp deployment source config-zip `
-	--resource-group $resourceGroup `
-	--name $name `
-	--src $zipPath) 2>> $logFile | Out-Null
+# Perform dotnet publish step ahead of zipping up
+$publishFolder = $(Join-Path $projFolder 'bin\Release\netcoreapp2.2')
+dotnet publish -c release -o $publishFolder -v q > $logFile
+
+if($?) 
+{     
+	# Compress source code
+	Get-ChildItem -Path "$($publishFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
+
+	# Publish zip to Azure
+	Write-Host "> Publishing to Azure ..." -ForegroundColor Green
+	(az webapp deployment source config-zip `
+		--resource-group $resourceGroup `
+		--name $name `
+		--src $zipPath) 2>> $logFile | Out-Null
+} 
+else 
+{       
+	Write-Host "! Could not deploy automatically to Azure. Review the log for more information." -ForegroundColor DarkRed
+	Write-Host "! Log: $($logFile)" -ForegroundColor DarkRed    
+}       

skills/src/csharp/emailskill/emailskill/Deployment/Scripts/publish.ps1

@@ -33,12 +33,24 @@ if (Test-Path $zipPath) {
 	Remove-Item $zipPath -Force | Out-Null
 }
 
-# Compress source code
-Get-ChildItem -Path "$($projFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
-
-# Publish zip to Azure
-Write-Host "> Publishing to Azure ..."
-(az webapp deployment source config-zip `
-	--resource-group $resourceGroup `
-	--name $name `
-	--src $zipPath) 2>> $logFile | Out-Null
+# Perform dotnet publish step ahead of zipping up
+$publishFolder = $(Join-Path $projFolder 'bin\Release\netcoreapp2.2')
+dotnet publish -c release -o $publishFolder -v q > $logFile
+
+if($?) 
+{     
+	# Compress source code
+	Get-ChildItem -Path "$($publishFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
+
+	# Publish zip to Azure
+	Write-Host "> Publishing to Azure ..." -ForegroundColor Green
+	(az webapp deployment source config-zip `
+		--resource-group $resourceGroup `
+		--name $name `
+		--src $zipPath) 2>> $logFile | Out-Null
+} 
+else 
+{       
+	Write-Host "! Could not deploy automatically to Azure. Review the log for more information." -ForegroundColor DarkRed
+	Write-Host "! Log: $($logFile)" -ForegroundColor DarkRed    
+}       

skills/src/csharp/experimental/bingsearchskill/bingsearchskill/Deployment/Scripts/publish.ps1

@@ -33,12 +33,24 @@ if (Test-Path $zipPath) {
 	Remove-Item $zipPath -Force | Out-Null
 }
 
-# Compress source code
-Get-ChildItem -Path "$($projFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
-
-# Publish zip to Azure
-Write-Host "> Publishing to Azure ..."
-(az webapp deployment source config-zip `
-	--resource-group $resourceGroup `
-	--name $name `
-	--src $zipPath) 2>> $logFile | Out-Null
+# Perform dotnet publish step ahead of zipping up
+$publishFolder = $(Join-Path $projFolder 'bin\Release\netcoreapp2.2')
+dotnet publish -c release -o $publishFolder -v q > $logFile
+
+if($?) 
+{     
+	# Compress source code
+	Get-ChildItem -Path "$($publishFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
+
+	# Publish zip to Azure
+	Write-Host "> Publishing to Azure ..." -ForegroundColor Green
+	(az webapp deployment source config-zip `
+		--resource-group $resourceGroup `
+		--name $name `
+		--src $zipPath) 2>> $logFile | Out-Null
+} 
+else 
+{       
+	Write-Host "! Could not deploy automatically to Azure. Review the log for more information." -ForegroundColor DarkRed
+	Write-Host "! Log: $($logFile)" -ForegroundColor DarkRed    
+}       

skills/src/csharp/experimental/newsskill/Deployment/Resources/LU/en/news.lu

@@ -19,9 +19,84 @@
 - find me news on {topic}
 - find news on {topic}
 - news about {topic}
+- news about {topic=microsoft} on {site=wsj.com}
+- whats the latest news on {site=nytimes.com}
+- news on {site=cnn.com}
+- latest news on {site}
+- find me news about {topic} on {site}
+- find me news on {topic} on {site}
+- whats the news on {site=cnn.com}
+- find news on {topic=technology} on {site=wsj.com}
+- whats the latest on {topic} on {site}
+- find me news from {site}
+- find me news about {topic} from {site}
+- {topic} news from {site}
+- {topic} news on {site}
+
+## TrendingArticles
+- what's trending now
+- what's the latest trending news
+- find trending news
+- what's the top news on social media
+- trending news
+- top news on social media
+- what news is popular right now
+- popular news
+- find trending articles
+- trending articles
+- news trending on social media
+- articles popular on social media
+- news trending now
+- find news trending on social networks
+- news popular on social networks
+- articles trending now
+
+## SetFavoriteTopics
+- set favorite news topics
+- set favorite news categories
+- choose favorite news topics
+- choose favorite news categories
+- set news topics
+- set news categories
+- set favorites
+- choose favorites
+- choose my topics
+- set my topics
+- set news I'm interested in
+- choose topics I'm interested in
+
+## ShowFavoriteTopics
+- favorite news
+- favorite news topics
+- my news categories
+- my news topics
+- my news interests
+- news I'm interested in
+- what's my favorite news
+- topics I'm interested in
+- my news
+- my favorite news
+- news for me
+- my news suggestions
+- news topics for me
+- what are my favorites
+- what are my favorite topics
+- find favorites
+- find favorite news
+- find favorite topics
 
 ## None
+- 1
+- 2
+- forward email
+- find point of interest
+- get directions
+- add to my to do list
+- how long do I have until my next calendar appointment
+- hello world
+- what's the weather today
 
 > # Entity definitions
 
-$topic:simple
+$topic:simple
+$site:simple

skills/src/csharp/experimental/newsskill/Deployment/Resources/template.json

@@ -70,6 +70,10 @@
     "bingServiceName": {
       "type": "string",
       "defaultValue": "[concat(parameters('name'), '-bing')]"
+    },
+    "azureMapsServiceName": {
+      "type": "string",
+      "defaultValue": "[concat(parameters('name'), '-maps')]"
     }
   },
   "variables": {
@@ -202,6 +206,16 @@
       "sku": {
         "name": "S1"
       }
+    },
+    {
+      "type": "Microsoft.Maps/accounts",
+      "apiVersion": "2018-05-01",
+      "name": "[parameters('azureMapsServiceName')]",
+      "location": "global",
+      "sku": {
+        "name": "s1",
+        "tier": "Standard"
+      }
     }
   ],
   "outputs": {
@@ -236,6 +250,10 @@
     "bingSearch": {
       "type": "string",
       "value": "[listKeys(resourceId('Microsoft.CognitiveServices/accounts', parameters('bingServiceName')),'2017-04-18').key1]"
+    },
+    "azureMaps": {
+      "type": "string",
+      "value": "[listKeys(resourceId('Microsoft.Maps/accounts', parameters('azureMapsServiceName')),'2018-05-01').primaryKey]"
     }
   }
 }

skills/src/csharp/experimental/newsskill/Deployment/Scripts/publish.ps1

@@ -33,12 +33,24 @@ if (Test-Path $zipPath) {
 	Remove-Item $zipPath -Force | Out-Null
 }
 
-# Compress source code
-Get-ChildItem -Path "$($projFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
-
-# Publish zip to Azure
-Write-Host "> Publishing to Azure ..."
-(az webapp deployment source config-zip `
-	--resource-group $resourceGroup `
-	--name $name `
-	--src $zipPath) 2>> $logFile | Out-Null
+# Perform dotnet publish step ahead of zipping up
+$publishFolder = $(Join-Path $projFolder 'bin\Release\netcoreapp2.2')
+dotnet publish -c release -o $publishFolder -v q > $logFile
+
+if($?) 
+{     
+	# Compress source code
+	Get-ChildItem -Path "$($publishFolder)" | Compress-Archive -DestinationPath "$($zipPath)" -Force | Out-Null
+
+	# Publish zip to Azure
+	Write-Host "> Publishing to Azure ..." -ForegroundColor Green
+	(az webapp deployment source config-zip `
+		--resource-group $resourceGroup `
+		--name $name `
+		--src $zipPath) 2>> $logFile | Out-Null
+} 
+else 
+{       
+	Write-Host "! Could not deploy automatically to Azure. Review the log for more information." -ForegroundColor DarkRed
+	Write-Host "! Log: $($logFile)" -ForegroundColor DarkRed    
+}