Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Updated release version on about page #1788

Merged
cwhitten merged 5 commits into from
Dec 18, 2019
Merged

fix: Updated release version on about page #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b122341
Added COMPOSER_VERSION to env variables
tdurnford Dec 18, 2019
793774c
Updated SDK_PACKAGE_VERSION
tdurnford Dec 18, 2019
3a0b5a9
Updated about page styles
tdurnford Dec 18, 2019
5d8ff4e
Merge branch 'master' into 1773
tdurnford Dec 18, 2019
22f81b3
Merge branch 'master' into 1773
cwhitten Dec 18, 2019
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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