Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a6575c4
Virtual Assistant Client for Android - initial public commit
abiemann Jun 5, 2019
f1a1d45
updated .gitignore to ensure the /src/debug folder is not ignored
abiemann Jun 5, 2019
bb15f07
implemented feedback from PR 1493
abiemann Jun 6, 2019
ebe4e8d
Merge branch 'master' of
abiemann Jun 6, 2019
d279659
Merge branch 'microsoft-master'
abiemann Jun 6, 2019
63caa76
code cleanup after merge
abiemann Jun 6, 2019
ee4b105
Merge pull request #2 from microsoft/master
abiemann Jun 7, 2019
df6e578
fixes possible exception due to race condition
abiemann Jun 7, 2019
b34ca77
fix: release created and stopped audio records
abiemann Jun 7, 2019
47e3531
added timeout event so that client app can notify user
abiemann Jun 11, 2019
eac6c72
Merge pull request #3 from microsoft/master
abiemann Jun 11, 2019
3390342
Merge branch 'work_in_progress'
abiemann Jun 11, 2019
10e3338
WIP adaptive card click events
abiemann Jun 11, 2019
8b8bb54
WIP adaptive card clicking
abiemann Jun 12, 2019
ca58d71
finished implementation of adaptive card clicking
abiemann Jun 12, 2019
57765f0
Updated Location event so that the data is consumed properly
abiemann Jun 17, 2019
fbc0935
Merge pull request #4 from microsoft/master
abiemann Jun 17, 2019
786757b
Merge branch 'master' into work_in_progress
abiemann Jun 17, 2019
c7a6371
additional IPA -> VA changes
abiemann Jun 17, 2019
ef55b64
logcat logging of complete JSON data
abiemann Jun 17, 2019
91dbddb
using suggested actions for adaptive card click
abiemann Jun 18, 2019
5b63bfe
undo incorrect commit
abiemann Jun 18, 2019
fe45b98
added suggested actions feature
abiemann Jun 18, 2019
7c85e35
Merge pull request #5 from microsoft/master
abiemann Jun 18, 2019
22012bf
Merge branch 'master' of ssh://git@github.com/abiemann/botframework-s…
abiemann Jun 18, 2019
50ec233
updates to allow the service to receive connections from other apps
abiemann Jun 20, 2019
b3f802c
small code updates + locationProvider threading fix
abiemann Jun 21, 2019
cfb35cc
finished feature to broadcast data to other apps
abiemann Jun 24, 2019
ab8096c
Merge pull request #6 from microsoft/master
abiemann Jun 24, 2019
c97b339
Merge branch 'master' into work_in_progress
abiemann Jun 24, 2019
8053d80
Merge pull request #7 from microsoft/master
abiemann Jun 26, 2019
ddb4978
added initial readme for Android app
abiemann Jun 26, 2019
58ad4a7
Update readme.md
darrenj Jun 26, 2019
3e29211
added feature to show full conversation
abiemann Jun 27, 2019
6ff5c01
latest upstream changes (#8)
abiemann Jun 27, 2019
79aa92c
Merge branch 'master' into work_in_progress
abiemann Jun 27, 2019
b82bea0
implements #1497 "react to additional received activity types"
abiemann Jun 27, 2019
7bf2068
added sound effects, fixes #1684
abiemann Jun 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/Tasks/Pull-Request-Commenter/Default/default.txt
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions .github/Tasks/Pull-Request-Commenter/bots.txt

This file was deleted.

5 changes: 0 additions & 5 deletions .github/Tasks/Pull-Request-Commenter/default.txt

This file was deleted.

6 changes: 0 additions & 6 deletions .github/Tasks/Pull-Request-Commenter/deployment_scripts.txt

This file was deleted.

8 changes: 8 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name-template: v$NEXT_PATCH_VERSION
tag-template: v$NEXT_PATCH_VERSION
branches:
- master
template: |
## What’s Changed

$CHANGES
11 changes: 11 additions & 0 deletions docs/reference/knownissues.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
8 changes: 4 additions & 4 deletions lib/typescript/botskills/src/functionality/connectSkill.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`);

Expand Down
4 changes: 2 additions & 2 deletions lib/typescript/botskills/src/functionality/refreshSkill.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
"bingServiceName": {
"type": "string",
"defaultValue": "[concat(parameters('name'), '-bing')]"
},
"azureMapsServiceName": {
"type": "string",
"defaultValue": "[concat(parameters('name'), '-maps')]"
}
},
"variables": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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]"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading