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

feat: Update JS SDK in Components repo to 4.14.1 + Bump Branch Version to 1.1.2 #1221

Merged
merged 5 commits into from
Jul 16, 2021
Merged

feat: Update JS SDK in Components repo to 4.14.1 + Bump Branch Version to 1.1.2 #1221

merged 5 commits into from
Jul 16, 2021

Conversation

thomas-chung
Copy link
Contributor

Purpose

Updating the branch's JS SDK version reference to 4.14.1 and then bump the branch version to 1.1.2 for all templates and packages.

Changes

Tests

Feature Plan

@github-actions github-actions bot added Area: Generators: Empty Relating to the Empty Bot Yeoman generator (@microsoft/generator-bot-empty). Area: Generators: Core Language Relating to the Core Bot with Language Yeoman generator (@microsoft/generator-bot-core-language). Area: Generators: Core QnA Relating to the Core Bot with QnA Maker Yeoman generator (@microsoft/generator-bot-core-qna). Area: Generators: Core Assistant Relating to the Core Assistant Bot Yeoman generator (@microsoft/generator-bot-core-assistant). Area: Generators: Enterprise Assistant Relating to the Enterprise Assistant Bot Yeoman generator (@microsoft/generator-bot-enterprise-as... Area: Generators: Enterprise Calendar Relating to the Enterprise Calendar Bot Yeoman generator (@microsoft/generator-bot-enterprise-cal... Area: Generators: Enterprise People Relating to the Enterprise People Bot Yeoman generator (@microsoft/generator-bot-enterprise-people). Area: Generators: Adaptive Relating to the Adaptive Bot Yeoman generator (@microsoft/generator-bot-adaptive). Area: Packages: Adaptive Cards Relating to the Adaptive Cards bot component package. Area: Packages: Graph Relating to the Graph bot component package. Area: Packages: Help & Cancel Relating to the Help & Cancel bot component package. Area: Packages: Teams Relating to the Teams bot component package. Area: Packages: Welcome Relating to the Welcome bot component package. labels Jul 16, 2021
@thomas-chung thomas-chung added this to the R14 milestone Jul 16, 2021
@thomas-chung thomas-chung merged commit 0df4c8b into 4.14 Jul 16, 2021
@pr-triage pr-triage bot added the PR: merged label Jul 16, 2021
@delete-merged-branch delete-merged-branch bot deleted the thchung/UpdateJsSdkTo4_14_1 branch July 16, 2021 17:53
thomas-chung added a commit that referenced this pull request Aug 17, 2021
@thomas-chung @ryanisgrig
@Stevenic @EricDahlvang @mdrichardson
chore: Merge 4.14.1 JS SDK to main (#1231)
0f8fee7 
* Bumping DotNet version

* Update js sdk to 4.14rc0 as well

* update tests

* Update JS tests

* Update JS test expectation

* chore: Cherry pick 1171 and 1164 into 4.14 (#1172)

* Add Teams package unit tests (#1171)

* fix: Stevenic/ac fix (#1164)

* Fixed typo in schema for UpdateActivity

* Forgot to copy activityId to outgoing activity in UpdateAdaptiveCard

Co-authored-by: Ryan Lengel Isgrig <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>

* feat: Update bot framework package deps (#1168)

* Update package.json on adaptive + empty

* Update more package depdendency

* Update template package.jsons

* Update yarn.lock

* Update old school csharp skills

* Update Teams, AdaptiveCards package and misc projs

* Update SendMessageToTeamsChannelAsync to work with CloudAdapter (#1170)

* chore: Cherry pick 1171 and 1164 into 4.14 (#1172)

* Add Teams package unit tests (#1171)

* fix: Stevenic/ac fix (#1164)

* Fixed typo in schema for UpdateActivity

* Forgot to copy activityId to outgoing activity in UpdateAdaptiveCard

Co-authored-by: Ryan Lengel Isgrig <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>

Co-authored-by: Thomas Chung <[email protected]>
Co-authored-by: Eric Dahlvang <[email protected]>
Co-authored-by: Ryan Lengel Isgrig <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>

> Looks good. Let's document all of the processes to upgrade versions for all types of components in the repo so that others can do the same.
> i.e.
> Generators
> 
> 1. generator-bot-adaptive/package.json - bump version
> 2. generator-bot-_/packagejson (the rest) - bump version and dependencies:@microsoft/generator-bot-_ versions
> 
> Csproj packages
> 
> 1. Bump version of Microsoft.Bot.Builder.* dependencies
> 
> Nuspec packages
> 
> 1. Bump version of Mocrosoft.Bot.Builder.* dependencies
>    Npm packages
> 2. Bump versions of botbuilder dependencies

Good idea. As we figure this out we should just write down the steps.

* fix: Send message to teams channel support both adapters (#1174)

* Enable SendMessageToTeamsChannel with either BotFrameworkAdapter or CloudAdapter

* Get appId from claims

* Throw if adapter is not a known type to support SendMessageToTeamsChannel

* feat: Update package versions (#1182)

* Update graph package version

* Update graph

* Update Teams package

* Update teams JS package

* Update adaptive cards

* HelpAndCancel

* Update helpandcancel + welcome dependencies

* Change to minor version update

* Update to correct JS preview platform.js

* Update generator package version (#1183)

* Update .NET SDK to 4.14 final (#1187)

* Allow previews to generate version as well (#1189)

Co-authored-by: Thomas Chung <[email protected]>

* fix: nuget package version override to allow "preview" ring (#1191)

* Fix nuget versioning steps

* Fix Teams test reference

* Fix Microsoft.Bot.Builder.Dialogs.Adaptive.Testing

Co-authored-by: Thomas Chung <[email protected]>

* feat: Use preview version for RC/preview releases (#1194)

* initial changes

* Update templates to use preview

Co-authored-by: Thomas Chung <[email protected]>

* chore: fix netcore install steps for various deployment stages (#1196)

* pull netcore install steps to build-test and package separately

* remove netcore step from signing as it is used in packaging

* feat: Update everything with JS to GA (#1195)

* Update everything to GA

* Update yarn lock

* Update yarn lock

* Update dependency package version

* Add missing dependency

Co-authored-by: Thomas Chung <[email protected]>

* chore: update deprecated nuget package licenseurl properties (#1197)

* Update directory.build.props LicenseUrl tags with PackageLicenseExpression referencing the MIT license

* replace nuspec licenseURl with license

* replace nuspec license with license type referencing MIT

* Update Directory.Build.props

Add NU5048 to NoWarn

* Update Directory.Build.props

* Update dummy test script in node packages with clearer message and to not "exit 1" (#1199)

* port: GetMeetingInfo, meeting start/end events [JS] (#1175)

* port: JS Teams Tests and CloudAdapter support (#1200)

* port: GetMeetingInfo, meeting start/end events [.NET] (#1178)

* chore: Moving branch to RC0 + bump C# SDK to 4.14.1 (#1205)

* chore: build workspace prior to testing (#1206)

* Empty out sdk schema and uischema to force regen (#1208)

Co-authored-by: Thomas Chung <[email protected]>

* fix: typo in OnMEBotMessagePreviewSend (#1212)

* Update packages and tempalte reference to 1.1.0 GA (#1213)

* fix: fully remove unnecessary onTeamsMEConfigurationSetting (#1215)

* Bump version to 1.1.1 and correct references (#1216)

* feat: Update JS SDK in Components repo to 4.14.1 + Bump Branch Version to 1.1.2 (#1221)

* Bump JS Version to 4.14.1

* Bump package versions

* Update template versions & referenced adaptive ver

* Update template ref to pkgs

* update yarn

Co-authored-by: Thomas Chung <[email protected]>

Co-authored-by: Thomas Chung <[email protected]>
Co-authored-by: Ryan Lengel Isgrig <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>
Co-authored-by: Eric Dahlvang <[email protected]>
Co-authored-by: Michael Richardson <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ryanisgrig ryanisgrig ryanisgrig approved these changes

@benbrown benbrown Awaiting requested review from benbrown

@lauren-mills lauren-mills Awaiting requested review from lauren-mills

Assignees

@thomas-chung thomas-chung

Labels
Area: Generators: Adaptive Relating to the Adaptive Bot Yeoman generator (@microsoft/generator-bot-adaptive). Area: Generators: Core Assistant Relating to the Core Assistant Bot Yeoman generator (@microsoft/generator-bot-core-assistant). Area: Generators: Core Language Relating to the Core Bot with Language Yeoman generator (@microsoft/generator-bot-core-language). Area: Generators: Core QnA Relating to the Core Bot with QnA Maker Yeoman generator (@microsoft/generator-bot-core-qna). Area: Generators: Empty Relating to the Empty Bot Yeoman generator (@microsoft/generator-bot-empty). Area: Generators: Enterprise Assistant Relating to the Enterprise Assistant Bot Yeoman generator (@microsoft/generator-bot-enterprise-as... Area: Generators: Enterprise Calendar Relating to the Enterprise Calendar Bot Yeoman generator (@microsoft/generator-bot-enterprise-cal... Area: Generators: Enterprise People Relating to the Enterprise People Bot Yeoman generator (@microsoft/generator-bot-enterprise-people). Area: Packages: Adaptive Cards Relating to the Adaptive Cards bot component package. Area: Packages: Graph Relating to the Graph bot component package. Area: Packages: Help & Cancel Relating to the Help & Cancel bot component package. Area: Packages: Teams Relating to the Teams bot component package. Area: Packages: Welcome Relating to the Welcome bot component package. PR: merged PR: partially-approved PR: unreviewed
Projects
None yet
Milestone
R14
Development

Successfully merging this pull request may close these issues.
2 participants
@thomas-chung @ryanisgrig