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

Commit 3725565

Browse files
author
Chris McConnell
authored
Support wild cards in nuget versions for dialog:merge (#1096)
* Support wild cards in nuget versions * Address review feedback and add some comments. * Add const
1 parent fc25e77 commit 3725565

File tree

5 files changed

+163
-39
lines changed

5 files changed

+163
-39
lines changed

‎.vscode/launch.json‎

Lines changed: 89 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"preLaunchTask": "${defaultBuildTask}",
99
"program": "${workspaceFolder}/packages/cli/bin/run",
1010
"outputCapture": "std",
11-
"outFiles": ["${workspaceFolder}/packages/luis/lib/**"],
11+
"outFiles": [
12+
"${workspaceFolder}/packages/luis/lib/**"
13+
],
1214
"args": [
1315
"luis:build",
1416
"--luConfig",
@@ -36,7 +38,9 @@
3638
"cwd": "${workspaceFolder}/packages/dialog",
3739
"internalConsoleOptions": "openOnSessionStart",
3840
"outputCapture": "std",
39-
"outFiles": ["./package/dialog/lib/**"]
41+
"outFiles": [
42+
"./package/dialog/lib/**"
43+
]
4044
},
4145
{
4246
"type": "node",
@@ -57,7 +61,9 @@
5761
],
5862
"internalConsoleOptions": "openOnSessionStart",
5963
"outputCapture": "std",
60-
"outFiles": ["./package/dialog/lib/**"]
64+
"outFiles": [
65+
"./package/dialog/lib/**"
66+
]
6167
},
6268
{
6369
"type": "node",
@@ -78,7 +84,9 @@
7884
".*"
7985
],
8086
"internalConsoleOptions": "openOnSessionStart",
81-
"outFiles": ["./lib/**"]
87+
"outFiles": [
88+
"./lib/**"
89+
]
8290
},
8391
{
8492
"type": "node",
@@ -87,10 +95,19 @@
8795
"preLaunchTask": "${defaultBuildTask}",
8896
"cwd": "${workspaceFolder}/packages/lu",
8997
"runtimeExecutable": "npm",
90-
"runtimeArgs": ["run", "test", "--", "--timeout", "999999", "--colors"],
98+
"runtimeArgs": [
99+
"run",
100+
"test",
101+
"--",
102+
"--timeout",
103+
"999999",
104+
"--colors"
105+
],
91106
"internalConsoleOptions": "openOnSessionStart",
92107
"outputCapture": "std",
93-
"outFiles": ["./packages/lu/lib/**"]
108+
"outFiles": [
109+
"./packages/lu/lib/**"
110+
]
94111
},
95112
{
96113
"type": "node",
@@ -111,7 +128,9 @@
111128
],
112129
"internalConsoleOptions": "openOnSessionStart",
113130
"outputCapture": "std",
114-
"outFiles": ["./packages/lu/lib/**"]
131+
"outFiles": [
132+
"./packages/lu/lib/**"
133+
]
115134
},
116135
{
117136
"type": "node",
@@ -120,7 +139,9 @@
120139
"preLaunchTask": "${defaultBuildTask}",
121140
"program": "${workspaceFolder}/packages/dialog/bin/run",
122141
"outputCapture": "std",
123-
"outFiles": ["./packages/dialog/lib/**"],
142+
"outFiles": [
143+
"./packages/dialog/lib/**"
144+
],
124145
"args": [
125146
"dialog:merge",
126147
"libraries/**/*.schema",
@@ -132,14 +153,36 @@
132153
"internalConsoleOptions": "openOnSessionStart",
133154
"cwd": "${workspaceFolder}/../botbuilder-dotnet"
134155
},
156+
{
157+
"type": "node",
158+
"request": "launch",
159+
"name": "Composer schema",
160+
"preLaunchTask": "${defaultBuildTask}",
161+
"program": "${workspaceFolder}/packages/dialog/bin/run",
162+
"outputCapture": "std",
163+
"outFiles": [
164+
"./packages/dialog/lib/**"
165+
],
166+
"args": [
167+
"dialog:merge",
168+
"**/*.csproj",
169+
"-o",
170+
"${env:TEMP}/sdk.schema",
171+
"--verbose"
172+
],
173+
"internalConsoleOptions": "openOnSessionStart",
174+
"cwd": "${workspaceFolder}/../BotFramework-Composer/runtime/dotnet"
175+
},
135176
{
136177
"type": "node",
137178
"request": "launch",
138179
"name": "BotBuilder project",
139180
"preLaunchTask": "${defaultBuildTask}",
140181
"program": "${workspaceFolder}/packages/dialog/bin/run",
141182
"outputCapture": "std",
142-
"outFiles": ["./packages/dialog/lib/**"],
183+
"outFiles": [
184+
"./packages/dialog/lib/**"
185+
],
143186
"args": [
144187
"dialog:merge",
145188
"tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/*.csproj",
@@ -157,7 +200,9 @@
157200
"preLaunchTask": "${defaultBuildTask}",
158201
"program": "${workspaceFolder}/packages/dialog/bin/run",
159202
"outputCapture": "std",
160-
"outFiles": ["./packages/dialog/lib/**"],
203+
"outFiles": [
204+
"./packages/dialog/lib/**"
205+
],
161206
"args": [
162207
"dialog:merge",
163208
"*.csproj",
@@ -175,8 +220,14 @@
175220
"preLaunchTask": "${defaultBuildTask}",
176221
"program": "${workspaceFolder}/packages/dialog/bin/run",
177222
"outputCapture": "std",
178-
"outFiles": ["./packages/dialog/lib/**"],
179-
"args": ["dialog:verify", "tests/**/*.dialog", "--verbose"],
223+
"outFiles": [
224+
"./packages/dialog/lib/**"
225+
],
226+
"args": [
227+
"dialog:verify",
228+
"tests/**/*.dialog",
229+
"--verbose"
230+
],
180231
"internalConsoleOptions": "openOnSessionStart",
181232
"cwd": "${workspaceFolder}/../botbuilder-dotnet"
182233
},
@@ -187,7 +238,9 @@
187238
"preLaunchTask": "${defaultBuildTask}",
188239
"program": "${workspaceFolder}/packages/dialog/bin/run",
189240
"outputCapture": "std",
190-
"outFiles": ["./packages/dialog/lib/**"],
241+
"outFiles": [
242+
"./packages/dialog/lib/**"
243+
],
191244
"args": [
192245
"dialog:merge",
193246
"libraries/**/*.schema",
@@ -206,7 +259,9 @@
206259
"preLaunchTask": "${defaultBuildTask}",
207260
"program": "${workspaceFolder}/packages/dialog/bin/run",
208261
"outputCapture": "std",
209-
"outFiles": ["./packages/dialog/lib/**"],
262+
"outFiles": [
263+
"./packages/dialog/lib/**"
264+
],
210265
"args": [
211266
"dialog:merge",
212267
"RunBot.csproj",
@@ -246,7 +301,10 @@
246301
"preLaunchTask": "${defaultBuildTask}",
247302
"program": "${workspaceFolder}/packages/luis/bin/run",
248303
"outputCapture": "std",
249-
"outFiles": ["./packages/luis/lib/**", "./packages/lu/lib/**"],
304+
"outFiles": [
305+
"./packages/luis/lib/**",
306+
"./packages/lu/lib/**"
307+
],
250308
"args": [
251309
"luis:build",
252310
"--luConfig",
@@ -264,7 +322,10 @@
264322
"preLaunchTask": "${defaultBuildTask}",
265323
"program": "${workspaceFolder}/packages/luis/bin/run",
266324
"outputCapture": "std",
267-
"outFiles": ["./packages/luis/lib/**", "./packages/lu/lib/**"],
325+
"outFiles": [
326+
"./packages/luis/lib/**",
327+
"./packages/lu/lib/**"
328+
],
268329
"args": [
269330
"luis:convert",
270331
"--in",
@@ -285,7 +346,10 @@
285346
"preLaunchTask": "${defaultBuildTask}",
286347
"program": "${workspaceFolder}/packages/luis/bin/run",
287348
"outputCapture": "std",
288-
"outFiles": ["./packages/luis/lib/**", "./packages/lu/lib/**"],
349+
"outFiles": [
350+
"./packages/luis/lib/**",
351+
"./packages/lu/lib/**"
352+
],
289353
"args": [
290354
"luis:convert",
291355
"--in",
@@ -306,7 +370,10 @@
306370
"preLaunchTask": "${defaultBuildTask}",
307371
"program": "${workspaceFolder}/packages/lu/bin/run",
308372
"outputCapture": "std",
309-
"outFiles": ["./packages/lu/lib/**", "./pacakges/luis/lib/**"],
373+
"outFiles": [
374+
"./packages/lu/lib/**",
375+
"./pacakges/luis/lib/**"
376+
],
310377
"args": [
311378
"luis:build",
312379
"--in",
@@ -327,7 +394,9 @@
327394
"preLaunchTask": "${defaultBuildTask}",
328395
"program": "${workspaceFolder}/packages/lg/bin/run",
329396
"outputCapture": "std",
330-
"outFiles": ["./packages/lg/lib/**"],
397+
"outFiles": [
398+
"./packages/lg/lib/**"
399+
],
331400
"args": [
332401
"lg:expand",
333402
"--in",
@@ -341,4 +410,4 @@
341410
"cwd": "${workspaceFolder}/packages/lg/test/fixtures/testcase"
342411
}
343412
]
344-
}
413+
}

‎common/config/rush/pnpm-lock.yaml‎

Lines changed: 32 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)