Skip to content

Commit 97d61a3

Browse files
committed
Merge branch 'main' of https://github.com/microsoftdocs/azure-docs-pr into ade-misc
2 parents 43bab1c + b0fd88f commit 97d61a3

File tree

34 files changed

+482
-159
lines changed

34 files changed

+482
-159
lines changed

articles/app-service/app-service-web-nodejs-best-practices-and-troubleshoot-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,4 @@ Follow these links to learn more about Node.js applications on Azure App Service
272272
* [Using Node.js Modules with Azure applications](/training/modules/create-nodejs-project-dependencies/)
273273
* [Azure App Service Web Apps: Node.js](/archive/blogs/silverlining/windows-azure-websites-node-js)
274274
* [Node.js Developer Center](../nodejs-use-node-modules-azure-apps.md)
275-
* [Exploring the Super Secret Kudu Debug Console](https://azure.microsoft.com/documentation/videos/super-secret-kudu-debug-console-for-azure-web-sites/)
275+
* [Exploring the Super Secret Kudu Debug Console](https://www.youtube.com/watch?v=-VjqyvA2XjM)

articles/app-service/environment/how-to-upgrade-preference.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Configure the upgrade preference for the Azure App Service Environm
44
author: madsd
55
ms.topic: tutorial
66
ms.custom: devx-track-azurecli
7-
ms.date: 06/25/2024
7+
ms.date: 11/05/2024
88
zone_pivot_groups: app-service-cli-portal
99
---
1010

@@ -34,10 +34,14 @@ In smaller regions, Early and Late upgrade preferences might be very close to ea
3434

3535
Manual upgrade preference gives you the option to receive a notification when an upgrade is available. The availability is also visible in the Azure portal. After the upgrade is available, you'll have 15 days to start the upgrade process. If you don't start the upgrade within the 15 days, the upgrade is processed with the remaining automatic upgrades in the region.
3636

37+
> [!IMPORTANT]
38+
> In rare cases, you might see an upgrade is available in the **Configuration** page for your App Service Environment, but you don't receive a **Service Health** notification (if you [configure notifications](#configure-notifications)). If you don't receive a Service Health notification, this available upgrade isn't required and the 15-day time limit doesn't apply. This is a known bug that we are working to fix.
39+
>
40+
3741
Upgrades normally don't affect the availability of your apps. The upgrade adds extra instances to ensure that the same capacity is available during upgrade. Patched and restarted instances are added back in rotation, and when you have workloads sensitive to restarts you should plan to start the maintenance during non-business hours. The full upgrade process normally finishes within 18 hours, but could take longer. Once the upgrade is started the upgrade runs until it's complete and isn't paused during standard business hours.
3842

3943
> [!NOTE]
40-
> In rare cases the upgrade availability might be impacted by a security hotfix superseding the planned upgrade, or a regression found in the planned upgrade before it has been applied to your instance. In these rare cases, the available upgrade will be removed and will transition to automatic upgrade.
44+
> In rare cases, the upgrade availability might be impacted by a security hotfix superseding the planned upgrade, or a regression found in the planned upgrade before it has been applied to your instance. In these rare cases, the available upgrade will be removed and will transition to automatic upgrade.
4145
>
4246
4347
## Configure notifications

articles/app-service/overview-authentication-authorization.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,7 @@ When a request fulfills all these conditions, App Service authentication automat
172172

173173
When using Azure App Service with authentication behind Azure Front Door or other reverse proxies, a few additional things have to be taken into consideration.
174174

175-
- Disable caching for the authentication workflow.
176-
177-
See [Disable cache for auth workflow](../static-web-apps/front-door-manual.md#disable-cache-for-auth-workflow) to learn more on how to configure rules in Azure Front Door to disable caching for authentication and authorization-related pages.
175+
- Disable [Front Door caching](../frontdoor/front-door-caching.md) for the authentication workflow.
178176

179177
- Use the Front Door endpoint for redirects.
180178

articles/application-gateway/ssl-certificate-management.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ There are two primary scenarios when deleting a certificate from portal:
6666
| Port | The port associated with the listener gets updated to reflect the new state. |
6767
| Frontend IP | The frontend IP of the gateway gets updated to reflect the new state. |
6868

69+
### Deletion of a listener with an SSL certificate
70+
71+
When a listener with an associated SSL certificate is deleted, the SSL certificate itself is not deleted. The certificate will remain in the application gateway configuration and can be assigned to another listener.
72+
73+
### Deletion of a key vault certificate
74+
75+
When deleting a certificate from key vault that is associated to an application gateway, the certificate must be deleted first on application gateway, then on key vault.
76+
6977
### Bulk update
7078
The bulk operation feature is helpful for large gateways having multiple SSL certificates for separate listeners. Similar to individual certificate management, this option also allows you to change the type from "Uploaded" to "Key Vault" or vice-versa (if required). This utility is also helpful in recovering a gateway when facing misconfigurations for multiple certificate objects simultaneously.
7179

@@ -84,7 +92,9 @@ To use the Bulk update option,
8492
1. You can't delete a certificate object if its associated listener is a redirection target for another listener. Any attempt to do so will return the following error. You can either remove the redirection or delete the dependent listener first to resolve this problem.
8593
`The listener associated with this certificate is configured as the redirection target for another listener. You will need to either remove this redirection or delete the redirected listener first to allow deletion of this certificate.`
8694

87-
1. The Application Gateway requires at least one active Listener and Rule combination. You thus cannot delete the certificate of a HTTPS listener, if no other active listener exists. This is also true if there are only HTTPS listeners on your gateway, and all of them are referencing the same certificate. Such operations are prevented because deletion of a certificate leads to deletion of all dependent sub resources.
95+
1. The Application Gateway requires at least one active Listener and Rule combination. You thus cannot delete the certificate of an HTTPS listener, if no other active listener exists. This is also true if there are only HTTPS listeners on your gateway, and all of them are referencing the same certificate. Such operations are prevented because deletion of a certificate leads to deletion of all dependent sub resources.
96+
97+
1. If a certificate is deleted in key vault but the reference to the certificate in Application Gateway is not deleted, any update to the Application Gateway will cause it to appear in a failed state. To fix this, you must delete all the certificates without an associated listener one by one.
8898

8999

90100
## Next steps

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,12 @@ Before starting your move operation, review the [checklist](./move-resource-grou
806806
> [!div class="mx-tableFixed"]
807807
> | Resource type | Resource group | Subscription | Region move |
808808
> | ------------- | ----------- | ---------- | ----------- |
809-
> | databaseaccounts | **Yes** | No | No |
809+
> | databaseaccounts | **Yes** | Partial | No |
810+
811+
Moves between subscriptions are supported for APIs that use the RU architecture (Microsoft.DocumentDB/databaseAccounts), but not for those based on the vCore architecture, such as:
812+
813+
- MongoDB vCore (Microsoft.DocumentDB/mongoClusters)
814+
- Azure Managed Instance for Apache Cassandra (Microsoft.DocumentDB/cassandraClusters)
810815

811816
## Microsoft.DomainRegistration
812817

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Add calling and chat functionality
33
titleSuffix: An Azure Communication Services how-to guide
4-
description: Add calling and chat functionality using the Azure Communication Services UI Library.
4+
description: Add calling and chat functionality by using the Azure Communication Services UI Library.
55
author: pavelprystinka
66

77
ms.author: pprystinka
@@ -12,12 +12,12 @@ ms.date: 10/28/2024
1212
ms.custom: template-how-to
1313
zone_pivot_groups: acs-plat-ios-android
1414

15-
#Customer intent: As a developer, I want to add calling and chat functionality to my App.
15+
#Customer intent: As a developer, I want to add calling and chat functionality to my app.
1616
---
1717

18-
# Integrate Calling and Chat UI Libraries
18+
# Integrate calling and chat by using the UI Library
1919

20-
## Set up the feature
20+
In this article, you learn how to integrate calling and chat functionality in your Android or iOS app by using the Azure Communication Services UI Library.
2121

2222
::: zone pivot="platform-android"
2323
[!INCLUDE [Integrate Calling with Chat in the Android UI Library](./includes/get-started-calling-with-chat/android.md)]
@@ -27,20 +27,18 @@ zone_pivot_groups: acs-plat-ios-android
2727
[!INCLUDE [Integrate Calling with Chat in the iOS UI Library](./includes/get-started-calling-with-chat/ios.md)]
2828
::: zone-end
2929

30-
3130
## Run the code
3231

33-
To build and run your app on the device.
32+
Run the code to build and run your app on the device.
3433

3534
### More features
3635

37-
The list of [use cases](../../concepts/ui-library/ui-library-use-cases.md?branch=main&pivots=platform-mobile) has detailed information about more features.
36+
The [list of use cases](../../concepts/ui-library/ui-library-use-cases.md?branch=main&pivots=platform-mobile) has detailed information about more features.
3837

3938
## Add notifications to your mobile app
4039

4140
Azure Communication Services integrates with [Azure Event Grid](../../../event-grid/overview.md) and [Azure Notification Hubs](../../../notification-hubs/notification-hubs-push-notification-overview.md), so you can [add push notifications](../../concepts/notifications.md) to your apps in Azure. You can use push notifications to send information from your application to users' mobile devices. A push notification can show a dialog, play a sound, or display an incoming call UI.
4241

43-
44-
## Next steps
42+
## Related content
4543

4644
- [Learn more about the UI Library](../../concepts/ui-library/ui-library-overview.md)

articles/communication-services/quickstarts/ui-library/includes/get-started-calling-with-chat/android.md

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,37 @@ ms.service: azure-communication-services
1313
- A deployed [Azure Communication Services resource](../../../create-communication-resource.md).
1414
- An Azure Communication Services [access token](../../../identity/quick-create-identity.md).
1515

16-
## A complete sample
16+
## Get a complete sample
1717

18-
You can get a [complete sample project](https://github.com/Azure-Samples/communication-services-calling-ui-with-chat-android) from the GitHub.
18+
You can get a [complete sample project](https://github.com/Azure-Samples/communication-services-calling-ui-with-chat-android) from GitHub.
1919

20-
:::image type="content" source="../../media/call-chat-android-experience.gif" alt-text="animation to showcase the experience on Android using call and chat in the same app.":::
20+
:::image type="content" source="../../media/call-chat-android-experience.gif" alt-text="Animation to showcase the experience on Android using call and chat in the same app.":::
2121

2222
## Set up the project
2323

24-
Complete the following sections to set up the quickstart project.
25-
26-
### Create a new Android project
27-
2824
In Android Studio, create a new project:
2925

30-
1. In the **File** menu, select **New** > **New Project**.
26+
1. On the **File** menu, select **New** > **New Project**.
3127

3228
1. In **New Project**, select the **Empty Activity** project template.
3329

3430
:::image type="content" source="../../media/composite-android-new-project.png" alt-text="Screenshot that shows the New Project dialog in Android Studio with Empty Activity selected.":::
3531

3632
1. Select **Next**.
3733

38-
1. In **Empty Activity**, name the project **UILibraryQuickStart**. For language, select **Java/Kotlin**. For the minimum SDK, select **API 26: Android 8.0 (Oreo)** or later.
34+
1. In **Empty Activity**, name the project **UILibraryQuickStart**. For language, select **Java** or **Kotlin**. For the minimum SDK, select **API 26: Android 8.0 (Oreo)** or later.
3935

4036
1. Select **Finish**.
4137

42-
:::image type="content" source="../../media/composite-android-new-project-finish.png" alt-text="Screenshot that shows new project options and the Finish button selected.":::
38+
:::image type="content" source="../../media/composite-android-new-project-finish.png" alt-text="Screenshot that shows new project options and the Finish button.":::
4339

4440
## Install the packages
4541

4642
Complete the following sections to install the required application packages.
4743

4844
### Add a dependency
4945

50-
In your app-level *UILibraryQuickStart/app/build.gradle* file (in the app folder), add the following dependency:
46+
In your app-level *UILibraryQuickStart/app/build.gradle* file, add the following dependency:
5147

5248
```groovy
5349
dependencies {
@@ -57,7 +53,8 @@ dependencies {
5753
...
5854
}
5955
```
60-
Add META-INF exclusion to the *UILibraryQuickStart/app/build.gradle* `android` section
56+
57+
Add a `META-INF` exclusion to the *UILibraryQuickStart/app/build.gradle* `android` section:
6158

6259
```groovy
6360
packaging {
@@ -67,9 +64,9 @@ packaging {
6764

6865
### Add Maven repositories
6966

70-
Two Maven repositories are required to integrate the library:
67+
You need two Maven repositories to integrate the library:
7168

72-
- MavenCentral
69+
- The `mavenCentral` repository
7370
- The Azure package repository
7471

7572
```groovy
@@ -83,15 +80,13 @@ Two Maven repositories are required to integrate the library:
8380
}
8481
```
8582
83+
## Connect to the Teams meeting with calling and chat
8684
87-
## Connect to the Teams Meeting with Calling and Chat
85+
You use `CallComposite` to connect to the call. After a user is admitted to the call, `CallComposite` notifies you by changing the status to `connected`. Then the user can be connected to the chat thread.
8886
89-
- First we will use CallComposite to connect to the call
90-
- Once user is admitted to the call, CallComposite will notify us by changing status to `connected`
91-
- Then user can be connected to the chat thread
92-
- When user clicks `Chat button`, a custom button added to the CallComposite, CallComposite will be minimized and Chat is displayed
87+
When the user selects the **Chat** button, a custom button is added to `CallComposite`. `CallComposite` is minimized, and **Chat** appears in Teams.
9388
94-
## Add button and chat container view to Activity_main.xml
89+
## Add a button and chat container view to Activity_main.xml
9590
9691
In the *app/src/main/res/layout/activity_main.xml* layout file, add the following code to create a button to start the composite:
9792
@@ -134,27 +129,27 @@ In the *app/src/main/res/layout/activity_main.xml* layout file, add the followin
134129
</androidx.constraintlayout.widget.ConstraintLayout>
135130
```
136131

137-
## Download a Chat Icon
132+
## Download a Chat icon
138133

139-
- Download an icon from [here](https://github.com/microsoft/fluentui-system-icons/blob/master/android/library/src/main/res/drawable/ic_fluent_chat_24_regular.xml).
140-
- Save it to the *UILibraryQuickStart/app/src/main/res/drawable*
141-
- Open it and change `android:fillColor` to the `@color/white`
134+
1. Download an icon from the [GitHub repository](https://github.com/microsoft/fluentui-system-icons/blob/master/android/library/src/main/res/drawable/ic_fluent_chat_24_regular.xml).
135+
1. Save the icon to *UILibraryQuickStart/app/src/main/res/drawable*.
136+
1. Open the icon and change `android:fillColor` to `@color/white`.
142137

143-
## Initialize the composites
138+
## Initialize the composite
144139

145-
To initialize the Call composite:
140+
To initialize the call composite, go to `MainActivity` and update connection settings:
146141

147-
- Go to `MainActivity` and update connection settings:
148-
- Replace `TEAM_MEETING_LINK` with the Teams meeting link.
149-
- Replace `ACS_ENDPOINT` with your ACS resource's endpoint.
150-
- Replace `DISPLAY_NAME` with your name.
151-
- Replace `USER_ID` with ACS user ID.
152-
- Replace `USER_ACCESS_TOKEN` with your token.
142+
- Replace `TEAM_MEETING_LINK` with the Teams meeting link.
143+
- Replace `ACS_ENDPOINT` with your Azure Communication Services resource's endpoint.
144+
- Replace `DISPLAY_NAME` with your name.
145+
- Replace `USER_ID` with your Azure Communication Services user ID.
146+
- Replace `USER_ACCESS_TOKEN` with your token.
153147

154-
### Get a Teams meeting chat thread for a Communication Services user
155-
The Teams meeting details can be retrieved using Graph APIs, detailed in [Graph documentation]()(/graph/api/onlinemeeting-createorget). The Communication Services Calling SDK accepts a full Teams meeting link or a meeting ID. They're returned as part of the `onlineMeeting` resource, accessible under the [joinWebUrl](/graph/api/resources/onlineMeeting) property
148+
### Get a Teams meeting chat thread for an Azure Communication Services user
156149

157-
With the Graph APIs, you can also obtain the threadID. The response has a chatInfo object that contains the threadID.
150+
You can retrieve Teams meeting details by using Graph APIs, as described in the [Graph documentation](/graph/api/onlinemeeting-createorget). The Azure Communication Services Calling SDK accepts a full Teams meeting link or a meeting ID. They're returned as part of the `onlineMeeting` resource, which is accessible under the [joinWebUrl](/graph/api/resources/onlineMeeting) property.
151+
152+
With the Graph APIs, you can also obtain the `threadID` value. The response has a `chatInfo` object that contains the `threadID` value.
158153

159154
#### [Kotlin](#tab/kotlin)
160155

@@ -234,8 +229,8 @@ class MainActivity : AppCompatActivity() {
234229
.build()
235230

236231
callComposite.addOnCallStateChangedEventHandler { callState ->
237-
// When user is admitted to the the Teams meeting, call state becoms connected.
238-
// Only users admitted to the meeting, can connect the meeting's chat thread.
232+
// When a user is admitted to the Teams meeting, the call state becomes connected.
233+
// Only users admitted to the meeting can connect to the meeting's chat thread.
239234
if (callState.code == CallCompositeCallStateCode.CONNECTED) {
240235
connectChat()
241236
}
@@ -367,8 +362,8 @@ public class MainActivity extends AppCompatActivity {
367362
.build();
368363

369364
callComposite.addOnCallStateChangedEventHandler(callState -> {
370-
// When user is admitted to the the Teams meeting, call state becoms connected.
371-
// Only users admitted to the meeting, can connect the meeting's chat thread.
365+
// When a user is admitted to the Teams meeting, the call state becomes connected.
366+
// Only users admitted to the meeting can connect to the meeting's chat thread.
372367
if (callState.getCode() == CallCompositeCallStateCode.CONNECTED) {
373368
connectChat();
374369
}
@@ -419,4 +414,3 @@ public class MainActivity extends AppCompatActivity {
419414
}
420415
}
421416
```
422-

0 commit comments

Comments
 (0)