This commit is contained in:
Tom Laird-McConnell 2019-08-19 14:10:09 -07:00
Родитель a7498d14eb
Коммит 26ea601f61
3 изменённых файлов: 7 добавлений и 7 удалений

5
.gitignore поставляемый
Просмотреть файл

@ -69,4 +69,7 @@ typings/
package-lock.json
#vscode files
.vscode
.vscode
packages/dialog/test/commands/dialog/projects/obj/Debug/netcoreapp2.1/LUISGen.csproj.CoreCompileInputs.cache
packages/dialog/test/commands/dialog/projects/obj/Debug/netcoreapp2.1/LUISGen.AssemblyInfo.cs
packages/dialog/test/commands/dialog/projects/obj/Debug/netcoreapp2.1/LUISGen.AssemblyInfoInputs.cache

Просмотреть файл

@ -4,9 +4,10 @@
"author": "Microsoft",
"bugs": "https://github.com/microsoft/botframework-cli/issues",
"dependencies": {
"@microsoft/bf-cli-command": "1.0.0",
"@microsoft/bf-cli-command": "~1.0.0",
"@types/semver": "^6.0.1",
"@types/xml2js": "^0.4.4",
"ajv": "^6.9.1",
"chalk": "^2.4.2",
"fs-extra": "^8.1.0",
"get-json": "^1.0.1",
@ -24,7 +25,6 @@
"@types/fs-extra": "^8.0.0",
"@types/mocha": "^5.2.7",
"@types/node": "^10.14.15",
"ajv": "^6.9.1",
"chai": "^4.2.0",
"clone": "^2.1.2",
"mocha": "^5.2.0",

Просмотреть файл

@ -96,10 +96,7 @@ export default class DialogMerge extends Command {
let definitions: any = {}
let validator = new Validator()
if (fs.pathExistsSync('component.schema')) {
// Use a local component.schema file if present in the assumption it will be checked into branch
metaSchema = await fs.readJSON('component.schema')
} else if (!metaSchema && branch) {
if (!metaSchema && branch) {
// Find branch specific schema
let path = `https://raw.githubusercontent.com/Microsoft/botbuilder-dotnet/${branch}/schemas/component.schema`
metaSchema = await getJson(path)