Skip to content

Commit 4b51068

Browse files
authored
Merge 2.38.0 release branch to main (#2819)
* Prerelease 2.38.0 (#2814) * Prerelease 2.38.0 * Increase timeout for CDN E2E tests * changelog fixes
1 parent 812f4e3 commit 4b51068

10 files changed

+28
-32
lines changed

apps/teams-test-app/index_cdn.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<body>
1616
<noscript>You need to enable JavaScript to run this app.</noscript>
1717
<script
18-
src="https://res.cdn.office.net/teams-js/2.37.0/js/MicrosoftTeams.min.js"
19-
integrity="sha384-+OMQ/6mqZshXOsxUMXFX4gtF5cMsJTNH6ldUO3QThAsuQyv7R0ZpnpJmvrsPwzf4"
18+
src="https://res.cdn.office.net/teams-js/2.38.0/js/MicrosoftTeams.min.js"
19+
integrity="sha384-CSbYzgz9TIYoBSvbWOMnpXDQEcYTRLoQMPm/2pT3KHeLQnrZemnbTi/BUn1Gpa9c"
2020
crossorigin="anonymous"
2121
></script>
2222
<div id="root"></div>

apps/teams-test-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"author": "Microsoft Teams",
55
"description": "Teams Test App utilizing Teams JavaScript client SDK to test Hosts",
6-
"version": "2.37.0",
6+
"version": "2.38.0",
77
"scripts": {
88
"build": "pnpm build:bundle",
99
"build:bundle": "pnpm validate-test-schema && pnpm lint && webpack",

azure-pipelines.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ extends:
171171
versionBranch: 'v4'
172172

173173
- job: E2ETestCDN
174+
timeoutInMinutes: 120
174175
displayName: 'E2E Tests - CDN (only runs on release builds)'
175176
# This test only runs after deployment from a release branch and the new CDN version has been deployed
176177
# This check will run on the PR to merge the release branch back into main
@@ -221,6 +222,7 @@ extends:
221222
androidAppHostingSdkGitPath: AndroidAppHostingSdk
222223
shardNum: 2
223224
shardIndex: 0
225+
continueOnError: true
224226

225227
- job: E2ETestAndroidB
226228
displayName: 'E2E Tests - Android - Plan B'
@@ -234,6 +236,7 @@ extends:
234236
androidAppHostingSdkGitPath: AndroidAppHostingSdk
235237
shardNum: 2
236238
shardIndex: 1
239+
continueOnError: true
237240

238241
# Comment out all of iOS E2E tests in TJS side due to unknown E2E testing failures on CI
239242
# - job: E2ETestIOS

change/@microsoft-teams-js-06b44e75-5613-4594-a024-dfb68a5d7a05.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@microsoft-teams-js-3a3fbb36-90e2-4d00-bb1e-7633a46f3f8c.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@microsoft-teams-js-96be3430-7bd4-4a40-8554-4be120a97747.json

Lines changed: 0 additions & 7 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"type": "none",
3-
"comment": "Released 2.37.0.",
3+
"comment": "Updated package for 2.38.0 release",
44
"packageName": "@microsoft/teams-js",
5-
"email": "[email protected].com",
5+
"email": "jeklouda@microsoft.com",
66
"dependentChangeType": "none"
77
}

packages/teams-js/CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
# Change Log - @microsoft/teams-js
22

3-
This log was last generated on Fri, 02 May 2025 19:11:28 GMT and should not be manually modified.
3+
This log was last generated on Tue, 27 May 2025 21:09:59 GMT and should not be manually modified.
44

55
<!-- Start content -->
66

7+
## 2.38.0
8+
9+
Tue, 27 May 2025 21:09:59 GMT
10+
11+
### Minor changes
12+
13+
- Added `renderingSurface` property to `{app.Page.Context}` capability.
14+
- Bump eslint-plugin-recommend-no-namespaces to v0.1.0
15+
16+
### Patches
17+
18+
- Removed Beta tag from `nestedAppAuth.isNAAChannelRecommended` API.
19+
- Unblocked apps on Mobile to call `dialog.url.submit` from dialog by allowing this API from `FrameContext.content`. There is a bug in Teams mobile that returns `frameContext.content` in dialog instead of `frameContext.task`. Once the bug is fixed, this change will be reverted.
20+
721
## 2.37.0
822

923
Fri, 02 May 2025 19:11:28 GMT

packages/teams-js/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To install the stable [version](https://learn.microsoft.com/javascript/api/overv
2424

2525
### Production
2626

27-
You can reference these files directly [from here](https://res.cdn.office.net/teams-js/2.37.0/js/MicrosoftTeams.min.js) or point your package manager at them.
27+
You can reference these files directly [from here](https://res.cdn.office.net/teams-js/2.38.0/js/MicrosoftTeams.min.js) or point your package manager at them.
2828

2929
## Usage
3030

@@ -45,13 +45,13 @@ Reference the library inside of your `.html` page using:
4545
```html
4646
<!-- Microsoft Teams JavaScript API (via CDN) -->
4747
<script
48-
src="https://res.cdn.office.net/teams-js/2.37.0/js/MicrosoftTeams.min.js"
49-
integrity="sha384-+OMQ/6mqZshXOsxUMXFX4gtF5cMsJTNH6ldUO3QThAsuQyv7R0ZpnpJmvrsPwzf4"
48+
src="https://res.cdn.office.net/teams-js/2.38.0/js/MicrosoftTeams.min.js"
49+
integrity="sha384-CSbYzgz9TIYoBSvbWOMnpXDQEcYTRLoQMPm/2pT3KHeLQnrZemnbTi/BUn1Gpa9c"
5050
crossorigin="anonymous"
5151
></script>
5252

5353
<!-- Microsoft Teams JavaScript API (via npm) -->
54-
<script src="node_modules/@microsoft/teams-js@2.37.0/dist/MicrosoftTeams.min.js"></script>
54+
<script src="node_modules/@microsoft/teams-js@2.38.0/dist/MicrosoftTeams.min.js"></script>
5555

5656
<!-- Microsoft Teams JavaScript API (via local) -->
5757
<script src="MicrosoftTeams.min.js"></script>

packages/teams-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@microsoft/teams-js",
33
"author": "Microsoft Teams",
4-
"version": "2.37.0",
4+
"version": "2.38.0",
55
"description": "Microsoft Client SDK for building app for Microsoft hosts",
66
"repository": {
77
"directory": "packages/teams-js",

0 commit comments

Comments
 (0)