Merge branch 'master' of https://github.com/Microsoft/BotBuilder

CSharp/Documentation/Documentation.csproj

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ExecDoxygen" InitialTargets="MessagesD">
   <PropertyGroup>
-    <DoxygenExe>Doxygen.1.8.11\tools\bin\doxygen.exe</DoxygenExe>
-    <RootPath>$(MSBuildThisFileDirectory)..\packages\</RootPath>
-    <DoxygenExeFullPath>$(RootPath)$(DoxygenExe)</DoxygenExeFullPath>
+    <MyProgramFiles>$(ProgramW6432)</MyProgramFiles>
+    <MyProgramFiles Condition="$(MyProgramFiles) == ''">$(ProgramFiles)</MyProgramFiles>
+    <DoxygenExec>$(MyProgramFiles)\doxygen\bin\doxygen.exe</DoxygenExec>
     <IsBuildingInTeamBuild Condition="'$(OutDir)' != ''">True</IsBuildingInTeamBuild>
     <ConfigFileFullPath>$(MSBuildThisFileDirectory)Doxyfile</ConfigFileFullPath>
     <SccProjectName>SAK</SccProjectName>
@@ -23,7 +23,7 @@
   </PropertyGroup>
   <Target Name="ExecDoxygen" Condition="'$(Configuration)' == '' OR '$(RunDoxygen)' == 'True'">
     <Message Text="Generating documentation files." />
-    <Exec Command="&quot;$(DoxygenExeFullPath)&quot; &quot;$(ConfigFileFullPath)&quot;" />
+    <Exec WorkingDirectory="$(MSBuildThisFileDirectory)" Command="&quot;$(DoxygenExec)&quot; &quot;$(ConfigFileFullPath)&quot;" />
     <Message Text="Documentation completed." />
   </Target>
   <ItemGroup>
@@ -65,8 +65,6 @@
   <Target Name="MessagesD">
     <Message Text="%24(Configuration) = %22$(Configuration)%22" />
     <Message Text="%24(RunDoxygen) = %22$(RunDoxygen)%22" />
-    <Message Text="%24(RootPath) = %22$(RootPath)%22" />
-    <Message Text="%24(DoxygenExeFullPath) = %22$(DoxygenExeFullPath)%22" />
     <Message Text="%24(ConfigFileFullPath) = %22$(ConfigFileFullPath)%22" />
     <Message Text="%24(OutDir) = %22$(OutDir)%22" />
   </Target>

CSharp/Documentation/Doxyfile

@@ -2034,7 +2034,7 @@ CLASS_DIAGRAMS         = YES
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            = ..\packages\Mscgen.0.2.0\tools\
+MSCGEN_PATH            = $(ProgramFiles(x86))\Mscgen
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
@@ -2228,7 +2228,7 @@ INTERACTIVE_SVG        = NO
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = ..\packages\Graphviz.2.36.0\tools\bin\
+DOT_PATH               = $(ProgramFiles(x86))\Graphviz2.38\bin\
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile

CSharp/Documentation/doxygen.bat

@@ -1 +1,2 @@
-..\packages\Doxygen.1.8.11\tools\bin\doxygen.exe %1 %2 %3
+cd %~dp0
+"%ProgramFiles%\doxygen\bin\doxygen.exe" %1 %2 %3

CSharp/Documentation/header.html

@@ -13,7 +13,7 @@ $search
 $mathjax
 <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
 $extrastylesheet
-<link rel="stylesheet" href="/css/documentation.css">
+<link rel="stylesheet" href="http://docs.botframework.com/css/documentation.css">
     <script type="text/javascript">
         $(document).ready(function () {
             var sidenav = $('#side-nav');

CSharp/Documentation/packages.config

@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Doxygen" version="1.8.11" targetFramework="net40" />
-  <package id="Graphviz" version="2.36.0" targetFramework="net40" />
-  <package id="Mscgen" version="0.2.0" targetFramework="net40" />
 </packages>

CSharp/Library/README.md

@@ -0,0 +1,14 @@
+# Microsoft Bot Builder Overview
+
+Microsoft Bot Builder is a powerful framework for constructing bots that can handle both freeform interactions and more guided ones where the possibilities are explicitly shown to the user. It is easy to use and leverages C# to provide a natural way to write Bots.
+
+High Level Features:
+* Powerful dialog system with dialogs that are isolated and composable.  
+* Built-in dialogs for simple things like Yes/No, strings, numbers, enumerations.  
+* Built-in dialogs that utilize powerful AI frameworks like [LUIS](http://luis.ai)
+* Bots are stateless which helps them scale.  
+* Form Flow for automatically generating a Bot from a C# class for filling in the class and that supports help, navigation, clarification and confirmation.
+
+[Get started with the Bot Builder!](http://docs.botframework.com/sdkreference/csharp/)
+
+This is the actual SDK code.

CSharp/Microsoft.Bot.Builder.sln

@@ -6,14 +6,23 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Bot.Builder", "Library\Microsoft.Bot.Builder.csproj", "{CDFEC7D6-847E-4C13-956B-0A960AE3EB60}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{FAEFFF66-7944-48F4-972A-9A1C13A5C206}"
+	ProjectSection(SolutionItems) = preProject
+		Samples\README.md = Samples\README.md
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{28BCEB2C-F4BE-416D-A4FD-A311E99A9EB5}"
+	ProjectSection(SolutionItems) = preProject
+		Library\README.md = Library\README.md
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8E05398E-3CBE-4DCD-9382-072DC8859427}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormTest", "Tests\FormTest\FormTest.csproj", "{77BD8C61-FB06-4BF7-A346-D2C87284390A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{8B80380D-BA94-4257-842B-D8BC185EDEA5}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Documentation", "Documentation\Documentation.csproj", "{72C60ACB-4804-4584-AD49-00289A89F227}"
 EndProject

CSharp/README.md

@@ -10,3 +10,13 @@ High Level Features:
 * Form Flow for automatically generating a Bot from a C# class for filling in the class and that supports help, navigation, clarification and confirmation.
 
 [Get started with the Bot Builder!](http://docs.botframework.com/sdkreference/csharp/)
+
+The code itself uses Nuget which restores all needed files when built.  If you want to build the documentation, 
+you will need to install [Doxygen](http://www.stack.nl/~dimitri/doxygen/), [GraphViz](http://graphviz.org/) and [Mscgen](http://www.mcternan.me.uk/mscgen/)
+Here are step by step instructions:
+
+1. Download and install from the [Doxygen Windows Installer](http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.11-setup.exe).
+2. Download and install from the [GraphViz Windows Installer](http://graphviz.org/pub/graphviz/stable/windows/graphviz-2.38.msi)
+3. Download and install from the [Mscgen Windows Installer](http://www.mcternan.me.uk/mscgen/software/mscgen_0.20.exe)
+
+If versions have changed you can find the latest through the core pages above, although you may need to update the Doxygen config file with the appropriate version of tools.

CSharp/Samples/README.md

@@ -0,0 +1,20 @@
+# Microsoft Bot Builder Overview
+
+Microsoft Bot Builder is a powerful framework for constructing bots that can handle both freeform interactions and more guided ones where the possibilities are explicitly shown to the user. It is easy to use and leverages C# to provide a natural way to write Bots.
+
+High Level Features:
+* Powerful dialog system with dialogs that are isolated and composable.  
+* Built-in dialogs for simple things like Yes/No, strings, numbers, enumerations.  
+* Built-in dialogs that utilize powerful AI frameworks like [LUIS](http://luis.ai)
+* Bots are stateless which helps them scale.  
+* Form Flow for automatically generating a Bot from a C# class for filling in the class and that supports help, navigation, clarification and confirmation.
+
+[Get started with the Bot Builder!](http://docs.botframework.com/sdkreference/csharp/)
+
+There are six samples in this directory.
+* Microsoft.Bot.Sample.SimpleEchoBot -- Bot Connector example done with the Bot Builder framework.
+* Microsoft.Bot.Sample.EchoBot -- Add state onto the previous example.
+* Microsoft.Bot.Sample.SimpleSandwichBot -- FormFlow example of how easy it is to create a rich dialog with guided conversation, help and clarification. 
+* Microsoft.Bot.Sample.AnnotatedSandwichBot -- Builds on the previous example to add attributes, messages, confirmation and business logic.
+* Microsoft.Bot.Sample.SimpleAlarmBot -- Integration of http://luis.ai with the dialog system to set alarms.
+* Microsoft.Bot.Sample.PizzaBot -- Integration of http://luis.ai with FormFlow.

README.md

@@ -1,10 +1,10 @@
 # Bot Builder SDK
 
-The Microsoft Bot Builder SDK is a core piece of the Microsoft Bot Framework.
+The Microsoft Bot Builder SDK is one of three main components of the Microsoft Bot Framework.
 
-The Microsoft Bot Framework provides everything you need to build and connect intelligent bots that interact naturally wherever your users are talking, from text/sms to Skype, Slack, Office 365 mail and other popular services.
+The Microsoft Bot Framework provides just what you need to build and connect intelligent bots that interact naturally wherever your users are talking, from text/sms to Skype, Slack, Office 365 mail and other popular services.
 
-<img alt="Bot Framework Diagram" src="http://fuseserver01/images/bot_framework_wht_bkgrnd.png"/>
+![Bot Framework Diagram](http://botframework.blob.core.windows.net/web/images/bot_framework_wht_bkgrnd.png)
 
 Bots (or conversation agents) are rapidly becoming an integral part of one’s digital experience – they are as vital a way for users to interact with a service or application as is a web site or a mobile experience. Developers writing bots all face the same problems: bots require basic I/O; they must have language and dialog skills; and they must connect to users – preferably in any conversation experience and language the user chooses. The Bot Framework provides tools to easily solve these problems and more for developers e.g., automatic translation to more than 30 languages, user and conversation state management, debugging tools, an embeddable web chat control and a way for users to discover, try, and add bots to the conversation experiences they love.