V.future

.gitignore

@@ -308,3 +308,4 @@ packages/lubuild/bin/**
 packages/lubuild/lib/**
 packages/lubuild/typings/**
 
+packages/MSLG/.vscode/launch.json

README.md

@@ -4,7 +4,7 @@
 ### [Click here to find out what's new for //build2019!](https://github.com/Microsoft/botframework/blob/master/whats-new.md#whats-new)
 
 # Bot Framework Tools 
-[![Build Status](https://travis-ci.org/Microsoft/botbuilder-tools.svg?branch=master)](https://travis-ci.org/Microsoft/botbuilder-tools) [![Coverage Status](https://coveralls.io/repos/github/Microsoft/botbuilder-tools/badge.svg?branch=master)](https://coveralls.io/github/Microsoft/botbuilder-tools?branch=master) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)
+[![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Tools/Botbuilder-tools-js-daily?branchName=master)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=467&branchName=master) [![Coverage Status](https://coveralls.io/repos/github/Microsoft/botbuilder-tools/badge.svg?branch=master)](https://coveralls.io/github/Microsoft/botbuilder-tools?branch=master) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)
 
 The Bot Framework tools are a collection of cross-platform command line tools designed to cover end-to-end bot development workflow. This repo is part the [Microsoft Bot Framework](https://github.com/Microsoft/botframework) -  a comprehensive framework for building enterprise-grade conversational AI experiences.
 
@@ -20,20 +20,20 @@ This repo is part the [Microsoft Bot Framework](https://github.com/microsoft/bot
 | [![npm version](https://badge.fury.io/js/qnamaker.svg)](https://badge.fury.io/js/qnamaker) |[QnAMaker](packages/QnAMaker) | Create and manage [QnAMaker.ai](http://qnamaker.ai) Knowledge Bases. |
 | [![npm version](https://badge.fury.io/js/botdispatch.svg)](https://badge.fury.io/js/botdispatch) | [Dispatch](packages/Dispatch) | Build language models allowing you to dispatch between disparate components (such as QnA, LUIS and custom code)|
 | [![npm version](https://badge.fury.io/js/luisgen.svg)](https://badge.fury.io/js/luisgen)| [LUISGen](packages/LUISGen) | Auto generate backing C#/Typescript classes for your LUIS intents and entities.|
-| [![npm version](https://badge.fury.io/js/dialogtracker.svg)](https://badge.fury.io/js/dialogtracker)| [DialogTracker](packages/DialogTracker) | Library for tracking .schema, .dialog and .lg files.|
-| [![npm version](https://badge.fury.io/js/dialogschema.svg)](https://badge.fury.io/js/dialogschema)| [DialogSchema](packages/DialogSchema) | Merge together and check .schema and .lg files into a composite .schema file.|
-| [![npm version](https://badge.fury.io/js/dialoglint.svg)](https://badge.fury.io/js/dialoglint)| [DialogLint](packages/DialogLint) | Check .dialog files for errors and compile .lg files.|
+| [![npm version](https://badge.fury.io/js/dialogtracker.svg)](https://badge.fury.io/js/dialogtracker)| [DialogTracker](packages/DialogTracker) | PREVIEW - Library for tracking .schema, .dialog and .lg files.|
+| [![npm version](https://badge.fury.io/js/dialogschema.svg)](https://badge.fury.io/js/dialogschema)| [DialogSchema](packages/DialogSchema) | PREVIEW - Merge together and check .schema and .lg files into a composite .schema file.|
+| [![npm version](https://badge.fury.io/js/dialoglint.svg)](https://badge.fury.io/js/dialoglint)| [DialogLint](packages/DialogLint) | PREVIEW - Check .dialog files for errors and compile .lg files.|
+| [![npm version](https://badge.fury.io/js/mslg.svg)](https://badge.fury.io/js/mslg)| [MSLG](packages/MSLG) | PREVIEW - Parse and collate lg files, expand lg templates or translate lg files.|
 ## Install CLI tools:
 Pre-requisite:
 - [Node.js](https://nodejs.org/) version 10.14.1 or higher
 - [.NET Core SDK](https://www.microsoft.com/net/download) version 2.1.403 or higher
 
 ```
-npm install -g chatdown msbot ludown luis-apis qnamaker botdispatch luisgen dialogtracker dialogschema dialoglint
+npm install -g chatdown msbot ludown luis-apis qnamaker botdispatch luisgen
 ```
 
 ## Overview
-
 - Please see [here](https://aka.ms/BotBuilderOverview) for an overview of the end-to-end bot development workflow.
 - Please see [here](./tools-overview.md) for an overview of using Bot Builder tools throughout various phases of bot development.
 

packages/DialogSchema/.vscode/launch.json

@@ -23,6 +23,21 @@
                 "${workspaceFolder}/lib/**/*.js"
             ]
         },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Packages",
+            "program": "${workspaceFolder}\\lib\\dialogSchema.js",
+            "args": [
+                "packages.json",
+                "test/projects/*"
+            ],
+            "cwd": "${workspaceFolder}",
+            "preLaunchTask": "tsc: build - tsconfig.json",
+            "outFiles": [
+                "${workspaceFolder}/lib/**/*.js"
+            ]
+        },
         {
             "type": "node",
             "protocol": "inspector",
@@ -41,14 +56,33 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "Launch Adaptive",
+            "name": "Update component.schema",
+            "program": "${workspaceFolder}\\lib\\dialogSchema.js",
+            "args": [
+                "../libraries/**/*.schema",
+                "-o",
+                "sdk.schema",
+                "-b",
+                "4.Future",
+                "-u"
+            ],
+            "cwd": "${workspaceFolder}/../../../botbuilder-dotnet/Schemas/",
+            "preLaunchTask": "tsc: build - tsconfig.json",
+            "outFiles": [
+                "${workspaceFolder}/lib/**/*.js"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Update sdk.schema",
             "program": "${workspaceFolder}\\lib\\dialogSchema.js",
             "args": [
                 "**/*.schema",
                 "-o",
-                "/tmp/app.schema"
+                "../schemas/sdk.schema"
             ],
-            "cwd": "${workspaceFolder}/../../../botbuilder-dotnet/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas",
+            "cwd": "${workspaceFolder}/../../../botbuilder-dotnet/Libraries/",
             "preLaunchTask": "tsc: build - tsconfig.json",
             "outFiles": [
                 "${workspaceFolder}/lib/**/*.js"

packages/DialogSchema/README.md

@@ -6,7 +6,7 @@
 
 # DialogSchema Command Line tool
 
-DialogSchema tool is a command line tool designed to merge together [Microsoft Bot Builder](https://github.com/Microsoft/BotBuilder) .schema JSON schema files into a single JSON schema file. You can point to the files either directly with a glob pattern or indirectly through a glob pattern that matches a package.json, packages.config or *.csproj file.  The .schema files should have a unique filename that is used to refer to that type using `$type`.  The .schema files can optionally include a `$schema: "https://raw.githubusercontent.com/Microsoft/botbuilder-tools/SchemaGen/packages/DialogSchema/src/dialogSchema.schema"` which defines the schema they are validated against.  Within a schema definition you can use `$role:"unionType(<type>)` to project the type definition into union types defined using `$role:"unionType"` while merging.  To refer to a type in a property, just use `"$type":"<type>"`.  The merger combines all of the component .schema files into a single .schema file that has resolved all external `$ref`, merged `allOf` and connected together schemas through `$role` and `$type`. 
+DialogSchema tool is a command line tool designed to merge together [Microsoft Bot Builder](https://github.com/Microsoft/BotBuilder) .schema JSON schema files into a single JSON schema file. You can point to the files either directly with a glob pattern or indirectly through a glob pattern that matches a package.json, packages.config or *.csproj file.  The .schema files should have a unique filename that is used to refer to that type using `$type`.  The .schema files can optionally include a `$schema: "https://raw.githubusercontent.com/Microsoft/botbuilder-dotnet/4.Future/schemas/component.schema"` which defines the schema they are validated against.  Within a schema definition you can use `$role:"unionType(<type>)` to project the type definition into union types defined using `$role:"unionType"` while merging.  To refer to a type in a property, just use `"$type":"<type>"`.  The merger combines all of the component .schema files into a single .schema file that has resolved all external `$ref`, merged `allOf` and connected together schemas through `$role` and `$type`. 
 
 In addition to types you can also mark properties with a `$role` which will define the underlying type and restrictions.  This is also useful information for UI tools to help you construct values.  Roles include:
 * `"$role": "expression"`which marks a string property which is expected to contain an expression string.