[Virtual Assistant][TypeScript] Rename Botbuilder libraries (microsof…

…t#1080) * Rename botbuilder-skill dependency * Rename botbuilder-solution dependency * Update references to those dependencies
bhushang19 · Apr 10, 2019 · e4f4742 · e4f4742
1 parent 65ffd71
commit e4f4742
Show file tree

Hide file tree

Showing 118 changed files with 73 additions and 73 deletions.
diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/package.json b/solutions/Virtual-Assistant/src/typescript/assistant/package.json
@@ -21,8 +21,8 @@
         "@microsoft/microsoft-graph-types": "^1.5.0",
         "applicationinsights": "^1.0.4",
         "azure-cognitiveservices-contentmoderator": "^4.0.0",
-        "bot-solution": "^1.0.0",
-        "bot-skill": "^1.0.0",
+        "botbuilder-solutions": "^1.0.0",
+        "botbuilder-skills": "^1.0.0",
         "botbuilder": "^4.2.1",
         "botbuilder-ai": "^4.2.1",
         "botbuilder-azure": "4.2.1",

diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/src/botServices.ts b/solutions/Virtual-Assistant/src/typescript/assistant/src/botServices.ts
@@ -5,7 +5,7 @@
 
 import { TelemetryClient } from 'applicationinsights';
 import { ITelemetryLuisRecognizer, ITelemetryQnAMaker, LocaleConfiguration, SkillConfiguration, SkillConfigurationBase, SkillDefinition,
-    SkillEvent, TelemetryLuisRecognizer, TelemetryQnAMaker } from 'bot-solution';
+    SkillEvent, TelemetryLuisRecognizer, TelemetryQnAMaker } from 'botbuilder-solutions';
 import { LuisApplication, QnAMakerEndpoint } from 'botbuilder-ai';
 import { CosmosDbStorageSettings } from 'botbuilder-azure';
 import { AppInsightsService, BotConfiguration, CosmosDbService, DispatchService,

diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/src/dialogs/main/mainDialog.ts b/solutions/Virtual-Assistant/src/typescript/assistant/src/dialogs/main/mainDialog.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { SkillDialog, SkillDefinition as RemoteSkillDefinition } from 'bot-skill';
+import { SkillDialog, SkillDefinition as RemoteSkillDefinition } from 'botbuilder-skills';
 import {
     IBackgroundTaskQueue,
     InterruptionAction,
@@ -16,7 +16,7 @@ import {
     SkillDefinition,
     SkillEvent,
     SkillRouter,
-    TelemetryExtensions } from 'bot-solution';
+    TelemetryExtensions } from 'botbuilder-solutions';
 import {
     BotFrameworkAdapter,
     BotTelemetryClient,

diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/src/dialogs/main/mainResponses.ts b/solutions/Virtual-Assistant/src/typescript/assistant/src/dialogs/main/mainResponses.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ActivityExtensions } from 'bot-solution';
+import { ActivityExtensions } from 'botbuilder-solutions';
 import {
     Activity,
     CardFactory,

diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/src/dialogs/shared/enterpriseDialog.ts b/solutions/Virtual-Assistant/src/typescript/assistant/src/dialogs/shared/enterpriseDialog.ts
@@ -7,7 +7,7 @@ import {
     InterruptableDialog,
     InterruptionAction,
     ITelemetryLuisRecognizer,
-    LocaleConfiguration } from 'bot-solution';
+    LocaleConfiguration } from 'botbuilder-solutions';
 import {
     BotTelemetryClient,
     RecognizerResult } from 'botbuilder';

diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/src/index.ts b/solutions/Virtual-Assistant/src/typescript/assistant/src/index.ts
@@ -14,7 +14,7 @@ import {
     SetLocaleMiddleware,
     SkillDefinition,
     SkillEvent,
-    TelemetryExtensions } from 'bot-solution';
+    TelemetryExtensions } from 'botbuilder-solutions';
 import {
     AutoSaveStateMiddleware,
     BotFrameworkAdapter,

diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/src/virtualAssistant.ts b/solutions/Virtual-Assistant/src/typescript/assistant/src/virtualAssistant.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { IBackgroundTaskQueue, ProactiveState } from 'bot-solution';
+import { IBackgroundTaskQueue, ProactiveState } from 'botbuilder-solutions';
 import { BotTelemetryClient, ConversationState, EndOfConversationCodes, TurnContext, UserState } from 'botbuilder';
 import { DialogContext, DialogSet, DialogState, DialogTurnResult } from 'botbuilder-dialogs';
 import { IEndpointService } from 'botframework-config';

diff --git a/solutions/Virtual-Assistant/src/typescript/assistant/test/flow/assistantTestBase.js b/solutions/Virtual-Assistant/src/typescript/assistant/test/flow/assistantTestBase.js
@@ -12,7 +12,7 @@ const BotServices = require('../../lib/botServices.js').BotServices;
 const VirtualAssistant = require('../../lib/virtualAssistant.js').VirtualAssistant;
 let languageModelsRaw;
 let skillsRaw;
-const { Locales, ProactiveState, SkillDefinition } = require('bot-solution');
+const { Locales, ProactiveState, SkillDefinition } = require('botbuilder-solutions');
 const TEST_MODE = require('../testBase').testMode;
 
 const setupEnvironment = function (testMode) {

diff --git a/...ant/src/typescript/bot-skill/package.json → ...typescript/botbuilder-skills/package.json b/...ant/src/typescript/bot-skill/package.json → ...typescript/botbuilder-skills/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "bot-skill",
+    "name": "botbuilder-skills",
     "version": "1.0.0",
     "description": "",
     "author": "Microsoft Bot Framework Team",
@@ -14,7 +14,7 @@
         "test": "mocha ./test/"
     },
     "dependencies": {
-		"bot-solution": "^1.0.0",
+		"botbuilder-solutions": "^1.0.0",
         "botbuilder": "^4.2.1",
         "botbuilder-ai": "^4.2.1",
         "botbuilder-azure": "4.2.1",

diff --git a/.../typescript/bot-skill/src/Models/index.ts → ...ipt/botbuilder-skills/src/Models/index.ts b/.../typescript/bot-skill/src/Models/index.ts → ...ipt/botbuilder-skills/src/Models/index.ts
diff --git a/...t/bot-skill/src/Models/skillDefinition.ts → ...lder-skills/src/Models/skillDefinition.ts b/...t/bot-skill/src/Models/skillDefinition.ts → ...lder-skills/src/Models/skillDefinition.ts
diff --git a/...ot-skill/src/Models/skillDialogOptions.ts → ...r-skills/src/Models/skillDialogOptions.ts b/...ot-skill/src/Models/skillDialogOptions.ts → ...r-skills/src/Models/skillDialogOptions.ts
diff --git a/...cript/bot-skill/src/Models/skillEvents.ts → ...tbuilder-skills/src/Models/skillEvents.ts b/...cript/bot-skill/src/Models/skillEvents.ts → ...tbuilder-skills/src/Models/skillEvents.ts
diff --git a/...ant/src/typescript/bot-skill/src/index.ts → ...typescript/botbuilder-skills/src/index.ts b/...ant/src/typescript/bot-skill/src/index.ts → ...typescript/botbuilder-skills/src/index.ts
@@ -1,5 +1,5 @@
 /**
- * @module bot-skill
+ * @module botbuilder-skills
  */
 /**
  * Copyright(c) Microsoft Corporation.All rights reserved.

diff --git a/.../typescript/bot-skill/src/skillAdapter.ts → ...ipt/botbuilder-skills/src/skillAdapter.ts b/.../typescript/bot-skill/src/skillAdapter.ts → ...ipt/botbuilder-skills/src/skillAdapter.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ActivityExtensions } from 'bot-solution';
+import { ActivityExtensions } from 'botbuilder-solutions';
 import { BotFrameworkAdapter, InvokeResponse, TurnContext, WebRequest, WebResponse } from 'botbuilder';
 import { DialogContext } from 'botbuilder-dialogs';
 import { Activity, ActivityTypes, ConversationReference, ResourceResponse } from 'botframework-schema';

diff --git a/...c/typescript/bot-skill/src/skillDialog.ts → ...ript/botbuilder-skills/src/skillDialog.ts b/...c/typescript/bot-skill/src/skillDialog.ts → ...ript/botbuilder-skills/src/skillDialog.ts
diff --git a/...nt/src/typescript/bot-skill/tsconfig.json → ...ypescript/botbuilder-skills/tsconfig.json b/...nt/src/typescript/bot-skill/tsconfig.json → ...ypescript/botbuilder-skills/tsconfig.json
diff --git a/...tant/src/typescript/bot-skill/tslint.json → .../typescript/botbuilder-skills/tslint.json b/...tant/src/typescript/bot-skill/tslint.json → .../typescript/botbuilder-skills/tslint.json
diff --git a/.../src/typescript/bot-solution/package.json → ...escript/botbuilder-solutions/package.json b/.../src/typescript/bot-solution/package.json → ...escript/botbuilder-solutions/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "bot-solution",
+    "name": "botbuilder-solutions",
     "version": "1.0.0",
     "description": "",
     "author": "Microsoft Bot Framework Team",

diff --git a/...ntication/AuthenticationResponses.de.json → ...ntication/AuthenticationResponses.de.json b/...ntication/AuthenticationResponses.de.json → ...ntication/AuthenticationResponses.de.json
diff --git a/...ntication/AuthenticationResponses.es.json → ...ntication/AuthenticationResponses.es.json b/...ntication/AuthenticationResponses.es.json → ...ntication/AuthenticationResponses.es.json
diff --git a/...ntication/AuthenticationResponses.fr.json → ...ntication/AuthenticationResponses.fr.json b/...ntication/AuthenticationResponses.fr.json → ...ntication/AuthenticationResponses.fr.json
diff --git a/...ntication/AuthenticationResponses.it.json → ...ntication/AuthenticationResponses.it.json b/...ntication/AuthenticationResponses.it.json → ...ntication/AuthenticationResponses.it.json
diff --git a/...thentication/AuthenticationResponses.json → ...thentication/AuthenticationResponses.json b/...thentication/AuthenticationResponses.json → ...thentication/AuthenticationResponses.json
diff --git a/...ntication/AuthenticationResponses.zh.json → ...ntication/AuthenticationResponses.zh.json b/...ntication/AuthenticationResponses.zh.json → ...ntication/AuthenticationResponses.zh.json
diff --git a/...authentication/authenticationResponses.ts → ...authentication/authenticationResponses.ts b/...authentication/authenticationResponses.ts → ...authentication/authenticationResponses.ts
diff --git a/.../bot-solution/src/authentication/index.ts → ...der-solutions/src/authentication/index.ts b/.../bot-solution/src/authentication/index.ts → ...der-solutions/src/authentication/index.ts
diff --git a/...authentication/multiProviderAuthDialog.ts → ...authentication/multiProviderAuthDialog.ts b/...authentication/multiProviderAuthDialog.ts → ...authentication/multiProviderAuthDialog.ts
diff --git a/...c/authentication/providerTokenResponse.ts → ...c/authentication/providerTokenResponse.ts b/...c/authentication/providerTokenResponse.ts → ...c/authentication/providerTokenResponse.ts
diff --git a/...escript/bot-solution/src/dialogs/index.ts → ...botbuilder-solutions/src/dialogs/index.ts b/...escript/bot-solution/src/dialogs/index.ts → ...botbuilder-solutions/src/dialogs/index.ts
diff --git a/...lution/src/dialogs/interruptableDialog.ts → ...utions/src/dialogs/interruptableDialog.ts b/...lution/src/dialogs/interruptableDialog.ts → ...utions/src/dialogs/interruptableDialog.ts
diff --git a/...olution/src/dialogs/interruptionAction.ts → ...lutions/src/dialogs/interruptionAction.ts b/...olution/src/dialogs/interruptionAction.ts → ...lutions/src/dialogs/interruptionAction.ts
diff --git a/.../bot-solution/src/dialogs/routerDialog.ts → ...der-solutions/src/dialogs/routerDialog.ts b/.../bot-solution/src/dialogs/routerDialog.ts → ...der-solutions/src/dialogs/routerDialog.ts
diff --git a/...tion/src/extensions/activityExtensions.ts → ...ions/src/extensions/activityExtensions.ts b/...tion/src/extensions/activityExtensions.ts → ...ions/src/extensions/activityExtensions.ts
diff --git a/...ript/bot-solution/src/extensions/index.ts → ...builder-solutions/src/extensions/index.ts b/...ript/bot-solution/src/extensions/index.ts → ...builder-solutions/src/extensions/index.ts
diff --git a/.../src/typescript/bot-solution/src/index.ts → ...escript/botbuilder-solutions/src/index.ts b/.../src/typescript/bot-solution/src/index.ts → ...escript/botbuilder-solutions/src/index.ts
@@ -1,5 +1,5 @@
 /**
- * @module bot-solution
+ * @module botbuilder-solutions
  */
 /**
  * Copyright(c) Microsoft Corporation.All rights reserved.

diff --git a/...rc/typescript/bot-solution/src/locales.ts → ...cript/botbuilder-solutions/src/locales.ts b/...rc/typescript/bot-solution/src/locales.ts → ...cript/botbuilder-solutions/src/locales.ts
diff --git a/...pescript/bot-solution/src/locales/de.json → .../botbuilder-solutions/src/locales/de.json b/...pescript/bot-solution/src/locales/de.json → .../botbuilder-solutions/src/locales/de.json
diff --git a/...pescript/bot-solution/src/locales/en.json → .../botbuilder-solutions/src/locales/en.json b/...pescript/bot-solution/src/locales/en.json → .../botbuilder-solutions/src/locales/en.json
diff --git a/...pescript/bot-solution/src/locales/es.json → .../botbuilder-solutions/src/locales/es.json b/...pescript/bot-solution/src/locales/es.json → .../botbuilder-solutions/src/locales/es.json
diff --git a/...pescript/bot-solution/src/locales/fr.json → .../botbuilder-solutions/src/locales/fr.json b/...pescript/bot-solution/src/locales/fr.json → .../botbuilder-solutions/src/locales/fr.json
diff --git a/...pescript/bot-solution/src/locales/it.json → .../botbuilder-solutions/src/locales/it.json b/...pescript/bot-solution/src/locales/it.json → .../botbuilder-solutions/src/locales/it.json
diff --git a/...pescript/bot-solution/src/locales/zh.json → .../botbuilder-solutions/src/locales/zh.json b/...pescript/bot-solution/src/locales/zh.json → .../botbuilder-solutions/src/locales/zh.json
diff --git a/...src/middleware/eventDebuggerMiddleware.ts → ...src/middleware/eventDebuggerMiddleware.ts b/...src/middleware/eventDebuggerMiddleware.ts → ...src/middleware/eventDebuggerMiddleware.ts
diff --git a/...ript/bot-solution/src/middleware/index.ts → ...builder-solutions/src/middleware/index.ts b/...ript/bot-solution/src/middleware/index.ts → ...builder-solutions/src/middleware/index.ts
@@ -1,5 +1,5 @@
 /**
- * @module bot-solution
+ * @module botbuilder-solutions
  */
 /**
  * Copyright(c) Microsoft Corporation.All rights reserved.

diff --git a/...ion/src/middleware/setLocaleMiddleware.ts → ...ons/src/middleware/setLocaleMiddleware.ts b/...ion/src/middleware/setLocaleMiddleware.ts → ...ons/src/middleware/setLocaleMiddleware.ts
diff --git a/...olution/src/middleware/telemetry/index.ts → ...lutions/src/middleware/telemetry/index.ts b/...olution/src/middleware/telemetry/index.ts → ...lutions/src/middleware/telemetry/index.ts
diff --git a/...ddleware/telemetry/telemetryExtensions.ts → ...ddleware/telemetry/telemetryExtensions.ts b/...ddleware/telemetry/telemetryExtensions.ts → ...ddleware/telemetry/telemetryExtensions.ts
diff --git a/...re/telemetry/telemetryLoggerMiddleware.ts → ...re/telemetry/telemetryLoggerMiddleware.ts b/...re/telemetry/telemetryLoggerMiddleware.ts → ...re/telemetry/telemetryLoggerMiddleware.ts
diff --git a/...ware/telemetry/telemetryLuisRecognizer.ts → ...ware/telemetry/telemetryLuisRecognizer.ts b/...ware/telemetry/telemetryLuisRecognizer.ts → ...ware/telemetry/telemetryLuisRecognizer.ts
diff --git a/...middleware/telemetry/telemetryQnAMaker.ts → ...middleware/telemetry/telemetryQnAMaker.ts b/...middleware/telemetry/telemetryQnAMaker.ts → ...middleware/telemetry/telemetryQnAMaker.ts
diff --git a/...cript/bot-solution/src/proactive/index.ts → ...tbuilder-solutions/src/proactive/index.ts b/...cript/bot-solution/src/proactive/index.ts → ...tbuilder-solutions/src/proactive/index.ts
diff --git a/...-solution/src/proactive/proactiveModel.ts → ...solutions/src/proactive/proactiveModel.ts b/...-solution/src/proactive/proactiveModel.ts → ...solutions/src/proactive/proactiveModel.ts
diff --git a/...-solution/src/proactive/proactiveState.ts → ...solutions/src/proactive/proactiveState.ts b/...-solution/src/proactive/proactiveState.ts → ...solutions/src/proactive/proactiveState.ts
diff --git a/...src/proactive/proactiveStateMiddleware.ts → ...src/proactive/proactiveStateMiddleware.ts b/...src/proactive/proactiveStateMiddleware.ts → ...src/proactive/proactiveStateMiddleware.ts
diff --git a/...ion/src/resources/CommonResponses.de.json → ...ons/src/resources/CommonResponses.de.json b/...ion/src/resources/CommonResponses.de.json → ...ons/src/resources/CommonResponses.de.json
diff --git a/...ion/src/resources/CommonResponses.es.json → ...ons/src/resources/CommonResponses.es.json b/...ion/src/resources/CommonResponses.es.json → ...ons/src/resources/CommonResponses.es.json
diff --git a/...ion/src/resources/CommonResponses.fr.json → ...ons/src/resources/CommonResponses.fr.json b/...ion/src/resources/CommonResponses.fr.json → ...ons/src/resources/CommonResponses.fr.json
diff --git a/...ion/src/resources/CommonResponses.it.json → ...ons/src/resources/CommonResponses.it.json b/...ion/src/resources/CommonResponses.it.json → ...ons/src/resources/CommonResponses.it.json
diff --git a/...lution/src/resources/CommonResponses.json → ...utions/src/resources/CommonResponses.json b/...lution/src/resources/CommonResponses.json → ...utions/src/resources/CommonResponses.json
diff --git a/...ion/src/resources/CommonResponses.zh.json → ...ons/src/resources/CommonResponses.zh.json b/...ion/src/resources/CommonResponses.zh.json → ...ons/src/resources/CommonResponses.zh.json
diff --git a/...ipt/bot-solution/src/resources/General.ts → ...uilder-solutions/src/resources/General.ts b/...ipt/bot-solution/src/resources/General.ts → ...uilder-solutions/src/resources/General.ts
@@ -1,6 +1,6 @@
 /**
 * <auto-generated>
-* Code generated by LUISGen C:\Users\MartinBattaglino\Desktop\dispatch.json -ts General -o C:\Git\AI\solutions\Virtual-Assistant\src\typescript\bot-solution\src\resources
+* Code generated by LUISGen C:\Users\MartinBattaglino\Desktop\dispatch.json -ts General -o C:\Git\AI\solutions\Virtual-Assistant\src\typescript\botbuilder-solutions\src\resources
 * Tool github: https://github.com/microsoft/botbuilder-tools
 * Changes may cause incorrect behavior and will be lost if the code is
 * regenerated.

diff --git a/.../src/resources/cards/onboardInfoCard.json → .../src/resources/cards/onboardInfoCard.json b/.../src/resources/cards/onboardInfoCard.json → .../src/resources/cards/onboardInfoCard.json
diff --git a/...solution/src/resources/commonResponses.ts → ...olutions/src/resources/commonResponses.ts b/...solution/src/resources/commonResponses.ts → ...olutions/src/resources/commonResponses.ts
diff --git a/...cript/bot-solution/src/resources/index.ts → ...tbuilder-solutions/src/resources/index.ts b/...cript/bot-solution/src/resources/index.ts → ...tbuilder-solutions/src/resources/index.ts
diff --git a/...script/bot-solution/src/responses/card.ts → ...otbuilder-solutions/src/responses/card.ts b/...script/bot-solution/src/responses/card.ts → ...otbuilder-solutions/src/responses/card.ts
diff --git a/...pt/bot-solution/src/responses/cardData.ts → ...ilder-solutions/src/responses/cardData.ts b/...pt/bot-solution/src/responses/cardData.ts → ...ilder-solutions/src/responses/cardData.ts
diff --git a/...cript/bot-solution/src/responses/index.ts → ...tbuilder-solutions/src/responses/index.ts b/...cript/bot-solution/src/responses/index.ts → ...tbuilder-solutions/src/responses/index.ts
@@ -1,5 +1,5 @@
 /**
- * @module bot-solution
+ * @module botbuilder-solutions
  */
 /**
  * Copyright(c) Microsoft Corporation.All rights reserved.

diff --git a/...cript/bot-solution/src/responses/reply.ts → ...tbuilder-solutions/src/responses/reply.ts b/...cript/bot-solution/src/responses/reply.ts → ...tbuilder-solutions/src/responses/reply.ts
diff --git a/...ion/src/responses/responseIdCollection.ts → ...ons/src/responses/responseIdCollection.ts b/...ion/src/responses/responseIdCollection.ts → ...ons/src/responses/responseIdCollection.ts
diff --git a/...solution/src/responses/responseManager.ts → ...olutions/src/responses/responseManager.ts b/...solution/src/responses/responseManager.ts → ...olutions/src/responses/responseManager.ts
diff --git a/...olution/src/responses/responseTemplate.ts → ...lutions/src/responses/responseTemplate.ts b/...olution/src/responses/responseTemplate.ts → ...lutions/src/responses/responseTemplate.ts
diff --git a/...olution/src/skills/SkillResponses.de.json → ...lutions/src/skills/SkillResponses.de.json b/...olution/src/skills/SkillResponses.de.json → ...lutions/src/skills/SkillResponses.de.json
diff --git a/...olution/src/skills/SkillResponses.es.json → ...lutions/src/skills/SkillResponses.es.json b/...olution/src/skills/SkillResponses.es.json → ...lutions/src/skills/SkillResponses.es.json
diff --git a/...olution/src/skills/SkillResponses.fr.json → ...lutions/src/skills/SkillResponses.fr.json b/...olution/src/skills/SkillResponses.fr.json → ...lutions/src/skills/SkillResponses.fr.json
diff --git a/...olution/src/skills/SkillResponses.it.json → ...lutions/src/skills/SkillResponses.it.json b/...olution/src/skills/SkillResponses.it.json → ...lutions/src/skills/SkillResponses.it.json
diff --git a/...t-solution/src/skills/SkillResponses.json → ...-solutions/src/skills/SkillResponses.json b/...t-solution/src/skills/SkillResponses.json → ...-solutions/src/skills/SkillResponses.json
diff --git a/...olution/src/skills/SkillResponses.zh.json → ...lutions/src/skills/SkillResponses.zh.json b/...olution/src/skills/SkillResponses.zh.json → ...lutions/src/skills/SkillResponses.zh.json
diff --git a/.../bot-solution/src/skills/inProcAdapter.ts → ...der-solutions/src/skills/inProcAdapter.ts b/.../bot-solution/src/skills/inProcAdapter.ts → ...der-solutions/src/skills/inProcAdapter.ts
diff --git a/...pescript/bot-solution/src/skills/index.ts → .../botbuilder-solutions/src/skills/index.ts b/...pescript/bot-solution/src/skills/index.ts → .../botbuilder-solutions/src/skills/index.ts
diff --git a/...olution/src/skills/localeConfiguration.ts → ...lutions/src/skills/localeConfiguration.ts b/...olution/src/skills/localeConfiguration.ts → ...lutions/src/skills/localeConfiguration.ts
diff --git a/...solution/src/skills/skillConfiguration.ts → ...olutions/src/skills/skillConfiguration.ts b/...solution/src/skills/skillConfiguration.ts → ...olutions/src/skills/skillConfiguration.ts
diff --git a/...tion/src/skills/skillConfigurationBase.ts → ...ions/src/skills/skillConfigurationBase.ts b/...tion/src/skills/skillConfigurationBase.ts → ...ions/src/skills/skillConfigurationBase.ts
diff --git a/...ot-solution/src/skills/skillDefinition.ts → ...r-solutions/src/skills/skillDefinition.ts b/...ot-solution/src/skills/skillDefinition.ts → ...r-solutions/src/skills/skillDefinition.ts
diff --git a/...pt/bot-solution/src/skills/skillDialog.ts → ...ilder-solutions/src/skills/skillDialog.ts b/...pt/bot-solution/src/skills/skillDialog.ts → ...ilder-solutions/src/skills/skillDialog.ts
diff --git a/...solution/src/skills/skillDialogOptions.ts → ...olutions/src/skills/skillDialogOptions.ts b/...solution/src/skills/skillDialogOptions.ts → ...olutions/src/skills/skillDialogOptions.ts
diff --git a/...ipt/bot-solution/src/skills/skillEvent.ts → ...uilder-solutions/src/skills/skillEvent.ts b/...ipt/bot-solution/src/skills/skillEvent.ts → ...uilder-solutions/src/skills/skillEvent.ts
diff --git a/...bot-solution/src/skills/skillException.ts → ...er-solutions/src/skills/skillException.ts b/...bot-solution/src/skills/skillException.ts → ...er-solutions/src/skills/skillException.ts
diff --git a/...bot-solution/src/skills/skillResponses.ts → ...er-solutions/src/skills/skillResponses.ts b/...bot-solution/src/skills/skillResponses.ts → ...er-solutions/src/skills/skillResponses.ts
diff --git a/...pt/bot-solution/src/skills/skillRouter.ts → ...ilder-solutions/src/skills/skillRouter.ts b/...pt/bot-solution/src/skills/skillRouter.ts → ...ilder-solutions/src/skills/skillRouter.ts
diff --git a/...src/taskExtensions/backgroundTaskQueue.ts → ...src/taskExtensions/backgroundTaskQueue.ts b/...src/taskExtensions/backgroundTaskQueue.ts → ...src/taskExtensions/backgroundTaskQueue.ts
diff --git a/.../bot-solution/src/taskExtensions/index.ts → ...der-solutions/src/taskExtensions/index.ts b/.../bot-solution/src/taskExtensions/index.ts → ...der-solutions/src/taskExtensions/index.ts
diff --git a/...cript/bot-solution/src/util/commonUtil.ts → ...tbuilder-solutions/src/util/commonUtil.ts b/...cript/bot-solution/src/util/commonUtil.ts → ...tbuilder-solutions/src/util/commonUtil.ts
diff --git a/...typescript/bot-solution/src/util/index.ts → ...pt/botbuilder-solutions/src/util/index.ts b/...typescript/bot-solution/src/util/index.ts → ...pt/botbuilder-solutions/src/util/index.ts
diff --git a/...pescript/bot-solution/src/util/md5Util.ts → .../botbuilder-solutions/src/util/md5Util.ts b/...pescript/bot-solution/src/util/md5Util.ts → .../botbuilder-solutions/src/util/md5Util.ts
diff --git a/...src/typescript/bot-solution/tsconfig.json → ...script/botbuilder-solutions/tsconfig.json b/...src/typescript/bot-solution/tsconfig.json → ...script/botbuilder-solutions/tsconfig.json
diff --git a/...t/src/typescript/bot-solution/tslint.json → ...pescript/botbuilder-solutions/tslint.json b/...t/src/typescript/bot-solution/tslint.json → ...pescript/botbuilder-solutions/tslint.json
diff --git a/solutions/Virtual-Assistant/src/typescript/common/config/rush/npm-shrinkwrap.json b/solutions/Virtual-Assistant/src/typescript/common/config/rush/npm-shrinkwrap.json
diff --git a/solutions/Virtual-Assistant/src/typescript/rush.json b/solutions/Virtual-Assistant/src/typescript/rush.json
@@ -10,12 +10,12 @@
       "projectFolder": "assistant"
     },
     {
-      "packageName": "bot-solution",
-      "projectFolder": "bot-solution"
+      "packageName": "botbuilder-solutions",
+      "projectFolder": "botbuilder-solutions"
     },
     {
-      "packageName": "bot-skill",
-      "projectFolder": "bot-skill"
+      "packageName": "botbuilder-skills",
+      "projectFolder": "botbuilder-skills"
     },
     {
       "packageName": "sampleSkill",

diff --git a/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/package.json b/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/package.json
@@ -18,8 +18,8 @@
     },
     "dependencies": {
         "applicationinsights": "^1.0.4",
-        "bot-solution": "^1.0.0",
-        "bot-skill": "^1.0.0",
+        "botbuilder-solutions": "^1.0.0",
+        "botbuilder-skills": "^1.0.0",
         "botbuilder": "^4.2.1",
         "botbuilder-ai": "^4.2.1",
         "botbuilder-azure": "4.2.1",

diff --git a/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/main/mainDialog.ts b/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/main/mainDialog.ts
@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License
 
-import { SkillAdapter } from 'bot-skill';
+import { SkillAdapter } from 'botbuilder-skills';
 import {
     ActivityExtensions,
     InterruptionAction,
     ITelemetryLuisRecognizer,
     LocaleConfiguration,
     ResponseManager,
     RouterDialog,
-    SkillConfigurationBase } from 'bot-solution';
+    SkillConfigurationBase } from 'botbuilder-solutions';
 import {
     Activity,
     ActivityTypes,

diff --git a/...ons/Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/main/mainResponses.ts b/...ons/Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/main/mainResponses.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License
 
-import { IResponseIdCollection } from 'bot-solution';
+import { IResponseIdCollection } from 'botbuilder-solutions';
 import { join } from 'path';
 /**
  * Contains bot responses.

diff --git a/...ns/Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/sample/sampleDialog.ts b/...ns/Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/sample/sampleDialog.ts
@@ -3,7 +3,7 @@
 
 import {
         ResponseManager,
-        SkillConfigurationBase } from 'bot-solution';
+        SkillConfigurationBase } from 'botbuilder-solutions';
 import {
         BotTelemetryClient,
         StatePropertyAccessor } from 'botbuilder';

diff --git a/...Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/sample/sampleResponses.ts b/...Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/sample/sampleResponses.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { IResponseIdCollection } from 'bot-solution';
+import { IResponseIdCollection } from 'botbuilder-solutions';
 import { join } from 'path';
 /**
  * Contains bot responses.

diff --git a/...Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/shared/sharedResponses.ts b/...Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/shared/sharedResponses.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License
 
-import { IResponseIdCollection } from 'bot-solution';
+import { IResponseIdCollection } from 'botbuilder-solutions';
 import { join } from 'path';
 /**
  * Contains bot responses.

diff --git a/...Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/shared/skillDialogBase.ts b/...Virtual-Assistant/src/typescript/skills/sampleSkill/src/dialogs/shared/skillDialogBase.ts
@@ -9,7 +9,7 @@ import {
     LocaleConfiguration,
     MultiProviderAuthDialog,
     ResponseManager,
-    SkillConfigurationBase } from 'bot-solution';
+    SkillConfigurationBase } from 'botbuilder-solutions';
 import {
     Activity,
     ActivityTypes,

diff --git a/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/src/index.ts b/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/src/index.ts
@@ -4,7 +4,7 @@
  */
 
 import { TelemetryClient } from 'applicationinsights';
-import { SkillAdapter } from 'bot-skill';
+import { SkillAdapter } from 'botbuilder-skills';
 import {
     ActivityExtensions,
     EventDebuggerMiddleware,
@@ -16,7 +16,7 @@ import {
     SkillConfiguration,
     SkillDefinition,
     TelemetryExtensions
-} from 'bot-solution';
+} from 'botbuilder-solutions';
 import {
     AutoSaveStateMiddleware,
     BotFrameworkAdapter,

diff --git a/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/src/sampleSkill.ts b/solutions/Virtual-Assistant/src/typescript/skills/sampleSkill/src/sampleSkill.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License
 
-import { ResponseManager, SkillConfigurationBase } from 'bot-solution';
+import { ResponseManager, SkillConfigurationBase } from 'botbuilder-solutions';
 import { BotTelemetryClient, ConversationState, UserState } from 'botbuilder';
 import { TurnContext } from 'botbuilder-core';
 import { DialogSet } from 'botbuilder-dialogs';