Skip to content

Commit

Permalink
fix: Updated release version on about page (#1788)
Browse files Browse the repository at this point in the history
* Added COMPOSER_VERSION to env variables

* Updated SDK_PACKAGE_VERSION

* Updated about page styles
  • Loading branch information
tdurnford authored and cwhitten committed Dec 18, 2019
1 parent cec7215 commit 76a7f2e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Composer/packages/client/config/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0-preview-191208-1', // 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
Expand Down
6 changes: 3 additions & 3 deletions Composer/packages/client/src/pages/about/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const About: React.FC<RouteComponentProps> = () => {
<div css={about.content}>
<div css={about.title}> {formatMessage(`About`)} </div>
<div css={about.body}>
<div css={about.version}>{formatMessage(`Release: Preview 1.0`)}</div>
<div css={about.version}>{formatMessage(`Release: `) + (process.env.COMPOSER_VERSION || 'Unknown')}</div>
<div css={about.description}>
<p>
{formatMessage(`Bot Framework Composer is an integrated development environment (IDE) for building
Expand Down Expand Up @@ -54,12 +54,12 @@ export const About: React.FC<RouteComponentProps> = () => {
<div css={about.DiagnosticsInfoTextAlignLeft}>{formatMessage(`SDK runtime packages`)}</div>
<div css={about.DiagnosticsInfoTextAlignLeft}>
<Link
href={`https://botbuilder.myget.org/feed/botbuilder-v4-dotnet-daily/package/nuget/Microsoft.Bot.Builder.Dialogs.Adaptive/${process.env.SDK_PACKAGE_VERSON}`}
href={`https://botbuilder.myget.org/feed/botbuilder-v4-dotnet-daily/package/nuget/Microsoft.Bot.Builder.Dialogs.Adaptive/${process.env.SDK_PACKAGE_VERSION}`}
tabIndex={-1}
target={'_blank'}
style={{ marginLeft: '5px' }}
>
{process.env.SDK_PACKAGE_VERSON || 'Unknown'}
{process.env.SDK_PACKAGE_VERSION || 'Unknown'}
</Link>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/src/pages/about/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
`;

Expand Down

0 comments on commit 76a7f2e

Please sign in to comment.