Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
567 commits
Select commit Hold shift + click to select a range
8a2175b
partial update based on feedback
JonathanFingold Feb 25, 2020
7bcab42
Fix various issues
JonathanFingold Feb 25, 2020
d98c024
Finish updating C# article based on updated sample
JonathanFingold Feb 26, 2020
a8d0a4b
C172135: Adding hard break
V-vafune Feb 27, 2020
bfd905a
C180774: Adding Hard Break
V-vafune Feb 27, 2020
5299742
Update per Eric's review
JonathanFingold Feb 27, 2020
10ff890
Clump .NET and JS articles separately
JonathanFingold Feb 27, 2020
4b565f4
Add stubs for new sections.
JonathanFingold Feb 27, 2020
8f0da7b
Capture a request from Andrew
JonathanFingold Feb 27, 2020
c8481fe
Fixing issue 1554
Feb 28, 2020
6198ff1
Update bot-service-channel-connect-slack.md
Feb 28, 2020
9228b1f
creating an overview article and structure changes
andrewclear-ms Feb 28, 2020
ed334fc
C180775: Adding Hard Break
V-vafune Feb 28, 2020
40f1bce
Merge pull request #2021 from MicrosoftDocs/anclear/v3-skills
JonathanFingold Feb 28, 2020
e0078bb
Start on JS v3 conversion article
JonathanFingold Feb 28, 2020
cdb9030
Updated image and done some formatting
Feb 28, 2020
d2e19ba
Update bot-service-channel-connect-slack.md
Feb 28, 2020
be0f6e7
Update bot-service-channel-connect-slack.md
Feb 28, 2020
aa4e2f6
Update bot-service-channel-connect-slack.md
Feb 28, 2020
abd8924
Add JS echo skill
JonathanFingold Feb 29, 2020
ea815cf
Update javascript-v3-as-skill.md
JonathanFingold Mar 2, 2020
2ea22c1
WIP
JonathanFingold Mar 2, 2020
5ab8ad6
Finish first draft of v3 JS bot as skill article.
JonathanFingold Mar 2, 2020
28c696e
Update TOC.md
JonathanFingold Mar 2, 2020
3c8e321
final copy edit before review
JonathanFingold Mar 2, 2020
d3dc014
Added numbered steps to the tine sequence diagram
Mar 3, 2020
7b6d208
Issue 1580 fix
Mar 3, 2020
343b2fa
Update bot-builder-python-quickstart.md
emgrol Mar 3, 2020
771f571
C180766: Fixing Missing Hard Break
V-vafune Mar 3, 2020
9e248e9
C180771: Fixing Missing Hard Breaks
V-vafune Mar 3, 2020
d9aa7fe
C180773: Fixing Missing Hard Breaks
V-vafune Mar 3, 2020
b5196f8
Update javascript-v3-as-skill.md
JonathanFingold Mar 3, 2020
81b5bc1
Update re samples PR [2223](https://github.com/microsoft/BotBuilder-S…
JonathanFingold Mar 3, 2020
3d418a4
Link to the convert a v3 bot overview from the general migration over…
JonathanFingold Mar 3, 2020
9cb7a2f
Update skills-conceptual.md
JonathanFingold Mar 3, 2020
537d73e
C180776: Converting plain-text link to MD syntax
v-maudel Mar 4, 2020
4e8ae08
Add <!--note--> and tweak formatting.
JonathanFingold Mar 4, 2020
411a85d
Merge pull request #2027 from V-vafune/patch-7
Kaiqb Mar 4, 2020
7eccdea
Merge branch 'master' into patch-6
Kaiqb Mar 4, 2020
f1fe813
Merge pull request #2026 from V-vafune/patch-6
Kaiqb Mar 4, 2020
de8d1ab
Merge branch 'master' into patch-4
Kaiqb Mar 4, 2020
d4266ea
Merge branch 'master' into patch-3
v-maudel Mar 4, 2020
3228258
Merge pull request #2024 from V-vafune/patch-4
Kaiqb Mar 4, 2020
6e0bd2f
Merge branch 'master' into patch-3
Kaiqb Mar 4, 2020
60cbda3
Merge branch 'master' into patch-3
Kaiqb Mar 4, 2020
54cefe8
Merge pull request #2022 from V-vafune/patch-3
Kaiqb Mar 4, 2020
bfa867c
Merge branch 'master' into patch-3
Kaiqb Mar 4, 2020
564e6e3
Merge pull request #2028 from v-maudel/patch-3
Kaiqb Mar 4, 2020
eb5ddf4
Merge branch 'master' into patch-2
Kaiqb Mar 4, 2020
9fa0321
Merge pull request #2017 from V-vafune/patch-2
Kaiqb Mar 4, 2020
038b0bf
Merge branch 'master' into patch-1
Kaiqb Mar 4, 2020
5170bcd
Merge pull request #2016 from V-vafune/patch-1
Kaiqb Mar 4, 2020
84b3192
Merge branch 'live' into master
Kaiqb Mar 4, 2020
2109d9d
Merge pull request #2030 from MicrosoftDocs/master
Kaiqb Mar 4, 2020
11ecff2
Merge branch 'master' into issue-1580-fix
Kaiqb Mar 4, 2020
5707929
Merge pull request #2023 from MicrosoftDocs/issue-1580-fix
Kaiqb Mar 4, 2020
5bab996
Merge branch 'master' into mm-fixing-issue-1554
Kaiqb Mar 4, 2020
a61770d
Merge pull request #2020 from MicrosoftDocs/mm-fixing-issue-1554
Kaiqb Mar 4, 2020
7c11528
Merge branch 'master' into jf/issues-0225
Kaiqb Mar 4, 2020
4d151be
Merge pull request #2013 from MicrosoftDocs/jf/issues-0225
Kaiqb Mar 4, 2020
07b7a46
Update quickstart-javascript.md
JonathanFingold Mar 4, 2020
9fbb20d
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 4, 2020
b83d80e
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 4, 2020
595b1cf
Merge branch 'master' into mm-fixing-issue-1559
Kaiqb Mar 4, 2020
bc9f60e
Merge pull request #2005 from MicrosoftDocs/mm-fixing-issue-1559
Kaiqb Mar 4, 2020
64dfd9a
Merge branch 'master' into jf/misc-0304
Kaiqb Mar 4, 2020
0a67232
Merge pull request #2031 from MicrosoftDocs/jf/misc-0304
Kaiqb Mar 4, 2020
63eb211
Update bot-builder-authentication.md
Mar 5, 2020
8780f2f
Update bot-builder-authentication.md
Mar 5, 2020
3b3e270
Update bot-builder-authentication.md
Mar 5, 2020
bde621f
Update bot-builder-authentication.md
Mar 5, 2020
27c667e
Update bot-builder-concept-authentication.md
Mar 5, 2020
cb859a2
Update bot-builder-concept-authentication.md
Mar 5, 2020
c9506fb
Issue 1579 fix
Mar 6, 2020
44450ed
Update bot-builder-authentication.md
Mar 6, 2020
ac4a610
Update bot-builder-authentication.md
Mar 6, 2020
1152d9b
Update bot-builder-authentication.md
Mar 6, 2020
8045ead
Update bot-builder-authentication.md
Mar 6, 2020
62b884f
Update TOC.md
Mar 6, 2020
b1a8643
C172027: Fixing Missing Hard Breaks
v-maudel Mar 6, 2020
bcaa9d2
testing highlighting
Mar 6, 2020
c020e37
Update bot-builder-howto-v4-luis.md
emgrol Mar 6, 2020
13425dd
Update bot-builder-authentication.md
Mar 6, 2020
912373a
Update bot-builder-authentication.md
Mar 6, 2020
5561492
Update bot-builder-authentication.md
Mar 7, 2020
4244d76
Added "Create the Azure bot application"
Mar 7, 2020
b475efd
Update bot-builder-authentication.md
Mar 7, 2020
d4c7286
Update bot-builder-authentication.md
Mar 7, 2020
b27bf48
Update bot-builder-authentication.md
Mar 8, 2020
1988442
Update bot-builder-concept-authentication.md
Mar 8, 2020
2dabba5
Update bot-builder-concept-authentication.md
Mar 8, 2020
83708a3
Create bot-builder-auth-security.md
Mar 9, 2020
091e778
Added links
Mar 9, 2020
57734ea
Update bot-builder-concept-authentication.md
Mar 9, 2020
fa3377e
Update bot-builder-concept-authentication.md
Mar 9, 2020
e82dd36
Update bot-builder-concept-authentication.md
Mar 10, 2020
1d809b1
Added link to security considerations.
Mar 11, 2020
adb34c9
Update snippet-channeldata.md
Kaiqb Mar 11, 2020
3f2202d
Creaated new identity providers article
Mar 11, 2020
163d251
Update bot-builder-concept-authentication.md
Mar 11, 2020
971e39d
Fixed heading and related link
Mar 11, 2020
58db46e
Update bot-auth-identity-providers.PNG
Mar 11, 2020
2c63131
Update bot-builder-concept-identity-providers.md
Mar 11, 2020
e7a4f80
Added generic oauth2 providers settigns
Mar 11, 2020
a3f718e
Create auth-generic-provider-oauth2-settings.md
Mar 11, 2020
3cfd574
Fixed app id and secret description
Mar 11, 2020
3e524de
Update bot-builder-concept-identity-providers.md
Mar 11, 2020
8eccd47
Update bot-builder-concept-identity-providers.md
Mar 11, 2020
f0deff1
Update bot-builder-concept-identity-providers.md
Mar 11, 2020
43c5033
Added AAD v1 and v2 settings
Mar 11, 2020
419dbde
Update bot-builder-concept-identity-providers.md
Mar 11, 2020
9e3f472
Update bot-builder-concept-identity-providers.md
Mar 11, 2020
ef58697
Update bot-builder-concept-identity-providers.md
Mar 11, 2020
7a21798
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 12, 2020
7811a2c
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 12, 2020
5758dc0
Merge pull request #2033 from v-maudel/patch-3
Kaiqb Mar 12, 2020
be45f70
Incorporate tech review feedback.
JonathanFingold Mar 12, 2020
a0a900e
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 12, 2020
661e59e
Update bot-builder-concept-identity-providers.md
Mar 12, 2020
2ee5400
Merge branch 'master' into 030520-deployment
emgrol Mar 12, 2020
914cf5c
Added see also and fixed content
Mar 12, 2020
57546b6
Update bot-builder-concept-identity-providers.md
Mar 12, 2020
c2a1945
Simplified and conformed AAAD v1 and AAD v2 providers info
Mar 13, 2020
32b83bf
Fixed typos and missing info
Mar 13, 2020
c19a439
Fixed tables
Mar 13, 2020
df35381
Update auth-aad-v2-settings.md
Mar 13, 2020
9fcc874
Fixed table entries
Mar 13, 2020
a0925fb
C180766: Adding two spaces to create hard break-line before snippet|i…
v-maudel Mar 13, 2020
d131b2a
Update bot-service-channel-directline-extension-net-bot.md
Mar 13, 2020
9aab25d
Linked articles fixed content
Mar 13, 2020
fe8e470
Update bot-service-channel-directline-extension-net-bot.md
Mar 13, 2020
0f3d7d1
Updated content and links
Mar 13, 2020
6bd97ee
Update bot-builder-concept-authentication.md
Mar 13, 2020
cc23f62
Update bot-service-channel-directline-extension-net-bot.md
Mar 16, 2020
04943db
Import Michael Richardson's fix for issue 1600
JonathanFingold Mar 16, 2020
c131a54
Typo fixes (issues 1596 and 1601)
Mar 16, 2020
bd092c4
Update bot-builder-howto-v4-storage.md
emgrol Mar 16, 2020
f1bdc6b
Updated deployment article and snippets
Mar 16, 2020
f0375aa
Update bot-builder-authentication.md
Mar 17, 2020
2ad8e3d
Fix code links (sample was updated).
JonathanFingold Mar 17, 2020
a15c9ef
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 17, 2020
5567a84
Update bot-builder-authentication.md
Mar 17, 2020
36bdd13
Merge pull request #2036 from v-maudel/patch-3
Kaiqb Mar 17, 2020
9819769
Merge branch 'master' into 031620-typo-fixes
Kaiqb Mar 17, 2020
adee29d
Merge pull request #2040 from MicrosoftDocs/031620-typo-fixes
Kaiqb Mar 17, 2020
8f7403d
Merge branch 'master' into jf/issue-1600
Kaiqb Mar 17, 2020
020d3f4
Update bot-builder-concept-authentication.md
Mar 17, 2020
ca21ce5
Merge branch 'master' into 030520-deployment
emgrol Mar 17, 2020
d563f17
03-17-2020 AKA link fixes
Mar 17, 2020
86ce922
Merge branch 'master' into jf/R8-SkillsDialog
JonathanFingold Mar 18, 2020
70b788a
Merge branch 'master' into jf/R8-v3-skills
JonathanFingold Mar 18, 2020
ed73d9b
Updated link to AKA link in botcc
Mar 18, 2020
3f198e4
Fixed bot authetication article based on feedback
Mar 18, 2020
8da0592
Fixed based on feedback.
Mar 18, 2020
f06d141
Merge pull request #1992 from MicrosoftDocs/jf/R8-v3-skills
Kaiqb Mar 18, 2020
ec2c88e
Merge branch 'master' into jf/R8-SkillsDialog
Kaiqb Mar 18, 2020
ad6e944
Merge pull request #2019 from MicrosoftDocs/jf/R8-SkillsDialog
Kaiqb Mar 18, 2020
e488d76
Merge branch 'live' into master
Kaiqb Mar 18, 2020
a1a0e15
Merge pull request #2044 from MicrosoftDocs/master
Kaiqb Mar 18, 2020
c519cdc
Update bot-builder-concept-identity-providers.md
Mar 18, 2020
9e1bd28
Merge branch 'master' into jf/issue-1600
Kaiqb Mar 18, 2020
638af91
Merge pull request #2039 from MicrosoftDocs/jf/issue-1600
Kaiqb Mar 18, 2020
5762602
Merge branch 'master' into mm-fixing-issue-1578
Kaiqb Mar 18, 2020
4ec4a1f
Merge pull request #2037 from MicrosoftDocs/mm-fixing-issue-1578
Kaiqb Mar 18, 2020
d65534b
Merge branch 'master' into kaiqb/r8-fix
Kaiqb Mar 18, 2020
9200445
Update snippet-channeldata.md
Kaiqb Mar 18, 2020
071c362
Merge pull request #2035 from MicrosoftDocs/kaiqb/r8-fix
Kaiqb Mar 18, 2020
04afc8d
Merge branch 'master' into 031720-AKA-links
emgrol Mar 18, 2020
fef0dcd
Merge branch 'master' into 030520-deployment
emgrol Mar 18, 2020
4dc0625
Fixed links and typo
Mar 18, 2020
29e187f
Issue 1606 and 1608 fixes
Mar 19, 2020
c117b2d
Update bot-service-resources-bot-framework-faq.md
john-par Mar 19, 2020
db48274
Update code links
JonathanFingold Mar 19, 2020
101a486
Revert "Update code links"
JonathanFingold Mar 19, 2020
9fa2d00
Update bot-service-debug-inspection-middleware.md
zxyanliu Mar 19, 2020
f6784d8
Added SSO topic and uodated the TOC
Mar 19, 2020
2d72a3a
Merge branch 'master' into 031820-issue-fixes
emgrol Mar 19, 2020
d084933
Merge branch 'master' into 031720-AKA-links
emgrol Mar 19, 2020
e9a57f1
Merge branch 'master' into 030520-deployment
emgrol Mar 19, 2020
181939a
Fixed content added diagrams
Mar 19, 2020
769955a
Update bot-builder-concept-sso.md
Mar 19, 2020
f59b44a
Update bot-builder-concept-sso.md
Mar 19, 2020
a5bea74
Update bot-builder-concept-sso.md
Mar 19, 2020
9811c23
Update bot-builder-concept-sso.md
Mar 19, 2020
886b2a6
Update bot-builder-concept-sso.md
Mar 19, 2020
c1ec82a
Fixed based on Swagat feedback.
Mar 19, 2020
bb9a377
Update bot-builder-concept-identity-providers.md
Mar 20, 2020
70ae648
Update bot-builder-concept-sso.md
Mar 20, 2020
2ccfeda
C180776 Removing Unnecessary Breaking Spaces
V-vafune Mar 20, 2020
cdd7296
Update bot-auth-time-sequence.PNG
Mar 20, 2020
20783bd
Update azure-bot-service-architecture.png
Mar 20, 2020
0476cb0
C180769 Adding Missing Hard Break
V-vafune Mar 20, 2020
d361bab
Merge branch 'master' into mm-sso-authentication
emgrol Mar 20, 2020
99ada52
Fixed based on feedback
Mar 20, 2020
ed02c98
Merge branch 'mm-sso-authentication' of https://github.com/MicrosoftD…
Mar 20, 2020
9601445
Update bot-builder-authentication.md
Mar 20, 2020
891082b
Merge branch 'master' into mm-sso-authentication-howto
emgrol Mar 20, 2020
5aa5bbb
C172136 Adding Missing Hard Breaks
V-vafune Mar 20, 2020
803a926
Update bot-builder-authentication.md
Mar 20, 2020
2cffa42
Merge branch 'mm-sso-authentication-howto' of https://github.com/Micr…
Mar 20, 2020
f176021
C180771 Adding Missing Hard Breaks
V-vafune Mar 20, 2020
6fb66f0
Update bot-builder-authentication.md
Mar 20, 2020
86de54e
Fixed ID
Mar 20, 2020
fc624b3
Merge pull request #2048 from MicrosoftDocs/yl-code-link-0319
Kaiqb Mar 22, 2020
58ce873
Merge branch 'master' into 031820-issue-fixes
Kaiqb Mar 22, 2020
a2932f1
Merge pull request #2045 from MicrosoftDocs/031820-issue-fixes
Kaiqb Mar 22, 2020
151ec53
Merge branch 'master' into patch-5
Kaiqb Mar 22, 2020
36ef40b
Merge pull request #2052 from V-vafune/patch-5
Kaiqb Mar 22, 2020
d6e6907
Merge branch 'master' into patch-4
Kaiqb Mar 22, 2020
1c64a21
Merge pull request #2051 from V-vafune/patch-4
Kaiqb Mar 22, 2020
94693f0
Merge branch 'master' into patch-2
Kaiqb Mar 22, 2020
9af50b1
Merge pull request #2050 from V-vafune/patch-2
Kaiqb Mar 22, 2020
7c1968b
Merge branch 'master' into patch-1
Kaiqb Mar 22, 2020
1d2fdd0
Merge pull request #2049 from V-vafune/patch-1
Kaiqb Mar 22, 2020
7eb32a7
Merge branch 'master' into patch-1
Kaiqb Mar 22, 2020
745b9b3
Merge pull request #2046 from john-par/patch-1
Kaiqb Mar 22, 2020
a4c67d2
Merge branch 'live' into master
Kaiqb Mar 22, 2020
772b927
Merge pull request #2053 from MicrosoftDocs/master
Kaiqb Mar 22, 2020
7162609
Merge branch 'master' into mm-sso-authentication
Kaiqb Mar 22, 2020
5744ccd
Merge branch 'master' into 031720-AKA-links
Kaiqb Mar 22, 2020
b85389b
Merge pull request #2043 from MicrosoftDocs/031720-AKA-links
Kaiqb Mar 22, 2020
0538b1d
Merge branch 'master' into 030520-deployment
Kaiqb Mar 22, 2020
2b9839f
Update snippet-prepare-deploy-intro.md
emgrol Mar 23, 2020
9947311
Apply suggestions from code review
Mar 23, 2020
764b8f5
Update articles/v4sdk/bot-builder-authentication.md
Mar 23, 2020
4630a44
Update bot-builder-authentication.md
Mar 23, 2020
2366325
Merge branch 'mm-sso-authentication-howto' of https://github.com/Micr…
Mar 23, 2020
56b2da5
Update bot-builder-authentication.md
Mar 23, 2020
997f7fb
Merge branch 'master' into mm-sso-authentication-howto
emgrol Mar 23, 2020
1a70df5
Add disclaimer about samples/.NET Core 3.1
JonathanFingold Mar 23, 2020
33be3c3
Reformat workaround note.
JonathanFingold Mar 23, 2020
730cdb6
Update continuous deployment article
JonathanFingold Mar 24, 2020
3950fa4
Update topic
JonathanFingold Mar 24, 2020
47b0b2b
Merge branch 'master' into mm-sso-authentication
Kaiqb Mar 24, 2020
ca27e7c
Merge pull request #2012 from MicrosoftDocs/mm-sso-authentication
Kaiqb Mar 24, 2020
93417ec
Update bot-builder-authentication.md
Mar 24, 2020
df3f1f5
Merge branch 'master' into mm-sso-authentication-howto
Mar 24, 2020
556da65
Merge pull request #2032 from MicrosoftDocs/mm-sso-authentication-howto
Kaiqb Mar 24, 2020
7cdc85a
Merge branch 'live' into master
Kaiqb Mar 25, 2020
64b25f7
Merge pull request #2058 from MicrosoftDocs/master
Kaiqb Mar 25, 2020
e4712f5
Merge branch 'master' into jf/deploy-continuous
Kaiqb Mar 25, 2020
d589115
Merge pull request #2056 from MicrosoftDocs/jf/deploy-continuous
Kaiqb Mar 25, 2020
303dac2
Merge branch 'master' into jf/deploy-workaround
JonathanFingold Mar 26, 2020
1c48fb1
Merge pull request #2054 from MicrosoftDocs/jf/deploy-workaround
Kaiqb Mar 26, 2020
021346e
Merge branch 'master' into 030520-deployment
emgrol Mar 26, 2020
f1d68bb
Merge pull request #2034 from MicrosoftDocs/030520-deployment
Kaiqb Mar 26, 2020
84e41f0
Merge branch 'live' into master
Kaiqb Mar 26, 2020
9d00460
Smoke test (#2066)
v-alje Mar 31, 2020
126c4f8
Merge pull request #2061 from MicrosoftDocs/master
v-alje Apr 1, 2020
47bb809
Merging changes synced from https://github.com/MicrosoftDocs/bot-docs…
openpublishbuild Apr 1, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 8 additions & 5 deletions articles/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
## [Managing state](v4sdk/bot-builder-concept-state.md)
## [Dialogs library](v4sdk/bot-builder-concept-dialog.md)
## [Middleware](v4sdk/bot-builder-concept-middleware.md)
## [User authentication](v4sdk/bot-builder-concept-authentication.md)
## Authentication
### [Bot authentication](v4sdk/bot-builder-concept-authentication.md)
### [Identity providers](v4sdk/bot-builder-concept-identity-providers.md)
### [Single sign on](v4sdk/bot-builder-concept-sso.md)
## [Manage bot resources](v4sdk/bot-file-basics.md)
## [How bots for Microsoft Teams work](v4sdk/bot-builder-basics-teams.md)
## [About skills](v4sdk/skills-conceptual.md)
Expand All @@ -31,15 +34,15 @@
### [Enterprise Productivity bot](bot-service-scenario-enterprise-productivity.md)
### [Information bot](bot-service-scenario-informational.md)
### [Internet of Things bot](bot-service-scenario-internet-things.md)
# How-To
# How-To
## [Design](design/TOC.md)
## Develop
<!-- ## [Best practice for welcoming the user](v4sdk/bot-builder-welcome-user.md) -->
### [Send and receive text message](v4sdk/bot-builder-howto-send-messages.md)
### [Add media to messages](v4sdk/bot-builder-howto-add-media-attachments.md)
### [Add buttons to guide user action](v4sdk/bot-builder-howto-add-suggested-actions.md)
### [Save user and conversation data](v4sdk/bot-builder-howto-v4-state.md)
### [Prompt users for input](v4sdk/bot-builder-primitive-prompts.md)
### [Save user and conversation data](v4sdk/bot-builder-howto-v4-state.md)
### [Prompt users for input](v4sdk/bot-builder-primitive-prompts.md)
### [Send welcome message to users](v4sdk/bot-builder-send-welcome-message.md)
### [Send proactive notifications to users](v4sdk/bot-builder-howto-proactive-message.md)
### [Implement sequential conversation flow](v4sdk/bot-builder-dialog-manage-conversation-flow.md)
Expand All @@ -51,7 +54,7 @@
<!--#### [Implement a greeting dialog](v4sdk/bot-builder-dialogs-greeting.md)--TODO: Add once there's a sample.-->
### [Handle user interruptions](v4sdk/bot-builder-howto-handle-user-interrupt.md)
### [Write directly to storage](v4sdk/bot-builder-howto-v4-storage.md)
### [Add authentication to your bot](v4sdk/bot-builder-authentication.md)
### [Add authentication to a bot](v4sdk/bot-builder-authentication.md)
### [Implement custom storage for your bot](v4sdk/bot-builder-custom-storage.md)
### Skills
#### [Implement a skill](v4sdk/skill-implement-skill.md)
Expand Down
20 changes: 7 additions & 13 deletions articles/bot-builder-deploy-az-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ms.author: kamrani
manager: kamrani
ms.topic: conceptual
ms.service: bot-service
ms.date: 08/06/2019
ms.date: 03/23/2020
monikerRange: 'azure-bot-service-4.0'
---

Expand All @@ -33,57 +33,51 @@ In this article we will show you how to deploy a basic bot to Azure. We will exp

[!INCLUDE [deploy az subscription](~/includes/deploy/snippet-az-set-subscription.md)]


### 3. Create the application registration

[!INCLUDE [deploy create app registration](~/includes/deploy/snippet-create-app-registration.md)]


### 4. Create the bot application service

When creating the bot application service, you can deploy your bot in a new or in an existing resource group. Choose the option that works best for you.

Make sure that you have the correct path to your bot project ARM deployment templates directory `DeploymentTemplates`, you need it to assign the value to `template-file`.


> [!NOTE]
> [!IMPORTANT]
> Python bots cannot be deployed to a resource group that contains Windows services/bots. Multiple Python bots can be deployed to the same resource group, but create other services (LUIS, QnA, etc.) in another resource group.

Make sure that you have the correct path to your bot project ARM deployment templates directory `DeploymentTemplates`, you need it to assign the value to `template-file`.

#### **Deploy via ARM template (with **new** Resource Group)**

<!-- ##### Create Azure resources -->
[!INCLUDE [ARM with new resourece group](~/includes/deploy/snippet-ARM-new-resource-group.md)]
[!INCLUDE [ARM with new resource group](~/includes/deploy/snippet-ARM-new-resource-group.md)]


#### **Deploy via ARM template (with **existing** Resource Group)**

[!INCLUDE [ARM with existing resourece group](~/includes/deploy/snippet-ARM-existing-resource-group.md)]
[!INCLUDE [ARM with existing resource group](~/includes/deploy/snippet-ARM-existing-resource-group.md)]

---

### 5. Prepare your code for deployment

[!INCLUDE [Work around for .NET Core 3.1 SDK](~/includes/deploy/samples-workaround-3-1.md)]

#### 5.1 Retrieve or create necessary IIS/Kudu files

[!INCLUDE [retrieve or create IIS/Kudu files](~/includes/deploy/snippet-IIS-Kudu-files.md)]


#### 5.2 Zip up the code directory manually

[!INCLUDE [zip up code](~/includes/deploy/snippet-zip-code.md)]


## Deploy code to Azure

[!INCLUDE [deploy code to Azure](~/includes/deploy/snippet-deploy-code-to-az.md)]


## Test in Web Chat

[!INCLUDE [test in web chat](~/includes/deploy/snippet-test-in-web-chat.md)]


## Additional information

Deploying your bot to Azure will involve paying for the services you use. The [billing and cost management](https://docs.microsoft.com/azure/billing/) article helps you understand Azure billing, monitor usage and costs, and manage your account and subscriptions.
Expand Down
49 changes: 32 additions & 17 deletions articles/bot-service-build-continuous-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ms.author: kamrani
manager: kamrani
ms.topic: article
ms.service: bot-service
ms.date: 12/10/2019
ms.date: 03/23/2020
monikerRange: 'azure-bot-service-4.0'
---

Expand All @@ -18,53 +18,68 @@ monikerRange: 'azure-bot-service-4.0'
This article shows you how to configure continuous deployment for your bot. You can enable continuous deployment to automatically deploy code changes from your source repository to Azure. In this topic, we'll cover setting up continuous deployment for GitHub. For information on setting up continuous deployment with other source control systems, see the additional resource section at the bottom of this page.

## Prerequisites

- If you don't have an Azure subscription, create a [free account](https://portal.azure.com) before you begin.
- You **must** [deploy your bot to Azure](bot-builder-deploy-az-cli.md) before enabling continuous deployment.

## Prepare your repository
Make sure that your repository root has the correct files in your project. This will allow you to get automatic builds from the Azure App Service Kudu build server.

Make sure that your repository root has the correct files in your project. This will allow you to get automatic builds from the build provider.

|Runtime | Root directory files |
|:-------|:---------------------|
| ASP.NET Core | .sln or .csproj |
| Node.js | server.js, app.js, or package.json with a start script |
| Python | app.py |


## Continuous deployment using GitHub

To enable continuous deployment with GitHub, navigate to the **App Service** page for your bot in the Azure portal.

Click **Deployment Center** > **GitHub** > **Authorize**.
1. Click **Deployment Center** > **GitHub** > **Authorize**.

![Continous deployment](~/media/azure-bot-build/azure-deployment.png)

![Continous deployment](~/media/azure-bot-build/azure-deployment.png)
1. In the browser window that opens up, click **Authorize AzureAppService**.

In the browser window that opens up, click **Authorize AzureAppService**.
![Azure Github Permission](~/media/azure-bot-build/azure-deployment-github.png)

![Azure Github Permission](~/media/azure-bot-build/azure-deployment-github.png)
1. After authorizing the **AzureAppService**, go back to **Deployment Center** in the Azure portal.

After authorizing the **AzureAppService**, go back to **Deployment Center** in the Azure portal.
1. Click **Continue**.

1. Click **Continue**.
> [!div class="mx-imgBorder"]
> ![Continue to build provider](~/media/azure-bot-build/azure-deployment-continue.png)

1. Select **App Service build service**.
1. On the **Build provider** page, select the build provider you want to use and click **Continue**.

1. Click **Continue**.
> [!IMPORTANT]
> With the release of the Bot Framework 4.8 SDK, the .NET Bot Framework samples now target the .NET Core 3.1 SDK.
> Not all Azure data centers are configured to build such bots.
>
> See the map of [.NET Core on App Service](https://aspnetcoreon.azurewebsites.net/) for the centers in which you can build .NET Core 3.1 apps using Kudu. (All centers can run .NET Core 3.1 apps.)
>
> If you you are deploying a bot that targets the .NET Core 3.1 SDK and you are deploying to a center that can't build .NET Core 3.1 apps using Kudu, use either **GitHub Actions (Preview)** or **Azure Pipelines (Preview)** for your build provider.

> [!div class="mx-imgBorder"]
> ![Select build provider](~/media/azure-bot-build/azure-deployment-build-provider.png)

1. Select **Organization**, **Repository**, and **Branch**.
1. On the **Configure** page, enter the required information and click **Continue**. The information required will depend on which source control service and build provider you chose.

1. Click **Continue**, and then **Finish** to complete the setup.
1. On the **Summary** page, review the settings and then click **Finish**.

At this point, continuous deployment with GitHub is set up. Whenever you commit to the source code repository, your changes will automatically be deployed to the Azure Bot Service.
At this point, continuous deployment with GitHub is set up. New commits in the selected repository and branch now deploy continuously into your App Service app. You can track the commits and deployments on the **Deployment Center** page.

## Disable continuous deployment

While your bot is configured for continuous deployment, you may not use the online code editor to make changes to your bot. If you want to use the online code editor, you can temporarily disable continuous deployment.

To disable continuous deployment, do the following:
1. In the [Azure portal](https://portal.azure.com), go to your bot's **All App Service settings** blade and click **Deployment Center**.

1. In the [Azure portal](https://portal.azure.com), go to your bot's **All App Service settings** blade and click **Deployment Center**.
1. Click **Disconnect** to disable continuous deployment. To re-enable continuous deployment, repeat the steps from the appropriate sections above.

## Additional resources
- To enable continuous deployment from BitBucket and Azure DevOps Services, see [continous deployment using Azure App Service](https://docs.microsoft.com/azure/app-service/deploy-continuous-deployment).


- For more information about continuous deployment in Azure, see [continuous deployment to Azure App Service](https://docs.microsoft.com/azure/app-service/deploy-continuous-deployment).
- When you use GitHub actions for the build provider, a workflow is created in your repository. You can learn more about using [GitHub Actions](https://help.github.com/en/actions) on the GitHub site.
19 changes: 15 additions & 4 deletions articles/bot-service-channel-connect-directlinespeech.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ms.author: travisw

You can configure your bot to allow client applications to communicate with it through the Direct Line Speech channel.

Once you have built your bot, onboarding it with Direct Line Speech will enable low latency, high reliability connection with client applications using the [Speech SDK](https://aka.ms/speech/sdk). These connections are optimized for voice in, voice out conversational experiences. For more information on Direct Line Speech and how to build client applications, visit the [custom voice-first virtual assistant](https://aka.ms/bots/speech/va) page.
Once you have built your bot, onboarding it with Direct Line Speech will enable low latency, high reliability connection with client applications using the [Speech SDK](https://aka.ms/speech-service-docs). These connections are optimized for voice in, voice out conversational experiences. For more information on Direct Line Speech and how to build client applications, visit the [custom voice-first virtual assistant](https://aka.ms/cognitive-services-voice-assistants) page.

## Add the Direct Line Speech channel

Expand All @@ -29,9 +29,20 @@ Once you have built your bot, onboarding it with Direct Line Speech will enable

![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-connectspeechchannel.png "connecting Direct Line Speech")

1. Direct Line Speech Channel requires a Cognitive Services resource. You can either use an existing resource or create a new Cognitive Services resource following the [instructions](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account).
1. Configure the Direct Line Speech as shown in the picture below.

![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-cognitivesericesaccount-selection.png "selecting Cogntive Services resource")
![selecting direct line speech channel](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-cognitivesericesaccount-selection.png "selecting Cognitive Services resource")

The Direct Line Speech Channel requires a Cognitive Services resource, specifically a **speech** cognitive service resource. You can either use an existing resource or create a new one. To create a new speech resource follow these steps:

- Go to the [Azure portal create resources](https://ms.portal.azure.com/#create/hub).
- Search for *Speech* and select it from the drop-down list. The following is displayed:

![create speech cognitive resource](media/voice-first-virtual-assistants/create-speech-cognitive-resource.PNG "Create speech cognitive resource")

- Follow the wizard steps.

For additional information, see [Create a Cognitive Services resource](https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account).

1. Once you've reviewed the terms of use, click `Save` to confirm your channel selection.

Expand All @@ -41,7 +52,7 @@ Once you have built your bot, onboarding it with Direct Line Speech will enable

With the Direct Line Speech channel connected to your bot, you now need to enable Bot Framework Protocol Streaming Extensions support for optimal, low-latency interaction.

1. If you haven't already, open the blade for your bot in the [Azure Portal](https://portal.azure.com).
1. If you haven't already, open the blade for your bot in the [Azure Portal](https://portal.azure.com).

1. Click on **Settings** under the **Bot Management** category (right below **Channels**). Click the checkbox for **Enable Streaming Endpoint**.

Expand Down
8 changes: 4 additions & 4 deletions articles/bot-service-channel-connect-facebook.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Ensure that the Facebook Page associated with this bot is published. Status appe
>
> Facebook will only consider integrations with limited access to Workplace data (low sensitivity permissions) eligible for continued use until December 31, 2020 if such integrations have completed and passed Security RFI and if the developer reaches out before January 15, 2020 via [Direct Support](https://my.workplace.com/work/admin/direct_support) to request continued use of the app.
>
> Bot Framework adapters are available for [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) and [C#/.NET](https://aka.ms/bf-workplace-csharp) bots.
> Bot Framework adapters are available for [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) and [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter) bots.

Facebook Workplace is a business-oriented version of Facebook, which allows employees to easily connect and collaborate. It contains live videos, news feeds, groups, messenger, reactions, search, and trending posts. It also supports:

Expand Down Expand Up @@ -176,11 +176,11 @@ Create a [custom integration](https://developers.facebook.com/docs/workplace/cus

### Update your bot code with Facebook adapter

Your bot's source code needs to be updated to include an adapter to communicate with Workplace by Facebook. Adapters are available for [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) and [C#/.NET](https://aka.ms/bf-workplace-csharp) bots.
Your bot's source code needs to be updated to include an adapter to communicate with Workplace by Facebook. Adapters are available for [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) and [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter) bots.

### Provide Facebook credentials

You will need to update appsettings.json of your bot with **Facebook App ID**, **Facebook App Secret** and **Page Access Token** values copied from the Facebook Workplace previously. Instead of a traditional pageID, use the numbers following the integrations name on its **About** page. Follow these instructions to update your bot source code in [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) or [C#/.NET](https://aka.ms/bf-workplace-csharp).
You will need to update appsettings.json of your bot with **Facebook App ID**, **Facebook App Secret** and **Page Access Token** values copied from the Facebook Workplace previously. Instead of a traditional pageID, use the numbers following the integrations name on its **About** page. Follow these instructions to update your bot source code in [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) or [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter).

### Submit for review

Expand All @@ -199,7 +199,7 @@ If you receive a notification from Facebook about deprecation of a certain versi
## Connect a bot to Facebook using the Facebook adapter

Use the Bot Framework Facebook adapter to connect your bot with Facebook Workplace. To connect to Facebook messenger, you can use the Facebook channel or the Facebook adapter.
Facebook adapters are available for [JavaScript/Node.js](https://aka.ms/botframework-workplace-adapter) and [C#/.NET](https://aka.ms/bf-workplace-csharp) bots.
Facebook adapters are available for [JavaScript/Node.js](https://aka.ms/npm-botbuilder-adapter-facebook) and [C#/.NET](https://aka.ms/botbuilder-dotnet-facebook-adapter) bots.

In this article you will learn how to connect a bot to Facebook using the adapter. This article will walk you through modifying the EchoBot sample to connect it to Facebook.

Expand Down
4 changes: 2 additions & 2 deletions articles/bot-service-channel-connect-skypeforbusiness.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Skype for Business Online keeps you connected with co-workers and business partn

> [!IMPORTANT]
> **Skype for Business channel of Bot Framework was deprecated on June 30, 2019.**
>
> Skype for Business channel stopped accepting new bots on June 30, 2019. Existing bots continued operating through October 31, 2019. The channel is currently being deprecated, and no production loads should be using it. Microsoft Teams is the preferred communication tool from Microsoft. Learn how to [connect your bot to Microsoft Teams](https://msdn.microsoft.com/microsoft-teams/bots).
>
> Skype for Business channel stopped accepting new bots on June 30, 2019. Existing bots continued operating through October 31, 2019. The channel is currently being deprecated, and no production loads should be using it. Microsoft Teams is the preferred communication tool from Microsoft. Learn how to [connect your bot to Microsoft Teams](https://aka.ms/channel-connect-teams).
Loading