Skip to content

Commit 45155f6

Browse files
authored
Merge pull request #278712 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 2ca19a5 + e71c098 commit 45155f6

File tree

6 files changed

+49
-28
lines changed

6 files changed

+49
-28
lines changed

articles/active-directory-b2c/identity-provider-wechat.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@ zone_pivot_groups: b2c-policy-type
2525
## Prerequisites
2626

2727
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
28+
* Get an approved Weixin Open Platform account at [https://kf.qq.com](https://kf.qq.com/faq/161220Brem2Q161220uUjERB.html).
29+
* Get an approved application on Weixin Open Platform.
2830

2931
## Create a WeChat application
3032

31-
To enable sign-in for users with a WeChat account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in [WeChat management center](https://open.weixin.qq.com/). If you don't already have a WeChat account, you can get information at [https://kf.qq.com](https://kf.qq.com/faq/161220Brem2Q161220uUjERB.html).
33+
To enable sign-in for users with a WeChat account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in [WeChat management center](https://open.weixin.qq.com/). If you don't already have a Weixin Open Platform account, you can get information at [https://kf.qq.com](https://kf.qq.com/faq/161220Brem2Q161220uUjERB.html). The Weixin Open Platform account and application must be approved to link WeChat as an identity provider to your user flow.
3234

3335
### Register a WeChat application
3436

3537
1. Sign in to [https://open.weixin.qq.com/](https://open.weixin.qq.com/) with your WeChat credentials.
3638
1. Select **管理中心** (management center).
3739
1. Follow the steps to register a new application.
38-
1. For the **授权回调域** (callback URL), enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name/your-tenant-name.onmicrosoft.com/oauth2/authresp`. Replace `your-tenant-name` with the name of your tenant, and `your-domain-name` with your custom domain.
39-
1. Copy the **APP ID** and **APP KEY**. You need both of them to configure the identity provider to your tenant.
40+
1. In the **Development information** section, set the "Authorization callback domain" to `your-tenant-name.b2clogin.com`.
41+
1. Ensure that the application status is "Approved".
42+
1. At the top of **Application details**, copy the **APP ID** and **APP KEY**. You need both of them to configure the identity provider to your tenant.
4043

4144
::: zone pivot="b2c-user-flow"
4245

@@ -51,12 +54,17 @@ To enable sign-in for users with a WeChat account in Azure Active Directory B2C
5154
1. For the **Client secret**, enter the APP KEY that you recorded.
5255
1. Select **Save**.
5356

57+
:::image type="content" source="media/identity-provider-azure-ad-b2c/wechat-client-configuration.png" alt-text="Screenshot that shows the Configure social identity provider window, with completed form fields for social identity provider name, WeChat client ID, and app secret." lightbox="media/identity-provider-azure-ad-b2c/wechat-client-configuration.png":::
58+
5459
## Add WeChat identity provider to a user flow
5560

5661
1. In your Azure AD B2C tenant, select **User flows**.
5762
1. Click the user flow that you want to add the WeChat identity provider.
5863
1. Under the **Social identity providers**, select **WeChat**.
5964
1. Select **Save**.
65+
66+
:::image type="content" source="media/identity-provider-azure-ad-b2c/link-wechat-identity-provider.png" alt-text="Screenshot showing WeChat as a selected identity provider in the Identity Providers section." lightbox="media/identity-provider-azure-ad-b2c/link-wechat-identity-provider.png":::
67+
6068
1. To test your policy, select **Run user flow**.
6169
1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
6270
1. Select the **Run user flow** button.
132 KB
Loading
43.1 KB
Loading

articles/ai-services/computer-vision/identity-quotas-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ This article contains a reference and a detailed description of the quotas and l
3535
| **Pricing tier** | **Limit value** |
3636
| --- | --- |
3737
|Free (F0)| 1 resource|
38-
| Standard (S0) | <ul><li>5 resources in UAE North, Brazil South, and Qatar.</li><li>10 resources in other regions.</li></ul> |
39-
| Enterprise (E0) | <ul><li>5 resources in UAE North, Brazil South, and Qatar.</li><li>15 resources in other regions.</li></ul> |
38+
| Standard (S0) | <ul><li>5 resources in UAE North, Brazil South, and Qatar Central.</li><li>10 resources in other regions.</li></ul> |
39+
| Enterprise (E0) | <ul><li>5 resources in UAE North, Brazil South, and Qatar Central.</li><li>10 resources in other regions.</li></ul> |
4040

4141

4242
### How to request an increase to the default limits

articles/azure-monitor/logs/tutorial-logs-ingestion-code.md

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,41 +87,54 @@ The following script uses the [Azure Monitor Ingestion client library for .NET](
8787
// Upload logs
8888
try
8989
{
90-
    Response response = client.Upload(ruleId, streamName, RequestContent.Create(data));
90+
var response = await client.UploadAsync(ruleId, streamName, RequestContent.Create(data)).ConfigureAwait(false);
91+
if (response.IsError)
92+
{
93+
throw new Exception(response.ToString());
94+
}
95+
96+
Console.WriteLine("Log upload completed using content upload");
9197
}
9298
catch (Exception ex)
9399
{
94-
    Console.WriteLine("Upload failed with Exception " + ex.Message);
100+
Console.WriteLine("Upload failed with Exception: " + ex.Message);
95101
}
96102
97103
// Logs can also be uploaded in a List
98-
var entries = new List<Object>();
104+
var entries = new List<object>();
99105
for (int i = 0; i < 10; i++)
100106
{
101-
    entries.Add(
102-
        new {
103-
            Time = recordingNow,
104-
            Computer = "Computer" + i.ToString(),
105-
            AdditionalContext = i
106-
        }
107-
    );
107+
entries.Add(
108+
new
109+
{
110+
Time = currentTime,
111+
Computer = "Computer" + i.ToString(),
112+
AdditionalContext = new
113+
{
114+
InstanceName = "user" + i.ToString(),
115+
TimeZone = "Central Time",
116+
Level = 3,
117+
CounterName = "AppMetric1" + i.ToString(),
118+
CounterValue = i
119+
}
120+
}
121+
);
108122
}
109123
110124
// Make the request
111-
LogsUploadOptions options = new LogsUploadOptions();
112-
bool isTriggered = false;
113-
options.UploadFailed += Options_UploadFailed;
114-
await client.UploadAsync(TestEnvironment.DCRImmutableId, TestEnvironment.StreamName, entries, options).ConfigureAwait(false);
125+
try
126+
{
127+
var response = await client.UploadAsync(ruleId, streamName, entries).ConfigureAwait(false);
128+
if (response.IsError)
129+
{
130+
throw new Exception(response.ToString());
131+
}
115132
116-
Task Options_UploadFailed(LogsUploadFailedEventArgs e)
133+
Console.WriteLine("Log upload completed using list of entries");
134+
}
135+
catch (Exception ex)
117136
{
118-
    isTriggered = true;
119-
    Console.WriteLine(e.Exception);
120-
    foreach (var log in e.FailedLogs)
121-
    {
122-
        Console.WriteLine(log);
123-
    }
124-
    return Task.CompletedTask;
137+
Console.WriteLine("Upload failed with Exception: " + ex.Message);
125138
}
126139
```
127140

articles/virtual-machines/create-portal-availability-zone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To use availability zones, create your virtual machines in a [supported Azure re
3434

3535
1. Complete the rest of the page as usual. If you want to create a load balancer, go to the **Networking** tab > **Load Balancing** > **Load balancing options**. You can choose either an Azure load balancer or an Application gateway.
3636

37-
For a **Azure load balancer**:
37+
For an **Azure load balancer**:
3838

3939
1. You can select an existing load balancer or select **Create a load balancer**.
4040
2. To create a new load balancer, for **Load balancer name** type a load balancer name.

0 commit comments

Comments
 (0)