Update Master from Next

.gitignore

@@ -378,4 +378,4 @@ ASALocalRun/
 *.lzma
 *.cab
 .DS_Store
-/.project
+/.project

README.md

@@ -39,3 +39,4 @@ Security issues and bugs should be reported privately, via email, to the Microso
 ## License
 Copyright (c) Microsoft Corporation. All rights reserved.
 
+

build.botbuilder-libs.ts.ps1 → build/build.botbuilder-libs.ts.ps1

@@ -6,7 +6,7 @@ if (-not $version) {
     Write-Host "Version for botbuilder-libs required!.  Please use the param -version" -ForegroundColor DarkRed
 }
 
-pushd .\lib\typescript
+pushd ..\sdk\typescript\libraries
 
 node .\common\scripts\install-run-rush.js install --no-link
 
@@ -35,7 +35,7 @@ if (-not(test-path ".\outputpackages"))
 
 pushd .\outputpackages
 
-npm pack ..\lib\typescript\botbuilder-solutions
-npm pack ..\lib\typescript\botbuilder-skills
+npm pack ..\..\sdk\typescript\libraries\botbuilder-solutions
+npm pack ..\..\sdk\typescript\libraries\botbuilder-skills
 
 popd

build.botskills.ts.ps1 → build/build.botskills.ts.ps1

@@ -6,7 +6,7 @@ if (-not $version) {
     Write-Host "Version for botskills CLI tool required!.  Please use the param -version" -ForegroundColor DarkRed
 }
 
-pushd .\tools\botskills
+pushd tools\botskills
 
 npm install
 npm version $($version) --allow-same-version

build/build.generator-assistant.ts.ps1

@@ -0,0 +1,26 @@
+Param(
+	[string] $version
+)
+
+if (-not $version) {
+    Write-Host "Version for generator-botbuilder-assistant required!.  Please use the param -version" -ForegroundColor DarkRed
+}
+
+pushd ..\templates\Virtual-Assistant-Template\typescript\generator-botbuilder-assistant
+
+npm install
+npm version $($version) --allow-same-version
+npm run lint
+
+popd
+
+if (-not(test-path ".\outputpackages"))
+{
+      New-Item -ItemType directory -Path ".\outputpackages"
+}
+
+pushd .\outputpackages
+
+npm pack ..\..\templates\Virtual-Assistant-Template\typescript\generator-botbuilder-assistant
+
+popd

build/yaml/csharp/botbuilder-skills.yml

@@ -0,0 +1,63 @@
+# specific branch build
+trigger:
+  branches:  
+    include:
+    - master
+    - feature/*
+
+  paths:
+    include:
+    - 'sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/*'
+
+# By default will disable PR builds
+pr: none
+
+pool:
+   name: Hosted VS2017
+   demands:
+    - msbuild
+    - visualstudio
+
+variables:
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: DotNetCoreInstaller@0
+  displayName: 'Use .NET Core sdk 2.2.100'
+  inputs:
+    version: 2.2.100
+  continueOnError: true
+
+- task: NuGetToolInstaller@0
+  displayName: 'Use NuGet 4.9.1'
+  inputs:
+    versionSpec: 4.9.1
+
+- task: NuGetCommand@2
+  displayName: 'NuGet restore'
+  inputs:
+    restoreSolution: 'sdk\csharp\Microsoft.Bot.Builder.Solutions.sln'
+
+- task: VSBuild@1
+  displayName: 'Build solution Microsoft.Bot.Builder.Solutions.sln'
+  inputs:
+    solution: sdk\csharp\Microsoft.Bot.Builder.Solutions.sln
+    vsVersion: '16.0'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+- task: DotNetCoreCLI@2
+  displayName: 'test results'
+  inputs:
+    command: test
+    projects: '$(System.DefaultWorkingDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests\Microsoft.Bot.Builder.Solutions.Skills.Tests.csproj'
+    arguments: '-v n --configuration $(buildConfiguration) --no-build --no-restore --filter TestCategory!=IgnoreInAutomatedBuild /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
+    workingDirectory: 'sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests'
+
+- task: PublishCodeCoverageResults@1
+  displayName: 'Publish code coverage'
+  inputs:
+    codeCoverageTool: Cobertura
+    summaryFileLocation: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests\Microsoft.Bot.Builder.Solutions.Skills.Tests\coverage.cobertura.xml'
+    reportDirectory: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests'

build/yaml/csharp/botbuilder-solutions.yml

@@ -0,0 +1,63 @@
+# specific branch build
+trigger:
+  branches:  
+    include:
+    - master
+    - feature/*
+
+  paths:
+    include:
+    - 'sdk/csharp/libraries/microsoft.bot.builder.solutions/*' 
+
+# By default will disable PR builds
+pr: none
+
+pool:
+   name: Hosted VS2017
+   demands:
+    - msbuild
+    - visualstudio
+
+variables:
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: DotNetCoreInstaller@0
+  displayName: 'Use .NET Core sdk 2.2.100'
+  inputs:
+    version: 2.2.100
+  continueOnError: true
+
+- task: NuGetToolInstaller@0
+  displayName: 'Use NuGet 4.9.1'
+  inputs:
+    versionSpec: 4.9.1
+
+- task: NuGetCommand@2
+  displayName: 'NuGet restore'
+  inputs:
+    restoreSolution: 'sdk\csharp\Microsoft.Bot.Builder.Solutions.sln'
+
+- task: VSBuild@1
+  displayName: 'Build solution Microsoft.Bot.Builder.Solutions.sln'
+  inputs:
+    solution: sdk\csharp\Microsoft.Bot.Builder.Solutions.sln
+    vsVersion: '16.0'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+- task: DotNetCoreCLI@2
+  displayName: 'test results'
+  inputs:
+    command: test
+    projects: '$(System.DefaultWorkingDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.tests\Microsoft.Bot.Builder.Solutions.Tests.csproj'
+    arguments: '-v n --configuration $(buildConfiguration) --no-build --no-restore --filter TestCategory!=IgnoreInAutomatedBuild /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
+    workingDirectory: 'sdk\csharp\tests\microsoft.bot.builder.solutions.tests'
+
+- task: PublishCodeCoverageResults@1
+  displayName: 'Publish code coverage'
+  inputs:
+    codeCoverageTool: Cobertura
+    summaryFileLocation: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.tests\coverage.cobertura.xml'
+    reportDirectory: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.tests'

build/yaml/typescript/botbuilder-skills.yml

@@ -0,0 +1,54 @@
+# specific branch build
+trigger:
+  branches:  
+    include:
+    - master
+    - feature/*
+
+  paths:
+    include:
+    - 'sdk/typescript/libraries/botbuilder-skills/*'
+
+# By default will disable PR builds
+pr: none
+
+pool:
+  vmImage: 'vs2017-win2016'
+steps:
+- task: NodeTool@0
+  displayName: 'Use Node 10.'
+  inputs:
+    versionSpec: 10.x
+
+- pwsh: 'node ./common/scripts/install-run-rush.js install --no-link'
+  workingDirectory: sdk/typescript/libraries
+  displayName: 'rush install'
+
+- pwsh: 'node ./common/scripts/install-run-rush.js link'
+  workingDirectory: sdk/typescript/libraries
+  displayName: 'rush link'
+
+- pwsh: 'node ./common/scripts/install-run-rush.js build'
+  workingDirectory: sdk/typescript/libraries
+  displayName: 'rush build'
+
+- pwsh: 'npm run test-coverage-ci'
+  errorActionPreference: continue
+  ignoreLASTEXITCODE: 'true'
+  workingDirectory: sdk/typescript/libraries/botbuilder-skills
+  displayName: 'npm test coverage'
+
+- task: PublishTestResults@2
+  displayName: 'publish test results'
+  inputs:
+    testResultsFiles: 'test-results.xml'
+    searchFolder: 'sdk/typescript/libraries/botbuilder-skills'
+    failTaskOnFailedTests: true
+
+- task: PublishCodeCoverageResults@1
+  displayName: 'Publish code coverage'
+  condition: succeededOrFailed()
+  inputs:
+    codeCoverageTool: Cobertura
+    summaryFileLocation: 'sdk/typescript/libraries/botbuilder-skills/coverage/cobertura-coverage.xml'
+    reportDirectory: 'sdk/typescript/libraries/botbuilder-skills/coverage/'

build/yaml/typescript/botbuilder-solutions.yml

@@ -0,0 +1,55 @@
+# specific branch build
+trigger:
+  branches:  
+    include:
+    - master
+    - feature/*
+
+  paths:
+    include:
+    - 'sdk/typescript/libraries/botbuilder-solutions/*'
+
+# By default will disable PR builds
+pr: none
+
+pool:
+  vmImage: 'vs2017-win2016'
+steps:
+- task: NodeTool@0
+  displayName: 'Use Node 10.'
+  inputs:
+    versionSpec: 10.x
+
+- pwsh: 'node ./common/scripts/install-run-rush.js install --no-link'
+  workingDirectory: sdk/typescript/libraries
+  displayName: 'rush install'
+
+- pwsh: 'node ./common/scripts/install-run-rush.js link'
+  workingDirectory: sdk/typescript/libraries
+  displayName: 'rush link'
+
+- pwsh: 'node ./common/scripts/install-run-rush.js build'
+  workingDirectory: sdk/typescript/libraries
+  displayName: 'rush build'
+
+- pwsh: 'npm run test-coverage-ci'
+  errorActionPreference: continue
+  ignoreLASTEXITCODE: 'true'
+  workingDirectory: sdk/typescript/libraries/botbuilder-solutions
+  displayName: 'npm test coverage'
+
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results '
+  inputs:
+    testResultsFiles: 'test-results.xml'
+    searchFolder: 'sdk/typescript/libraries/botbuilder-solutions'
+    failTaskOnFailedTests: true
+
+- task: PublishCodeCoverageResults@1
+  displayName: 'Publish code coverage '
+  condition: succeededOrFailed()
+  inputs:
+    codeCoverageTool: Cobertura
+    summaryFileLocation: 'sdk/typescript/libraries/botbuilder-solutions/coverage/cobertura-coverage.xml'
+    reportDirectory: 'sdk/typescript/libraries/botbuilder-solutions/coverage/'
+

docs/Gemfile

@@ -25,6 +25,7 @@ group :jekyll_plugins do
   gem 'jekyll-octicons'
   gem 'jekyll-readme-index'
   gem 'jekyll-mentions'
+  gem 'jekyll-toc'
   gem 'jemoji'
 end
 

docs/_config.yml

@@ -42,5 +42,16 @@ plugins:
   - jekyll-mentions
   - jekyll-octicons
   - jekyll-sitemap
+  - jekyll-toc
   - jekyll-rouge
-  - jemoji  
+  - jemoji  
+
+toc:
+  # Default is "section-nav":
+  list_class: nav flex-column
+  # Default is no class for sublists:
+  sublist_class: nav flex-column
+  # Default is "toc-entry":
+  item_class: nav-item no-underline py-1 text-gray-light
+  # Default is "toc-":
+  item_prefix: nav-item-