Skip to content

Commit caeddd1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-policy
2 parents ecf2b09 + 49b9b4c commit caeddd1

File tree

553 files changed

+8817
-6112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

553 files changed

+8817
-6112
lines changed

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@
8080
"redirect_url": "/azure/aks/azure-csi-files-storage-provision",
8181
"redirect_document_id": false
8282
},
83+
{
84+
"source_path_from_root": "/articles/aks/learn/tutorial-kubernetes-workload-identity.md",
85+
"redirect_url": "/azure/aks/workload-identity-deploy-cluster",
86+
"redirect_document_id": false
87+
},
8388
{
8489
"source_path_from_root": "/articles/aks/workload-identity-migration-sidecar.md",
8590
"redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",
@@ -451,11 +456,6 @@
451456
"redirect_url": "/azure/aks/create-node-pools",
452457
"redirect_document_id": false
453458
},
454-
{
455-
"source_path_from_root": "/articles/copilot/limited-access.md",
456-
"redirect_url": "/azure/copilot/manage-access",
457-
"redirect_document_id": false
458-
},
459459
{
460460
"source_path_from_root": "/articles/aks/command-invoke.md",
461461
"redirect_url": "/azure/aks/access-private-cluster",

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,6 +1920,11 @@
19201920
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
19211921
"redirect_document_id": false
19221922
},
1923+
{
1924+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/deploy-marketplace-app-quickstart.md",
1925+
"redirect_url": "/azure/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart",
1926+
"redirect_document_id": false
1927+
},
19231928
{
19241929
"source_path_from_root": "/articles/resource-manager-policy.md",
19251930
"redirect_url": "/azure/governance/policy/overview",

.openpublishing.redirection.container-registry.json

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,55 @@
11
{
22
"redirections": [
3+
4+
{
5+
"source_path_from_root": "/articles/container-registry/container-registry-oci-artifacts.md",
6+
"redirect_url": "/azure/container-registry/container-registry-manage-artifact",
7+
"redirect_document_id": false
8+
},
9+
{
10+
"source_path_from_root": "/articles/container-registry/container-registry-oras-artifacts.md",
11+
"redirect_url": "/azure/container-registry/container-registry-manage-artifact",
12+
"redirect_document_id": false
13+
},
314
{
415
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth.md",
5-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth",
16+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
617
"redirect_document_id": false
718
},
19+
820
{
921
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth-cli.md",
10-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth-cli",
22+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
1123
"redirect_document_id": false
1224
},
1325
{
1426
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache.md",
15-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache",
27+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
1628
"redirect_document_id": false
1729
},
1830
{
1931
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-cli.md",
20-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-cli",
32+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
33+
"redirect_document_id": false
34+
},
35+
{
36+
"source_path_from_root": "/articles/container-registry/tutorial-artifact-cache.md",
37+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
2138
"redirect_document_id": false
2239
},
2340
{
2441
"source_path_from_root": "/articles/container-registry/tutorial-registry-cache.md",
25-
"redirect_url": "/azure/container-registry/tutorial-artifact-cache",
42+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
2643
"redirect_document_id": false
2744
},
2845
{
2946
"source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-registry-cache.md",
30-
"redirect_url": "/azure/container-registry/tutorial-troubleshoot-artifact-cache",
47+
"redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
48+
"redirect_document_id": false
49+
},
50+
{
51+
"source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-artifact-cache.md",
52+
"redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
3153
"redirect_document_id": false
3254
},
3355
{
@@ -60,6 +82,31 @@
6082
"redirect_url": "/azure/container-registry/troubleshoot-artifact-streaming",
6183
"redirect_document_id": false
6284
},
85+
{
86+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache.md",
87+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
88+
"redirect_document_id": false
89+
},
90+
{
91+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache-cli.md",
92+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
93+
"redirect_document_id": false
94+
},
95+
{
96+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth.md",
97+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
98+
"redirect_document_id": false
99+
},
100+
{
101+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth-cli.md",
102+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
103+
"redirect_document_id": false
104+
},
105+
{
106+
"source_path": "articles/container-registry/tutorial-artifact-cache-troubleshoot.md",
107+
"redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
108+
"redirect_document_id": false
109+
},
63110
{
64111
"source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
65112
"redirect_url": "/azure/container-registry/monitor-service"

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4063,6 +4063,16 @@
40634063
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql",
40644064
"redirect_document_id":false
40654065
},
4066+
{
4067+
"source_path_from_root": "/articles/copilot/limited-access.md",
4068+
"redirect_url": "/azure/copilot/manage-access",
4069+
"redirect_document_id": false
4070+
},
4071+
{
4072+
"source_path_from_root": "/articles/azure-portal/mobile-app/microsoft-copilot-for-azure.md",
4073+
"redirect_url": "/azure/azure-portal/mobile-app/microsoft-copilot-in-azure",
4074+
"redirect_document_id": false
4075+
},
40664076
{
40674077
"source_path_from_root":"/articles/migrate/how-to-assess.md",
40684078
"redirect_url":"/azure/migrate/whats-new#update-april-2024",

articles/ai-services/computer-vision/concept-face-recognition-data-structures.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ ms.author: pafarley
1919

2020
This article explains the data structures used in the Face service for face recognition operations. These data structures hold data on faces and persons.
2121

22-
You can try out the capabilities of face recognition quickly and easily using Vision Studio.
23-
> [!div class="nextstepaction"]
24-
> [Try Vision Studio](https://portal.vision.cognitive.azure.com/)
25-
2622
[!INCLUDE [Gate notice](./includes/identity-gate-notice.md)]
2723

2824
## Data structures used with Identify

articles/ai-services/computer-vision/concept-face-recognition.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ ms.author: pafarley
1919

2020
This article explains the concept of Face recognition, its related operations, and the underlying data structures. Broadly, face recognition is the process of verifying or identifying individuals by their faces. Face recognition is important in implementing the identification scenario, which enterprises and apps can use to verify that a (remote) user is who they claim to be.
2121

22-
You can try out the capabilities of face recognition quickly and easily using Vision Studio.
23-
> [!div class="nextstepaction"]
24-
> [Try Vision Studio](https://portal.vision.cognitive.azure.com/)
25-
2622

2723
## Face recognition operations
2824

articles/ai-services/computer-vision/how-to/identity-access-token.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ If the ISV learns that a client is using the LimitedAccessToken for non-approved
3333

3434
## Prerequisites
3535

36-
* [cURL](https://curl.haxx.se/) installed (or another tool that can make HTTP requests).
37-
* The ISV needs to have either an [Azure AI Face](https://ms.portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/Face) resource or an [Azure AI services multi-service](https://ms.portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/AllInOne) resource.
38-
* The client needs to have an [Azure AI Face](https://ms.portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/Face) resource.
36+
* [cURL](https://curl.se/) installed (or another tool that can make HTTP requests).
37+
* The ISV needs to have either an [Azure AI Face](https://portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/Face) resource or an [Azure AI services multi-service](https://portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/AllInOne) resource.
38+
* The client needs to have an [Azure AI Face](https://portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/Face) resource.
3939

4040
## Step 1: ISV obtains client's Face resource ID
4141

articles/ai-services/computer-vision/how-to/specify-detection-model.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The different face detection models are optimized for different tasks. See the f
4242
|---------|------------|-------------------|-------------|--|
4343
|**detection_01** | Default choice for all face detection operations. | Not optimized for small, side-view, or blurry faces. | Returns main face attributes (head pose, age, emotion, and so on) if they're specified in the detect call. | Returns face landmarks if they're specified in the detect call. |
4444
|**detection_02** | Released in May 2019 and available optionally in all face detection operations. | Improved accuracy on small, side-view, and blurry faces. | Does not return face attributes. | Does not return face landmarks. |
45-
|**detection_03** | Released in February 2021 and available optionally in all face detection operations. | Further improved accuracy, including on smaller faces (64x64 pixels) and rotated face orientations. | Returns mask and head pose attributes if they're specified in the detect call. | Returns face landmarks if they're specified in the detect call. |
45+
|**detection_03** | Released in February 2021 and available optionally in all face detection operations. | Further improved accuracy, including on smaller faces (64x64 pixels) and rotated face orientations. | Returns mask, blur, and head pose attributes if they're specified in the detect call. | Returns face landmarks if they're specified in the detect call. |
4646

4747

4848
The best way to compare the performances of the detection models is to use them on a sample dataset. We recommend calling the [Detect] API on a variety of images, especially images of many faces or of faces that are difficult to see, using each detection model. Pay attention to the number of faces that each model returns.
@@ -64,7 +64,7 @@ A request URL for the [Detect] REST API will look like this:
6464
If you are using the client library, you can assign the value for `detectionModel` by passing in an appropriate string. If you leave it unassigned, the API will use the default model version (`detection_01`). See the following code example for the .NET client library.
6565

6666
```csharp
67-
string imageUrl = "https://news.microsoft.com/ceo/assets/photos/06_web.jpg";
67+
string imageUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-sample-data-files/master/Face/images/detection1.jpg";
6868
var faces = await faceClient.Face.DetectWithUrlAsync(url: imageUrl, returnFaceId: false, returnFaceLandmarks: false, recognitionModel: "recognition_04", detectionModel: "detection_03");
6969
```
7070

@@ -81,7 +81,7 @@ await faceClient.PersonGroup.CreateAsync(personGroupId, "My Person Group Name",
8181

8282
string personId = (await faceClient.PersonGroupPerson.CreateAsync(personGroupId, "My Person Name")).PersonId;
8383

84-
string imageUrl = "https://news.microsoft.com/ceo/assets/photos/06_web.jpg";
84+
string imageUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-sample-data-files/master/Face/images/detection1.jpg";
8585
await client.PersonGroupPerson.AddFaceFromUrlAsync(personGroupId, personId, imageUrl, detectionModel: "detection_03");
8686
```
8787

@@ -97,7 +97,7 @@ You can also specify a detection model when you add a face to an existing **Face
9797
```csharp
9898
await faceClient.FaceList.CreateAsync(faceListId, "My face collection", recognitionModel: "recognition_04");
9999

100-
string imageUrl = "https://news.microsoft.com/ceo/assets/photos/06_web.jpg";
100+
string imageUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-sample-data-files/master/Face/images/detection1.jpg";
101101
await client.FaceList.AddFaceFromUrlAsync(faceListId, imageUrl, detectionModel: "detection_03");
102102
```
103103

articles/ai-services/computer-vision/how-to/use-large-scale.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ private static async Task TrainLargeFaceList(
9292
int timeIntervalInMilliseconds = 1000)
9393
{
9494
// Trigger a train call.
95-
await FaceClient.LargeTrainLargeFaceListAsync(largeFaceListId);
95+
await FaceClient.LargeFaceList.TrainAsync(largeFaceListId);
9696

9797
// Wait for training finish.
9898
while (true)
9999
{
100-
Task.Delay(timeIntervalInMilliseconds).Wait();
101-
var status = await faceClient.LargeFaceList.TrainAsync(largeFaceListId);
100+
await Task.Delay(timeIntervalInMilliseconds);
101+
var status = await faceClient.LargeFaceList.GetTrainingStatusAsyn(largeFaceListId);
102102

103103
if (status.Status == Status.Running)
104104
{
@@ -123,7 +123,7 @@ Previously, a typical use of **FaceList** with added faces and **FindSimilar** l
123123
const string FaceListId = "myfacelistid_001";
124124
const string FaceListName = "MyFaceListDisplayName";
125125
const string ImageDir = @"/path/to/FaceList/images";
126-
faceClient.FaceList.CreateAsync(FaceListId, FaceListName).Wait();
126+
await faceClient.FaceList.CreateAsync(FaceListId, FaceListName);
127127

128128
// Add Faces to the FaceList.
129129
Parallel.ForEach(
@@ -141,7 +141,7 @@ const string QueryImagePath = @"/path/to/query/image";
141141
var results = new List<SimilarPersistedFace[]>();
142142
using (Stream stream = File.OpenRead(QueryImagePath))
143143
{
144-
var faces = faceClient.Face.DetectWithStreamAsync(stream).Result;
144+
var faces = await faceClient.Face.DetectWithStreamAsync(stream);
145145
foreach (var face in faces)
146146
{
147147
results.Add(await faceClient.Face.FindSimilarAsync(face.FaceId, FaceListId, 20));
@@ -156,7 +156,7 @@ When migrating it to **LargeFaceList**, it becomes the following:
156156
const string LargeFaceListId = "mylargefacelistid_001";
157157
const string LargeFaceListName = "MyLargeFaceListDisplayName";
158158
const string ImageDir = @"/path/to/FaceList/images";
159-
faceClient.LargeFaceList.CreateAsync(LargeFaceListId, LargeFaceListName).Wait();
159+
await faceClient.LargeFaceList.CreateAsync(LargeFaceListId, LargeFaceListName);
160160

161161
// Add Faces to the LargeFaceList.
162162
Parallel.ForEach(
@@ -178,7 +178,7 @@ const string QueryImagePath = @"/path/to/query/image";
178178
var results = new List<SimilarPersistedFace[]>();
179179
using (Stream stream = File.OpenRead(QueryImagePath))
180180
{
181-
var faces = faceClient.Face.DetectWithStreamAsync(stream).Result;
181+
var faces = await faceClient.Face.DetectWithStreamAsync(stream);
182182
foreach (var face in faces)
183183
{
184184
results.Add(await faceClient.Face.FindSimilarAsync(face.FaceId, largeFaceListId: LargeFaceListId));

articles/ai-services/computer-vision/how-to/use-persondirectory.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var client = new HttpClient();
5656
// Request headers
5757
client.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", "{subscription key}");
5858

59-
var addPersonUri = "https:// {endpoint}/face/v1.0-preview/persons";
59+
var addPersonUri = "https://{endpoint}/face/v1.0-preview/persons";
6060

6161
HttpResponseMessage response;
6262

@@ -113,10 +113,7 @@ Stopwatch s = Stopwatch.StartNew();
113113
string status = "notstarted";
114114
do
115115
{
116-
if (status == "succeeded")
117-
{
118-
await Task.Delay(500);
119-
}
116+
await Task.Delay(500);
120117

121118
var operationResponseMessage = await client.GetAsync(operationLocation);
122119

0 commit comments

Comments
 (0)