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

chore: build workspace prior to testing #1206

Merged
mdrichardson merged 3 commits into from
Jul 9, 2021
Merged

chore: build workspace prior to testing #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdc1cc5
build workspace prior to testing
mdrichardson Jul 9, 2021
cf856a7
lint fix
mdrichardson Jul 9, 2021
5aa09c4
package updates
mdrichardson Jul 9, 2021
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
2 changes: 1 addition & 1 deletion packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.1" />
</ItemGroup>

</Project>
8 changes: 2 additions & 6 deletions packages/Teams/js/src/actions/getMeetingInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import {
} from 'botbuilder-dialogs';
import { getValue } from './actionHelpers';

export interface GetMeetingInfoConfiguration
extends DialogConfiguration {
export interface GetMeetingInfoConfiguration extends DialogConfiguration {
disabled?: boolean | string | BoolExpression;
property?: string | Expression | StringExpression;
meetingId?: string | Expression | StringExpression;
Expand Down Expand Up @@ -97,10 +96,7 @@ export class GetMeetingInfo

const meetingId = getValue(dc, this.meetingId);

const result = await TeamsInfo.getMeetingInfo(
dc.context,
meetingId
);
const result = await TeamsInfo.getMeetingInfo(dc.context, meetingId);

if (this.property != null) {
dc.state.setValue(this.property.getValue(dc.state), result);
Expand Down
2 changes: 1 addition & 1 deletion packages/Teams/js/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ import { AdaptiveTeamsBotComponent } from './adaptiveTeamsBotComponent';
export * from './actions';
export { AdaptiveTeamsBotComponent };
export * from './conditions';
export default AdaptiveTeamsBotComponent;
export default AdaptiveTeamsBotComponent;
4 changes: 2 additions & 2 deletions tests/unit/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.13.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/packages/Teams/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"name": "@microsoft/bot-components-teams-tests",
"private": true,
"scripts": {
"test": "mocha --require ts-node/register tests/*.test.ts",
"build:package": "yarn workspace @microsoft/bot-components-teams build",
"test": "yarn run build:package && mocha --require ts-node/register tests/*.test.ts",
"lint": "eslint . --ext .js,.ts --config ../../../../../packages/Teams/js/.eslintrc.json"
},
"dependencies": {
Expand Down