microsoft
diff --git a/‎.gitignore‎
Lines changed: 4 additions & 8 deletions b/‎.gitignore‎
Lines changed: 4 additions & 8 deletions
diff --git a/‎README.md‎
Lines changed: 0 additions & 2 deletions b/‎README.md‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎build/build.app-settings.ps1‎
Lines changed: 20 additions & 0 deletions b/‎build/build.app-settings.ps1‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎build/build.cognitive-models.ps1‎
Lines changed: 75 additions & 0 deletions b/‎build/build.cognitive-models.ps1‎
Lines changed: 75 additions & 0 deletions
diff --git a/‎build/build.generator-assistant.ts.ps1‎
Lines changed: 2 additions & 2 deletions b/‎build/build.generator-assistant.ts.ps1‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎build/yaml/csharp/skill-sample.yml‎
Lines changed: 8 additions & 8 deletions b/‎build/yaml/csharp/skill-sample.yml‎
Lines changed: 8 additions & 8 deletions
diff --git a/‎build/yaml/csharp/virtual-assistant-sample.yml‎
Lines changed: 9 additions & 9 deletions b/‎build/yaml/csharp/virtual-assistant-sample.yml‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎build/yaml/typescript/generator-botbuilder-assistant.yml‎
Lines changed: 6 additions & 6 deletions b/‎build/yaml/typescript/generator-botbuilder-assistant.yml‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎build/yaml/typescript/sample-assistant.yml‎
Lines changed: 7 additions & 7 deletions b/‎build/yaml/typescript/sample-assistant.yml‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎build/yaml/typescript/sample-skill.yml‎
Lines changed: 7 additions & 7 deletions b/‎build/yaml/typescript/sample-skill.yml‎
Lines changed: 7 additions & 7 deletions
@@ -344,19 +344,14 @@ ASALocalRun/
 **/skills.production.json
 **/skills.development.json
 
-# LUIS json files
-/solutions/**/*.luis
-
-# QnAMaker json files
-/solutions/**/*.qna
 
 # Local deployment files
 /solutions/**/.deployment
 /solutions/**/publish
 /solutions/**/publish.cmd
 **/Deployment/Resources/Dispatch/**
-**/Deployment/**/*.luis
-**/Deployment/**/*.qna
+**/Deployment/Resources/LU/**/*.json
+**/Deployment/Resources/QnA/**/*.json
 **/deploy_log.txt
 **/deploy_cognitive_models_log.txt
 **/update_cognitive_models_log.txt
@@ -378,4 +373,5 @@ ASALocalRun/
 *.lzma
 *.cab
 .DS_Store
-/.project
+/.project
+*.luis
@@ -38,5 +38,3 @@ Security issues and bugs should be reported privately, via email, to the Microso
 
 ## License
 Copyright (c) Microsoft Corporation. All rights reserved.
-
-
@@ -0,0 +1,20 @@
+Param(
+    [string] $jsonFile,
+    [int] $oauthConnections = 1
+)
+$config = Get-Content -Raw -Path $jsonFile | ConvertFrom-Json
+
+$oauthConnection = [pscustomobject]@{
+    name = ""
+    provider = ""
+}
+# Add language models
+for($i = 0; $i -lt $oauthConnections; $i++){
+    $config.oauthConnections += $oauthConnection
+}
+
+# Add botWebAppName and resourceGroupName for connecting skills
+$config | Add-Member -Force -Name "botWebAppName" -Value "" -MemberType NoteProperty
+$config | Add-Member -Force -Name "resourceGroupName" -Value "" -MemberType NoteProperty
+
+$config | ConvertTo-Json -depth 4 | Set-Content $jsonfile
@@ -0,0 +1,75 @@
+Param(
+    [string] $jsonFile,
+    [switch] $useDispatch = $false,
+    [int] $languageModels = 1,
+    [int] $knowledgeBases = 1,
+    [string] $languages = "en-us"
+)
+
+$config = Get-Content -Raw -Path $jsonFile | ConvertFrom-Json
+
+# Create reused variables
+$dispatchModel = [pscustomobject]@{
+    authoringkey = ""
+    authoringRegion = ""
+    appid = ""
+    name = ""
+    region = ""
+    subscriptionkey = ""
+    type = "dispatch"
+}
+
+$languageModel = [pscustomobject]@{
+    appid = ""
+    authoringkey = ""
+    authoringRegion = ""
+    id = ""
+    name = ""
+    region = ""
+    subscriptionkey = ""
+    version = ""
+}
+
+$knowledgeBase = [pscustomobject]@{
+    endpointKey = ""
+    id = ""
+    hostname = ""
+    kbId = ""
+    name = ""
+    subscriptionKey = ""
+}
+
+# Create a language block object with or without a dispatch model
+if ($useDispatch){
+    $languageBlock = [pscustomobject]@{
+    dispatchModel = $dispatchModel
+    languageModels = @()
+    knowledgebases = @()
+    }
+} else {
+    $languageBlock = [pscustomobject]@{
+        languageModels = @()
+        knowledgebases = @()
+    }
+}
+
+# Add language models
+for($i = 0; $i -lt $languageModels; $i++){
+    $languageBlock.languageModels += $languageModel
+}
+
+# Add knowledge bases
+for($i = 0; $i -lt $knowledgeBases; $i++){
+    $languageBlock.knowledgebases += $knowledgeBase
+}
+
+# Get languages
+$languageArr = $languages -split ","
+
+# Add block of models for each language
+foreach ($language in $languageArr){
+    Write-Host $language "Adding ${language}: ${languageBlock}"
+    $config.cognitiveModels | Add-Member -Force -Name $language -Value $languageBlock -MemberType NoteProperty
+}
+
+$config | ConvertTo-Json -depth 4 | Set-Content $jsonFile
@@ -6,7 +6,7 @@ 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
+pushd templates/typescript/generator-botbuilder-assistant
 
 npm install
 npm version $($version) --allow-same-version
@@ -21,6 +21,6 @@ if (-not(test-path ".\outputpackages"))
 
 pushd .\outputpackages
 
-npm pack ..\templates\Virtual-Assistant-Template\typescript\generator-botbuilder-assistant
+npm pack ..\templates\typescript\generator-botbuilder-assistant
 
 popd
@@ -7,7 +7,7 @@ trigger:
 
   paths:
     include:
-    - 'templates/Skill-Template/csharp/Sample/*'
+    - 'templates/csharp/Skill/*'
 
 # By default will disable PR builds
 pr: none
@@ -37,12 +37,12 @@ steps:
 - task: NuGetCommand@2
   displayName: 'NuGet restore'
   inputs:
-    restoreSolution: 'templates\Skill-Template\csharp\SkillTemplate.sln'
+    restoreSolution: 'templates\csharp\Templates.sln'
 
 - task: VSBuild@1
-  displayName: 'Build solution SkillTemplate.sln'
+  displayName: 'Build solution Templates.sln'
   inputs:
-    solution: templates\Skill-Template\csharp\SkillTemplate.sln
+    solution: templates\csharp\Templates.sln
     vsVersion: '16.0'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
@@ -51,13 +51,13 @@ steps:
   displayName: 'test results'
   inputs:
     command: test
-    projects: '$(System.DefaultWorkingDirectory)\templates\Skill-Template\csharp\Sample\SkillSample.Tests\SkillSample.Tests.csproj'
+    projects: '$(System.DefaultWorkingDirectory)\templates\csharp\Skill\Skill.Tests\Skill.Tests.csproj'
     arguments: '-v n --configuration $(buildConfiguration) --no-build --no-restore --filter TestCategory!=IgnoreInAutomatedBuild /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
-    workingDirectory: 'templates\Skill-Template\csharp\Sample\SkillSample.Tests'
+    workingDirectory: 'templates\csharp\Skill\Skill.Tests'
 
 - task: PublishCodeCoverageResults@1
   displayName: 'Publish code coverage'
   inputs:
     codeCoverageTool: Cobertura
-    summaryFileLocation: '$(Build.SourcesDirectory)\templates\Skill-Template\csharp\Sample\SkillSample.Tests\coverage.cobertura.xml'
-    reportDirectory: '$(Build.SourcesDirectory)\templates\Skill-Template\csharp\Sample\SkillSample.Tests'
+    summaryFileLocation: '$(Build.SourcesDirectory)\templates\csharp\Skill\Skill.Tests\coverage.cobertura.xml'
+    reportDirectory: '$(Build.SourcesDirectory)\templates\csharp\Skill\Skill.Tests'
@@ -7,7 +7,7 @@ trigger:
 
   paths:
     include:
-    - 'templates/Virtual-Assistant-Template/csharp/Sample/*'
+    - 'templates/csharp/VA/*'
 
 # By default will disable PR builds
 pr: none
@@ -37,12 +37,12 @@ steps:
 - task: NuGetCommand@2
   displayName: 'NuGet restore'
   inputs:
-    restoreSolution: 'templates\Virtual-Assistant-Template\csharp\VirtualAssistantTemplate.sln'
+    restoreSolution: 'templates\csharp\Templates.sln'
 
 - task: VSBuild@1
-  displayName: 'Build solution VirtualAssistantTemplate.sln'
+  displayName: 'Build solution Templates.sln'
   inputs:
-    solution: templates\Virtual-Assistant-Template\csharp\VirtualAssistantTemplate.sln
+    solution: templates\csharp\Templates.sln
     vsVersion: '16.0'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
@@ -51,21 +51,21 @@ steps:
   displayName: 'test results'
   inputs:
     command: test
-    projects: '$(System.DefaultWorkingDirectory)\templates\Virtual-Assistant-Template\csharp\Sample\VirtualAssistantSample.Tests\VirtualAssistantSample.Tests.csproj'
+    projects: '$(System.DefaultWorkingDirectory)\templates\csharp\VA\VA.Tests\VA.Tests.csproj'
     arguments: '-v n --configuration $(buildConfiguration) --no-build --no-restore --filter TestCategory!=IgnoreInAutomatedBuild /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
-    workingDirectory: 'templates\Virtual-Assistant-Template\csharp\Sample\VirtualAssistantSample.Tests'
+    workingDirectory: 'templates\csharp\VA\VA.Tests'
 
 - task: PublishCodeCoverageResults@1
   displayName: 'Publish code coverage'
   inputs:
     codeCoverageTool: Cobertura
-    summaryFileLocation: '$(Build.SourcesDirectory)\templates\Virtual-Assistant-Template\csharp\Sample\VirtualAssistantSample.Tests\coverage.cobertura.xml'
-    reportDirectory: '$(Build.SourcesDirectory)\templates\Virtual-Assistant-Template\csharp\Sample\VirtualAssistantSample.Tests'
+    summaryFileLocation: '$(Build.SourcesDirectory)\templates\csharp\VA\VA.Tests\coverage.cobertura.xml'
+    reportDirectory: '$(Build.SourcesDirectory)\templates\csharp\VA\VA.Tests'
 
 - task: CopyFiles@2
   displayName: 'Copy VA'
   inputs:
-    SourceFolder: '$(System.DefaultWorkingDirectory)\templates\Virtual-Assistant-Template\csharp\Sample\VirtualAssistantSample'
+    SourceFolder: '$(System.DefaultWorkingDirectory)\templates\csharp\VA\VA'
     Contents: '**\*'
     TargetFolder: '$(Build.ArtifactStagingDirectory)\VA'
 
 
@@ -7,7 +7,7 @@ trigger:
 
   paths:
     include:
-    - 'templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/*'
+    - 'templates/typescript/generator-botbuilder-assistant/*'
 
 # By default will disable PR builds
 pr: none 
@@ -23,27 +23,27 @@ steps:
 - task: Npm@1
   displayName: 'npm install'
   inputs:
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant'
+    workingDir: 'templates/typescript/generator-botbuilder-assistant'
     verbose: false
 
 - task: Npm@1
   displayName: 'npm test - coverage'
   inputs:
     command: custom
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant'
+    workingDir: 'templates/typescript/generator-botbuilder-assistant'
     verbose: false
     customCommand: 'run test-coverage-ci'
 
 - task: PublishTestResults@2
   displayName: 'publish test results'
   inputs:
     testResultsFiles: 'test-results.xml'
-    searchFolder: 'templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant'
+    searchFolder: 'templates/typescript/generator-botbuilder-assistant'
     failTaskOnFailedTests: true
 
 - task: PublishCodeCoverageResults@1
   displayName: 'publish code coverage'
   inputs:
     codeCoverageTool: Cobertura
-    summaryFileLocation: 'templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/coverage/cobertura-coverage.xml'
-    reportDirectory: 'templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/coverage/'
+    summaryFileLocation: 'templates/typescript/generator-botbuilder-assistant/coverage/cobertura-coverage.xml'
+    reportDirectory: 'templates/typescript/generator-botbuilder-assistant/coverage/'
@@ -7,7 +7,7 @@ trigger:
 
   paths:
     include:
-    - 'templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/*'
+    - 'templates/typescript/samples/sample-assistant/*'
 
 # By default will disable PR builds
 pr: none  
@@ -23,35 +23,35 @@ steps:
 - task: Npm@1
   displayName: 'npm install'
   inputs:
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/samples/sample-assistant'
+    workingDir: 'templates/typescript/samples/sample-assistant'
     verbose: false
 
 - task: Npm@1
   displayName: 'npm run build'
   inputs:
     command: custom
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/samples/sample-assistant'
+    workingDir: 'templates/typescript/samples/sample-assistant'
     verbose: false
     customCommand: 'run build'
 
 - task: Npm@1
   displayName: 'npm test - coverage'
   inputs:
     command: custom
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/samples/sample-assistant'
+    workingDir: 'templates/typescript/samples/sample-assistant'
     verbose: false
     customCommand: 'run test-coverage-ci'
 
 - task: PublishTestResults@2
   displayName: 'publish test results'
   inputs:
     testResultsFiles: 'test-results.xml'
-    searchFolder: 'templates/Virtual-Assistant-Template/typescript/samples/sample-assistant'
+    searchFolder: 'templates/typescript/samples/sample-assistant'
     failTaskOnFailedTests: true
 
 - task: PublishCodeCoverageResults@1
   displayName: 'publish code coverage'
   inputs:
     codeCoverageTool: Cobertura
-    summaryFileLocation: 'templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/coverage/cobertura-coverage.xml'
-    reportDirectory: 'templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/coverage/'
+    summaryFileLocation: 'templates/typescript/samples/sample-assistant/coverage/cobertura-coverage.xml'
+    reportDirectory: 'templates/typescript/samples/sample-assistant/coverage/'
@@ -7,7 +7,7 @@ trigger:
 
   paths:
     include:
-    - 'templates/Virtual-Assistant-Template/typescript/samples/sample-skill/*'
+    - 'templates/typescript/samples/sample-skill/*'
 
 # By default will disable PR builds
 pr: none
@@ -24,36 +24,36 @@ steps:
 - task: Npm@1
   displayName: 'npm install'
   inputs:
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/samples/sample-skill'
+    workingDir: 'templates/typescript/samples/sample-skill'
     verbose: false
 
 - task: Npm@1
   displayName: 'npm build'
   inputs:
     command: custom
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/samples/sample-skill'
+    workingDir: 'templates/typescript/samples/sample-skill'
     verbose: false
     customCommand: 'run build'
 
 - task: Npm@1
   displayName: 'test with coverage'
   inputs:
     command: custom
-    workingDir: 'templates/Virtual-Assistant-Template/typescript/samples/sample-skill'
+    workingDir: 'templates/typescript/samples/sample-skill'
     verbose: false
     customCommand: 'run test-coverage-ci'
 
 - task: PublishTestResults@2
   displayName: 'publish test results'
   inputs:
     testResultsFiles: 'test-results.xml'
-    searchFolder: 'templates/Virtual-Assistant-Template/typescript/samples/sample-skill'
+    searchFolder: 'templates/typescript/samples/sample-skill'
     failTaskOnFailedTests: true
 
 - task: PublishCodeCoverageResults@1
   displayName: 'publish code coverage'
   inputs:
     codeCoverageTool: Cobertura
-    summaryFileLocation: 'templates/Virtual-Assistant-Template/typescript/samples/sample-skill/coverage/cobertura-coverage.xml'
-    reportDirectory: 'templates/Virtual-Assistant-Template/typescript/samples/sample-skill/coverage/'
+    summaryFileLocation: 'templates/typescript/samples/sample-skill/coverage/cobertura-coverage.xml'
+    reportDirectory: 'templates/typescript/samples/sample-skill/coverage/'