Merge branch 'master' into cwhitten/show-unauthorized

README.md

@@ -1,10 +1,15 @@
-# ![Bot Framework Emulator](./docs/media/FrameWorkEmmulator-header.png)
+# ![Bot Framework Emulator](./docs/media/BotFrameworkEmulator_header.png)
 
-# Microsoft Bot Framework Emulator
+### [Click here to find out what's new for //build2019!](https://github.com/Microsoft/botframework/blob/master/whats-new.md#whats-new)
+
+# Bot Framework Emulator
 [![Build Status](https://travis-ci.org/Microsoft/BotFramework-Emulator.svg?branch=master)](https://travis-ci.org/Microsoft/BotFramework-Emulator) [![Coverage Status](https://coveralls.io/repos/github/Microsoft/BotFramework-Emulator/badge.svg?branch=master)](https://coveralls.io/github/Microsoft/BotFramework-Emulator?branch=master)
 
 The Bot Framework Emulator is a desktop application that allows bot developers to test and debug bots built using the [Bot Framework SDK](https://github.com/microsoft/botbuilder). You can use the Bot Framework Emulator to test bots running either locally on your machine or connect to bots running remotely through a tunnel.
 
+This repo is part the [Microsoft Bot Framework](https://github.com/microsoft/botframework) - a comprehensive framework for building enterprise-grade conversational AI experiences.
+
+
 ## Download
 
 * Download the Bot Framework V4 Emulator for your platform from the [GitHub releases](https://github.com/Microsoft/BotFramework-Emulator/releases/latest) page.
@@ -52,6 +57,4 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
 ## Reporting Security Issues
 Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) at [secure@microsoft.com](mailto:secure@microsoft.com). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the [MSRC PGP](https://technet.microsoft.com/en-us/security/dn606155) key, can be found in the [Security TechCenter](https://technet.microsoft.com/en-us/security/default).
 
-## License
-
 Copyright (c) Microsoft Corporation. All rights reserved.

packages/app/main/package.json

@@ -132,7 +132,7 @@
     "@bfemulator/sdk-shared": "^1.0.0",
     "applicationinsights": "^1.0.8",
     "base64url": "2.0.0",
-    "botframework-config": "4.0.0-preview1.3.4",
+    "botframework-config": "4.4.0",
     "botframework-schema": "^4.3.4",
     "chatdown": "^1.0.10",
     "chokidar": "^2.0.2",

packages/app/main/src/services/luisApiService.ts

@@ -91,6 +91,7 @@ export class LuisApi {
           type: luisModel.activeVersion === 'Dispatch' ? ServiceTypes.Dispatch : ServiceTypes.Luis,
           version: luisModel.activeVersion,
           region: luisModel.region,
+          getEndpoint: () => luisModel.region,
         };
       }
     ) as ILuisService[];

packages/app/main/src/services/qnaApiService.spec.ts

@@ -284,7 +284,7 @@ describe('The QnaApiService happy path', () => {
     expect(result.services).toEqual([
       {
         endpointKey: 'primary-endpoint-key-1',
-        hostname: 'https://localhost',
+        hostname: 'https://localhost/qnamaker',
         id: '1234',
         kbId: '1234',
         name: 'HIThere#1',
@@ -293,7 +293,7 @@ describe('The QnaApiService happy path', () => {
       },
       {
         endpointKey: 'primary-endpoint-key-2',
-        hostname: 'https://localhost',
+        hostname: 'https://localhost/qnamaker',
         id: '9876543',
         kbId: '9876543',
         name: 'HIThere#2',