microsoft · darrenj · Jun 28, 2019 · Jun 26, 2019 · Jun 26, 2019 · Jun 26, 2019
diff --git a/docs/howto/skills/addingskills.md b/docs/howto/skills/addingskills.md
@@ -43,7 +43,7 @@ botskills connect --botName YOUR_BOT_NAME --remoteManifest "http://<YOUR_SKILL_M
 
 *Remember to re-publish your Assistant to Azure after you've added a Skill unless you plan on testing locally only**
 
-See the [Skill CLI documentation](/lib/typescript/botskills/docs/connect-disconnect.md) for detailed CLI documentation.
+See the [Skill CLI documentation](/tools/botskills/docs/connect-disconnect.md) for detailed CLI documentation.
 
 ## Manual Authentication Connection configuration
 
@@ -73,7 +73,7 @@ botskills:
 botskills disconnect --skillId SKILL_ID
 ```
 
-> Note: The id of the Skill can also be aquired using the `botskills list` command. You can check the [Skill CLI documentation](/lib/typescript/botskills/docs/list.md) on this command.
+> Note: The id of the Skill can also be aquired using the `botskills list` command. You can check the [Skill CLI documentation](/tools/botskills/docs/list.md) on this command.
 
 ## Updating an existing Skill to reflect changes to Actions or LUIS model
 

diff --git a/lib/typescript/botskills/.gitignore → tools/botskills/.gitignore b/lib/typescript/botskills/.gitignore → tools/botskills/.gitignore
diff --git a/lib/typescript/botskills/.nycrc → tools/botskills/.nycrc b/lib/typescript/botskills/.nycrc → tools/botskills/.nycrc
diff --git a/lib/typescript/botskills/README.md → tools/botskills/README.md b/lib/typescript/botskills/README.md → tools/botskills/README.md
diff --git a/...ript/botskills/docs/connect-disconnect.md → tools/botskills/docs/connect-disconnect.md b/...ript/botskills/docs/connect-disconnect.md → tools/botskills/docs/connect-disconnect.md
diff --git a/lib/typescript/botskills/docs/list.md → tools/botskills/docs/list.md b/lib/typescript/botskills/docs/list.md → tools/botskills/docs/list.md
diff --git a/lib/typescript/botskills/docs/refresh.md → tools/botskills/docs/refresh.md b/lib/typescript/botskills/docs/refresh.md → tools/botskills/docs/refresh.md
diff --git a/lib/typescript/botskills/docs/update.md → tools/botskills/docs/update.md b/lib/typescript/botskills/docs/update.md → tools/botskills/docs/update.md
diff --git a/lib/typescript/botskills/package-lock.json → tools/botskills/package-lock.json b/lib/typescript/botskills/package-lock.json → tools/botskills/package-lock.json
diff --git a/lib/typescript/botskills/package.json → tools/botskills/package.json b/lib/typescript/botskills/package.json → tools/botskills/package.json
diff --git a/...script/botskills/src/botskills-connect.ts → tools/botskills/src/botskills-connect.ts b/...script/botskills/src/botskills-connect.ts → tools/botskills/src/botskills-connect.ts
diff --git a/...ipt/botskills/src/botskills-disconnect.ts → tools/botskills/src/botskills-disconnect.ts b/...ipt/botskills/src/botskills-disconnect.ts → tools/botskills/src/botskills-disconnect.ts
diff --git a/...ypescript/botskills/src/botskills-list.ts → tools/botskills/src/botskills-list.ts b/...ypescript/botskills/src/botskills-list.ts → tools/botskills/src/botskills-list.ts
diff --git a/...script/botskills/src/botskills-refresh.ts → tools/botskills/src/botskills-refresh.ts b/...script/botskills/src/botskills-refresh.ts → tools/botskills/src/botskills-refresh.ts
diff --git a/...escript/botskills/src/botskills-update.ts → tools/botskills/src/botskills-update.ts b/...escript/botskills/src/botskills-update.ts → tools/botskills/src/botskills-update.ts
diff --git a/lib/typescript/botskills/src/botskills.ts → tools/botskills/src/botskills.ts b/lib/typescript/botskills/src/botskills.ts → tools/botskills/src/botskills.ts
diff --git a/...tskills/src/functionality/connectSkill.ts → ...tskills/src/functionality/connectSkill.ts b/...tskills/src/functionality/connectSkill.ts → ...tskills/src/functionality/connectSkill.ts
diff --git a/...ills/src/functionality/disconnectSkill.ts → ...ills/src/functionality/disconnectSkill.ts b/...ills/src/functionality/disconnectSkill.ts → ...ills/src/functionality/disconnectSkill.ts
diff --git a/...ript/botskills/src/functionality/index.ts → tools/botskills/src/functionality/index.ts b/...ript/botskills/src/functionality/index.ts → tools/botskills/src/functionality/index.ts
diff --git a/.../botskills/src/functionality/listSkill.ts → .../botskills/src/functionality/listSkill.ts b/.../botskills/src/functionality/listSkill.ts → .../botskills/src/functionality/listSkill.ts
diff --git a/...tskills/src/functionality/refreshSkill.ts → ...tskills/src/functionality/refreshSkill.ts b/...tskills/src/functionality/refreshSkill.ts → ...tskills/src/functionality/refreshSkill.ts
diff --git a/...otskills/src/functionality/updateSkill.ts → ...otskills/src/functionality/updateSkill.ts b/...otskills/src/functionality/updateSkill.ts → ...otskills/src/functionality/updateSkill.ts
diff --git a/lib/typescript/botskills/src/index.ts → tools/botskills/src/index.ts b/lib/typescript/botskills/src/index.ts → tools/botskills/src/index.ts
diff --git a/lib/typescript/botskills/src/logger/index.ts → tools/botskills/src/logger/index.ts b/lib/typescript/botskills/src/logger/index.ts → tools/botskills/src/logger/index.ts
diff --git a/...typescript/botskills/src/logger/logger.ts → tools/botskills/src/logger/logger.ts b/...typescript/botskills/src/logger/logger.ts → tools/botskills/src/logger/logger.ts
diff --git a/...pt/botskills/src/models/authentication.ts → tools/botskills/src/models/authentication.ts b/...pt/botskills/src/models/authentication.ts → tools/botskills/src/models/authentication.ts
diff --git a/...ipt/botskills/src/models/cognitiveFile.ts → tools/botskills/src/models/cognitiveFile.ts b/...ipt/botskills/src/models/cognitiveFile.ts → tools/botskills/src/models/cognitiveFile.ts
diff --git a/...skills/src/models/connectConfiguration.ts → ...skills/src/models/connectConfiguration.ts b/...skills/src/models/connectConfiguration.ts → ...skills/src/models/connectConfiguration.ts
diff --git a/...lls/src/models/disconnectConfiguration.ts → ...lls/src/models/disconnectConfiguration.ts b/...lls/src/models/disconnectConfiguration.ts → ...lls/src/models/disconnectConfiguration.ts
diff --git a/...ript/botskills/src/models/dispatchFile.ts → tools/botskills/src/models/dispatchFile.ts b/...ript/botskills/src/models/dispatchFile.ts → tools/botskills/src/models/dispatchFile.ts
diff --git a/lib/typescript/botskills/src/models/index.ts → tools/botskills/src/models/index.ts b/lib/typescript/botskills/src/models/index.ts → tools/botskills/src/models/index.ts
diff --git a/...botskills/src/models/listConfiguration.ts → ...botskills/src/models/listConfiguration.ts b/...botskills/src/models/listConfiguration.ts → ...botskills/src/models/listConfiguration.ts
diff --git a/...skills/src/models/refreshConfiguration.ts → ...skills/src/models/refreshConfiguration.ts b/...skills/src/models/refreshConfiguration.ts → ...skills/src/models/refreshConfiguration.ts
diff --git a/...escript/botskills/src/models/skillFile.ts → tools/botskills/src/models/skillFile.ts b/...escript/botskills/src/models/skillFile.ts → tools/botskills/src/models/skillFile.ts
diff --git a/...ipt/botskills/src/models/skillManifest.ts → tools/botskills/src/models/skillManifest.ts b/...ipt/botskills/src/models/skillManifest.ts → tools/botskills/src/models/skillManifest.ts
diff --git a/...tskills/src/models/updateConfiguration.ts → ...tskills/src/models/updateConfiguration.ts b/...tskills/src/models/updateConfiguration.ts → ...tskills/src/models/updateConfiguration.ts
diff --git a/...otskills/src/utils/authenticationUtils.ts → ...otskills/src/utils/authenticationUtils.ts b/...otskills/src/utils/authenticationUtils.ts → ...otskills/src/utils/authenticationUtils.ts
diff --git a/.../botskills/src/utils/childProcessUtils.ts → .../botskills/src/utils/childProcessUtils.ts b/.../botskills/src/utils/childProcessUtils.ts → .../botskills/src/utils/childProcessUtils.ts
diff --git a/lib/typescript/botskills/src/utils/index.ts → tools/botskills/src/utils/index.ts b/lib/typescript/botskills/src/utils/index.ts → tools/botskills/src/utils/index.ts
diff --git a/...pt/botskills/src/utils/validationUtils.ts → tools/botskills/src/utils/validationUtils.ts b/...pt/botskills/src/utils/validationUtils.ts → tools/botskills/src/utils/validationUtils.ts
diff --git a/...typescript/botskills/test/connect.test.js → tools/botskills/test/connect.test.js b/...typescript/botskills/test/connect.test.js → tools/botskills/test/connect.test.js
diff --git a/...escript/botskills/test/disconnect.test.js → tools/botskills/test/disconnect.test.js b/...escript/botskills/test/disconnect.test.js → tools/botskills/test/disconnect.test.js
diff --git a/...ript/botskills/test/helpers/testLogger.js → tools/botskills/test/helpers/testLogger.js b/...ript/botskills/test/helpers/testLogger.js → tools/botskills/test/helpers/testLogger.js
diff --git a/lib/typescript/botskills/test/list.test.js → tools/botskills/test/list.test.js b/lib/typescript/botskills/test/list.test.js → tools/botskills/test/list.test.js
diff --git a/lib/typescript/botskills/test/mocha.opts → tools/botskills/test/mocha.opts b/lib/typescript/botskills/test/mocha.opts → tools/botskills/test/mocha.opts
diff --git a/...lls/test/mocks/resources/absentSkill.json → ...lls/test/mocks/resources/absentSkill.json b/...lls/test/mocks/resources/absentSkill.json → ...lls/test/mocks/resources/absentSkill.json
diff --git a/...s/test/mocks/resources/badSkillsArray.jso → ...s/test/mocks/resources/badSkillsArray.jso b/...s/test/mocks/resources/badSkillsArray.jso → ...s/test/mocks/resources/badSkillsArray.jso
diff --git a/...est/mocks/resources/connectableSkill.json → ...est/mocks/resources/connectableSkill.json b/...est/mocks/resources/connectableSkill.json → ...est/mocks/resources/connectableSkill.json
diff --git a/.../dispatchFolder/connectableSkill.dispatch → .../dispatchFolder/connectableSkill.dispatch b/.../dispatchFolder/connectableSkill.dispatch → .../dispatchFolder/connectableSkill.dispatch
diff --git a/...st/mocks/resources/emptyDispatch.dispatch → ...st/mocks/resources/emptyDispatch.dispatch b/...st/mocks/resources/emptyDispatch.dispatch → ...st/mocks/resources/emptyDispatch.dispatch
diff --git a/...est/mocks/resources/emptySkillsArray.json → ...est/mocks/resources/emptySkillsArray.json b/...est/mocks/resources/emptySkillsArray.json → ...est/mocks/resources/emptySkillsArray.json
diff --git a/...t/mocks/resources/filledDispatch.dispatch → ...t/mocks/resources/filledDispatch.dispatch b/...t/mocks/resources/filledDispatch.dispatch → ...t/mocks/resources/filledDispatch.dispatch
diff --git a/.../test/mocks/resources/filledDispatch.json → .../test/mocks/resources/filledDispatch.json b/.../test/mocks/resources/filledDispatch.json → .../test/mocks/resources/filledDispatch.json
diff --git a/...s/resources/filledDispatchNoJson.dispatch → ...s/resources/filledDispatchNoJson.dispatch b/...s/resources/filledDispatchNoJson.dispatch → ...s/resources/filledDispatchNoJson.dispatch
diff --git a/...st/mocks/resources/filledSkillsArray.json → ...st/mocks/resources/filledSkillsArray.json b/...st/mocks/resources/filledSkillsArray.json → ...st/mocks/resources/filledSkillsArray.json
diff --git a/...ls/test/mocks/resources/invalidSkill.json → ...ls/test/mocks/resources/invalidSkill.json b/...ls/test/mocks/resources/invalidSkill.json → ...ls/test/mocks/resources/invalidSkill.json
diff --git a/.../test/mocks/resources/invalidSkillid.json → .../test/mocks/resources/invalidSkillid.json b/.../test/mocks/resources/invalidSkillid.json → .../test/mocks/resources/invalidSkillid.json
diff --git a/...ks/resources/luFolder/connectableSkill.lu → ...ks/resources/luFolder/connectableSkill.lu b/...ks/resources/luFolder/connectableSkill.lu → ...ks/resources/luFolder/connectableSkill.lu
diff --git a/.../resources/luisFolder/connectableSkill.lu → .../resources/luisFolder/connectableSkill.lu b/.../resources/luisFolder/connectableSkill.lu → .../resources/luisFolder/connectableSkill.lu
diff --git a/...esources/luisFolder/connectableSkill.luis → ...esources/luisFolder/connectableSkill.luis b/...esources/luisFolder/connectableSkill.luis → ...esources/luisFolder/connectableSkill.luis
diff --git a/...fulConnectFiles/connectableSkill.dispatch → ...fulConnectFiles/connectableSkill.dispatch b/...fulConnectFiles/connectableSkill.dispatch → ...fulConnectFiles/connectableSkill.dispatch
diff --git a/...cessfulConnectFiles/connectableSkill.json → ...cessfulConnectFiles/connectableSkill.json b/...cessfulConnectFiles/connectableSkill.json → ...cessfulConnectFiles/connectableSkill.json
diff --git a/...uccessfulConnectFiles/connectableSkill.lu → ...uccessfulConnectFiles/connectableSkill.lu b/...uccessfulConnectFiles/connectableSkill.lu → ...uccessfulConnectFiles/connectableSkill.lu
diff --git a/...cessfulConnectFiles/connectableSkill.luis → ...cessfulConnectFiles/connectableSkill.luis b/...cessfulConnectFiles/connectableSkill.luis → ...cessfulConnectFiles/connectableSkill.luis
diff --git a/...essfulConnectFiles/filledSkillsArray.json → ...essfulConnectFiles/filledSkillsArray.json b/...essfulConnectFiles/filledSkillsArray.json → ...essfulConnectFiles/filledSkillsArray.json
diff --git a/...kills/test/mocks/resources/testSkill.json → ...kills/test/mocks/resources/testSkill.json b/...kills/test/mocks/resources/testSkill.json → ...kills/test/mocks/resources/testSkill.json
diff --git a/...mocks/resources/undefinedSkillsArray.json → ...mocks/resources/undefinedSkillsArray.json b/...mocks/resources/undefinedSkillsArray.json → ...mocks/resources/undefinedSkillsArray.json
diff --git a/...typescript/botskills/test/refresh.test.js → tools/botskills/test/refresh.test.js b/...typescript/botskills/test/refresh.test.js → tools/botskills/test/refresh.test.js
diff --git a/lib/typescript/botskills/test/update.test.js → tools/botskills/test/update.test.js b/lib/typescript/botskills/test/update.test.js → tools/botskills/test/update.test.js
diff --git a/lib/typescript/botskills/tsconfig.json → tools/botskills/tsconfig.json b/lib/typescript/botskills/tsconfig.json → tools/botskills/tsconfig.json
diff --git a/lib/typescript/botskills/tslint.json → tools/botskills/tslint.json b/lib/typescript/botskills/tslint.json → tools/botskills/tslint.json
diff --git a/yaml/typescript/botskills.yml b/yaml/typescript/botskills.yml
@@ -7,7 +7,7 @@ trigger:
 
   paths:
     include:
-    - lib/typescript/botskills/*
+    - tools/botskills/*
 
 # By default will disable PR builds
 pr: none 
@@ -21,36 +21,36 @@ steps:
 - task: Npm@1
   displayName: 'npm install'
   inputs:
-    workingDir: lib/typescript/botskills
+    workingDir: tools/botskills
     verbose: false
 
 - task: Npm@1
   displayName: 'npm run build'
   inputs:
     command: custom
-    workingDir: lib/typescript/botskills
+    workingDir: tools/botskills
     verbose: false
     customCommand: 'run build'
 
 - task: Npm@1
   displayName: 'npm test - coverage'
   inputs:
     command: custom
-    workingDir: lib/typescript/botskills
+    workingDir: tools/botskills
     verbose: false
     customCommand: 'run test-coverage-ci'
 
 - task: PublishTestResults@2
   displayName: 'publish test results'
   inputs:
     testResultsFiles: 'test-results.xml'
-    searchFolder: 'lib/typescript/botskills'
+    searchFolder: 'tools/botskills'
     failTaskOnFailedTests: true    
 
 - task: PublishCodeCoverageResults@1
   displayName: 'publish code coverage'
   inputs:
     codeCoverageTool: Cobertura
-    summaryFileLocation: 'lib/typescript/botskills/coverage/cobertura-coverage.xml'
-    reportDirectory: 'lib/typescript/botskills/coverage/'
+    summaryFileLocation: 'tools/botskills/coverage/cobertura-coverage.xml'
+    reportDirectory: 'tools/botskills/coverage/'