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
microsoft · Jan 27, 2021 · 3725565 · 3725565
1 parent fc25e77
commit 3725565
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 39 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,9 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/cli/bin/run",
       "outputCapture": "std",
-      "outFiles": ["${workspaceFolder}/packages/luis/lib/**"],
+      "outFiles": [
+        "${workspaceFolder}/packages/luis/lib/**"
+      ],
       "args": [
         "luis:build",
         "--luConfig",
@@ -36,7 +38,9 @@
       "cwd": "${workspaceFolder}/packages/dialog",
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std",
-      "outFiles": ["./package/dialog/lib/**"]
+      "outFiles": [
+        "./package/dialog/lib/**"
+      ]
     },
     {
       "type": "node",
@@ -57,7 +61,9 @@
       ],
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std",
-      "outFiles": ["./package/dialog/lib/**"]
+      "outFiles": [
+        "./package/dialog/lib/**"
+      ]
     },
     {
       "type": "node",
@@ -78,7 +84,9 @@
         ".*"
       ],
       "internalConsoleOptions": "openOnSessionStart",
-      "outFiles": ["./lib/**"]
+      "outFiles": [
+        "./lib/**"
+      ]
     },
     {
       "type": "node",
@@ -87,10 +95,19 @@
       "preLaunchTask": "${defaultBuildTask}",
       "cwd": "${workspaceFolder}/packages/lu",
       "runtimeExecutable": "npm",
-      "runtimeArgs": ["run", "test", "--", "--timeout", "999999", "--colors"],
+      "runtimeArgs": [
+        "run",
+        "test",
+        "--",
+        "--timeout",
+        "999999",
+        "--colors"
+      ],
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std",
-      "outFiles": ["./packages/lu/lib/**"]
+      "outFiles": [
+        "./packages/lu/lib/**"
+      ]
     },
     {
       "type": "node",
@@ -111,7 +128,9 @@
       ],
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std",
-      "outFiles": ["./packages/lu/lib/**"]
+      "outFiles": [
+        "./packages/lu/lib/**"
+      ]
     },
     {
       "type": "node",
@@ -120,7 +139,9 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/dialog/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/dialog/lib/**"],
+      "outFiles": [
+        "./packages/dialog/lib/**"
+      ],
       "args": [
         "dialog:merge",
         "libraries/**/*.schema",
@@ -132,14 +153,36 @@
       "internalConsoleOptions": "openOnSessionStart",
       "cwd": "${workspaceFolder}/../botbuilder-dotnet"
     },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Composer schema",
+      "preLaunchTask": "${defaultBuildTask}",
+      "program": "${workspaceFolder}/packages/dialog/bin/run",
+      "outputCapture": "std",
+      "outFiles": [
+        "./packages/dialog/lib/**"
+      ],
+      "args": [
+        "dialog:merge",
+        "**/*.csproj",
+        "-o",
+        "${env:TEMP}/sdk.schema",
+        "--verbose"
+      ],
+      "internalConsoleOptions": "openOnSessionStart",
+      "cwd": "${workspaceFolder}/../BotFramework-Composer/runtime/dotnet"
+    },
     {
       "type": "node",
       "request": "launch",
       "name": "BotBuilder project",
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/dialog/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/dialog/lib/**"],
+      "outFiles": [
+        "./packages/dialog/lib/**"
+      ],
       "args": [
         "dialog:merge",
         "tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/*.csproj",
@@ -157,7 +200,9 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/dialog/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/dialog/lib/**"],
+      "outFiles": [
+        "./packages/dialog/lib/**"
+      ],
       "args": [
         "dialog:merge",
         "*.csproj",
@@ -175,8 +220,14 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/dialog/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/dialog/lib/**"],
-      "args": ["dialog:verify", "tests/**/*.dialog", "--verbose"],
+      "outFiles": [
+        "./packages/dialog/lib/**"
+      ],
+      "args": [
+        "dialog:verify",
+        "tests/**/*.dialog",
+        "--verbose"
+      ],
       "internalConsoleOptions": "openOnSessionStart",
       "cwd": "${workspaceFolder}/../botbuilder-dotnet"
     },
@@ -187,7 +238,9 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/dialog/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/dialog/lib/**"],
+      "outFiles": [
+        "./packages/dialog/lib/**"
+      ],
       "args": [
         "dialog:merge",
         "libraries/**/*.schema",
@@ -206,7 +259,9 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/dialog/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/dialog/lib/**"],
+      "outFiles": [
+        "./packages/dialog/lib/**"
+      ],
       "args": [
         "dialog:merge",
         "RunBot.csproj",
@@ -246,7 +301,10 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/luis/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/luis/lib/**", "./packages/lu/lib/**"],
+      "outFiles": [
+        "./packages/luis/lib/**",
+        "./packages/lu/lib/**"
+      ],
       "args": [
         "luis:build",
         "--luConfig",
@@ -264,7 +322,10 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/luis/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/luis/lib/**", "./packages/lu/lib/**"],
+      "outFiles": [
+        "./packages/luis/lib/**",
+        "./packages/lu/lib/**"
+      ],
       "args": [
         "luis:convert",
         "--in",
@@ -285,7 +346,10 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/luis/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/luis/lib/**", "./packages/lu/lib/**"],
+      "outFiles": [
+        "./packages/luis/lib/**",
+        "./packages/lu/lib/**"
+      ],
       "args": [
         "luis:convert",
         "--in",
@@ -306,7 +370,10 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/lu/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/lu/lib/**", "./pacakges/luis/lib/**"],
+      "outFiles": [
+        "./packages/lu/lib/**",
+        "./pacakges/luis/lib/**"
+      ],
       "args": [
         "luis:build",
         "--in",
@@ -327,7 +394,9 @@
       "preLaunchTask": "${defaultBuildTask}",
       "program": "${workspaceFolder}/packages/lg/bin/run",
       "outputCapture": "std",
-      "outFiles": ["./packages/lg/lib/**"],
+      "outFiles": [
+        "./packages/lg/lib/**"
+      ],
       "args": [
         "lg:expand",
         "--in",
@@ -341,4 +410,4 @@
       "cwd": "${workspaceFolder}/packages/lg/test/fixtures/testcase"
     }
   ]
-}
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml