From b122341e71f69f295d19af59ee19248e02a38f8f Mon Sep 17 00:00:00 2001 From: TJ Durnford Date: Wed, 18 Dec 2019 09:26:01 -0800 Subject: [PATCH 1/3] Added COMPOSER_VERSION to env variables --- Composer/packages/client/config/env.js | 3 ++- Composer/packages/client/src/pages/about/index.tsx | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Composer/packages/client/config/env.js b/Composer/packages/client/config/env.js index 6b8a48c3ad..87e3a6168e 100644 --- a/Composer/packages/client/config/env.js +++ b/Composer/packages/client/config/env.js @@ -89,7 +89,8 @@ function getClientEnvironment(publicUrl) { GIT_SHA: getGitSha() .toString() .replace('\n', ''), - SDK_PACKAGE_VERSON: '4.6.0-preview2', // TODO: change this when Composer supports custom schema/custom runtime + SDK_PACKAGE_VERSION: '4.6.0-preview2', // TODO: change this when Composer supports custom schema/custom runtime + COMPOSER_VERSION: 'Preview 2.0', } ); // Stringify all values so we can feed into Webpack DefinePlugin diff --git a/Composer/packages/client/src/pages/about/index.tsx b/Composer/packages/client/src/pages/about/index.tsx index be5a9be001..9904cd8b05 100644 --- a/Composer/packages/client/src/pages/about/index.tsx +++ b/Composer/packages/client/src/pages/about/index.tsx @@ -16,7 +16,7 @@ export const About: React.FC = () => {
{formatMessage(`About`)}
-
{formatMessage(`Release: Preview 1.0`)}
+
{formatMessage(`Release: `) + (process.env.COMPOSER_VERSION || 'Unknown')}

{formatMessage(`Bot Framework Composer is an integrated development environment (IDE) for building @@ -54,12 +54,12 @@ export const About: React.FC = () => {

{formatMessage(`SDK runtime packages`)}
- {process.env.SDK_PACKAGE_VERSON || 'Unknown'} + {process.env.SDK_PACKAGE_VERSION || 'Unknown'}
From 793774c8dee32576069f376819dd2df529fe2cb5 Mon Sep 17 00:00:00 2001 From: TJ Durnford Date: Wed, 18 Dec 2019 09:40:05 -0800 Subject: [PATCH 2/3] Updated SDK_PACKAGE_VERSION --- Composer/packages/client/config/env.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/config/env.js b/Composer/packages/client/config/env.js index 87e3a6168e..e2a23fd6c5 100644 --- a/Composer/packages/client/config/env.js +++ b/Composer/packages/client/config/env.js @@ -89,7 +89,7 @@ function getClientEnvironment(publicUrl) { GIT_SHA: getGitSha() .toString() .replace('\n', ''), - SDK_PACKAGE_VERSION: '4.6.0-preview2', // TODO: change this when Composer supports custom schema/custom runtime + SDK_PACKAGE_VERSION: '4.7.0-preview-191208-1', // TODO: change this when Composer supports custom schema/custom runtime COMPOSER_VERSION: 'Preview 2.0', } ); From 3a0b5a9089cc81f1a44f0639f0c4c5b36ed9cf50 Mon Sep 17 00:00:00 2001 From: TJ Durnford Date: Wed, 18 Dec 2019 09:55:43 -0800 Subject: [PATCH 3/3] Updated about page styles --- Composer/packages/client/src/pages/about/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/about/styles.js b/Composer/packages/client/src/pages/about/styles.js index 64ebcfdcd2..48880fd5e5 100644 --- a/Composer/packages/client/src/pages/about/styles.js +++ b/Composer/packages/client/src/pages/about/styles.js @@ -55,7 +55,7 @@ export const smallText = css` export const DiagnosticsInfoText = css` display: flex; justify-content: space-between; - width: 460px; + width: 550px; font-size: 24px; `;