Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Commit c0edcb5

Browse files
author
Chris McConnell
authored
Update merge for better composer support, error checking, compactness and correctness (#737)
* Initial check-in. * Allof Working. * Move definitions local. * Launch to sdk. * Everything working for new merge. * schema: working * Working except that allof expansion does not expand local references. * Simplification and some analysis working. * Add extends. * Everything working. * Update help * Fix typo * Expand allOf and validate final schema. * Missing as warning and validate schema. * Update tests. * Update test to pass on server. * Normalize paths. * Check normalize for mac * Update for mac paths and lint. * Address review comments.
1 parent 8518fb1 commit c0edcb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2792
-2292
lines changed

.vscode/launch.json

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,6 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7-
{
8-
"type": "node",
9-
"request": "launch",
10-
"name": "Public bf cli",
11-
"program": "C:/Users/chrimc/AppData/Roaming/npm/node_modules/@microsoft/botframework-cli/bin/run",
12-
"args": [
13-
"dialog:generate",
14-
"c:/tmp/sandwich/sandwich.schema",
15-
"-o",
16-
"${env:TEMP}/cli.out"
17-
],
18-
"outFiles": [
19-
"C:/Users/chrimc/AppData/Roaming/npm/node_modules/@microsoft/botframework-cli/node_modules/@microsoft/bf-dialog/lib"
20-
],
21-
"skipFiles": [
22-
"<node_internals>/**"
23-
]
24-
},
257
{
268
"type": "node",
279
"request": "launch",
@@ -34,7 +16,7 @@
3416
"999999",
3517
"--colors",
3618
"-g",
37-
".*"
19+
".*dialog:merge.*"
3820
],
3921
"internalConsoleOptions": "openOnSessionStart",
4022
"outputCapture": "std",
@@ -62,26 +44,6 @@
6244
"./package/dialog/lib/**"
6345
]
6446
},
65-
{
66-
"type": "node",
67-
"request": "launch",
68-
"name": "Dialog Generator Tests",
69-
"preLaunchTask": "${defaultBuildTask}",
70-
"program": "${workspaceFolder}/packages/dialog/node_modules/mocha/bin/_mocha",
71-
"cwd": "${workspaceFolder}/packages/dialog",
72-
"args": [
73-
"--timeout",
74-
"999999",
75-
"--colors",
76-
"-g",
77-
".*dialog:generate.*"
78-
],
79-
"internalConsoleOptions": "openOnSessionStart",
80-
"outputCapture": "std",
81-
"outFiles": [
82-
"./package/dialog/lib/**"
83-
]
84-
},
8547
{
8648
"type": "node",
8749
"request": "launch",
@@ -155,14 +117,52 @@
155117
],
156118
"args": [
157119
"dialog:merge",
158-
"../libraries/**/*.schema",
120+
"libraries/**/*.schema",
121+
"-o",
122+
"${env:TEMP}/sdk.schema",
123+
"--verbose"
124+
],
125+
"internalConsoleOptions": "openOnSessionStart",
126+
"cwd": "${workspaceFolder}/../botbuilder-dotnet"
127+
},
128+
{
129+
"type": "node",
130+
"request": "launch",
131+
"name": "BotBuilder project",
132+
"preLaunchTask": "${defaultBuildTask}",
133+
"program": "${workspaceFolder}/packages/dialog/bin/run",
134+
"outputCapture": "std",
135+
"outFiles": [
136+
"./packages/dialog/lib/**"
137+
],
138+
"args": [
139+
"dialog:merge",
140+
"tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/*.csproj",
141+
"-o",
142+
"${env:TEMP}/app.schema"
143+
],
144+
"internalConsoleOptions": "openOnSessionStart",
145+
"cwd": "${workspaceFolder}/../botbuilder-dotnet"
146+
},
147+
{
148+
"type": "node",
149+
"request": "launch",
150+
"name": "Dialog merge test schema",
151+
"preLaunchTask": "${defaultBuildTask}",
152+
"program": "${workspaceFolder}/packages/dialog/bin/run",
153+
"outputCapture": "std",
154+
"outFiles": [
155+
"./packages/dialog/lib/**"
156+
],
157+
"args": [
158+
"dialog:merge",
159+
"schemas/*.schema",
159160
"-o",
160-
"sdk.schema",
161-
"--verbose",
162-
"-u"
161+
"schemas/app.schema",
162+
"-d"
163163
],
164164
"internalConsoleOptions": "openOnSessionStart",
165-
"cwd": "${workspaceFolder}/../botbuilder-dotnet/schemas"
165+
"cwd": "${workspaceFolder}/packages/dialog/test/commands/dialog"
166166
},
167167
{
168168
"type": "node",

0 commit comments

Comments
 (0)