Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Updated release version on about page #1788

Merged
merged 5 commits into from
Dec 18, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.6.0-preview2', // TODO: change this when Composer supports custom schema/custom runtime
tdurnford marked this conversation as resolved.
Show resolved Hide resolved
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