Skip to content

Commit d4a705c

Browse files
Merge pull request #42702 from dotnet/main
Merge main into live
2 parents 638cc93 + 56b7e1d commit d4a705c

File tree

159 files changed

+889
-855
lines changed

Some content is hidden

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

159 files changed

+889
-855
lines changed

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ on:
1010
- ".github/workflows/markdownlint.yml"
1111
- ".github/workflows/markdownlint-problem-matcher.json"
1212
pull_request:
13-
paths:
14-
- "**/*.md"
15-
- ".markdownlint-cli2.jsonc"
16-
- ".github/workflows/markdownlint.yml"
17-
- ".github/workflows/markdownlint-problem-matcher.json"
1813

1914
permissions:
2015
contents: read
@@ -35,4 +30,4 @@ jobs:
3530
- uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 # v16.0.0
3631
with:
3732
config: ".markdownlint-cli2.jsonc"
38-
globs: "**/*.md"
33+
globs: "**/*.md"

.repoman.yml

Lines changed: 51 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
revision: 4
2-
schema-version: 1
1+
revision: 6
2+
schema-version: 5
33
owner-ms-alias: adegeo
44

55
config:
@@ -10,7 +10,7 @@ config:
1010
ParserRegex: "^\\* (.*): (.*)$"
1111

1212
ContentUrlRegex:
13-
- "### Page URL\n\n(.*)"
13+
- "### Page URL\n\n(.*)"
1414

1515
issues:
1616

@@ -21,42 +21,52 @@ issues:
2121
# Temporary label to mark issues as updated for Quest. The label is instantly removed
2222
- check:
2323
- type: query
24-
value: "length(Issue.labels[?name == ':world_map: mapQUEST']) != `0`"
24+
value: "length(Issue.Labels[?Name == ':world_map: mapQUEST']) != `0`"
2525
pass:
2626
- labels-remove: [":world_map: mapQUEST"]
2727

2828
# Handle issues with /svc /subsvc labels from label bot
29-
# Manages the Not Triaged label for issues missing/having an org category issue
3029
- check:
3130
- type: query
32-
value: "length(Issue.labels[?contains(name, '/svc') || contains(name, '/subsvc')]) != `0`"
31+
value: "length(Issue.Labels[?contains(Name, '/svc') || contains(Name, '/subsvc')]) != `0`"
32+
33+
# If the issue has a /svc or /subsvc label, it must be categorized otherwise it's considered untriaged
3334
pass:
3435
- check:
3536
- type: query
36-
value: "length(Issue.labels[?name == ':pushpin: seQUESTered' || name == ':world_map: reQUEST' || name == 'training-module' || name == 'doc-enhancement' || name == 'product-question' || name == 'in-progress' || name == 'test-issue' || name == 'kudos' || name == 'loc' || name == 'doc-bug' || name == 'product-feedback' || name == 'code-of-conduct' || name == 'support-request' || name == 'duplicate' || name == 'resolved-by-customer' || name == 'docs-experience' || name == 'doc-provided' || name == 'doc-idea' || name == 'needs-more-info']) != `0`"
37+
value: "length(Issue.Labels[?Name == ':pushpin: seQUESTered' || Name == ':world_map: reQUEST' || Name == 'training-module' || Name == 'doc-enhancement' || Name == 'product-question' || Name == 'in-progress' || Name == 'test-issue' || Name == 'kudos' || Name == 'loc' || Name == 'doc-bug' || Name == 'product-feedback' || Name == 'code-of-conduct' || Name == 'support-request' || Name == 'duplicate' || Name == 'resolved-by-customer' || Name == 'docs-experience' || Name == 'doc-provided' || Name == 'doc-idea' || Name == 'needs-more-info']) != `0`"
3738
pass:
3839
- labels-remove: [":watch: Not Triaged"]
3940
fail:
4041
- labels-add: [":watch: Not Triaged"]
42+
43+
# Not an doc issue specifically
4144
fail:
45+
46+
# If the issue is open, then we'll allow some further processing on it. If it's closed, ignore it and let the user do what they want.
4247
- check:
4348
- type: query
44-
value: "length(Issue.labels[?name == ':pushpin: seQUESTered' || name == ':world_map: reQUEST' || name == 'training-module' || name == 'video-content']) != `0`"
49+
value: "Issue.State.StringValue == 'open'"
50+
4551
pass:
46-
- labels-remove: [":watch: Not Triaged"]
47-
fail:
48-
- labels-add: [":watch: Not Triaged"]
52+
- check:
53+
- type: query
54+
value: "length(Issue.Labels[?Name == ':pushpin: seQUESTered' || Name == ':world_map: reQUEST' || Name == 'training-module' || Name == 'video-content'] || Name == 'test-issue') != `0`"
55+
pass:
56+
- labels-remove: [":watch: Not Triaged"]
57+
fail:
58+
- labels-add: [":watch: Not Triaged"]
4959

5060
# Checks for binary/source incompatible checkboxes and adds a label
5161
- check:
5262
- type: query
53-
value: "contains(Issue.body, '- [x] **Binary incompatible**') == `true` || contains(Issue.body, '- [X] **Binary incompatible**') == `true`"
63+
value: "contains(InstanceData.IssuePrBody, '- [x] **Binary incompatible**') == `true` || contains(InstanceData.IssuePrBody, '- [X] **Binary incompatible**') == `true`"
5464
pass:
5565
- labels-add: ["binary incompatible"]
5666

5767
- check:
5868
- type: query
59-
value: "contains(Issue.body, '- [x] **Source incompatible**') == `true` || contains(Issue.body, '- [X] **Source incompatible**') == `true`"
69+
value: "contains(InstanceData.IssuePrBody, '- [x] **Source incompatible**') == `true` || contains(InstanceData.IssuePrBody, '- [X] **Source incompatible**') == `true`"
6070
pass:
6171
- labels-add: ["source incompatible"]
6272

@@ -67,7 +77,7 @@ issues:
6777
# Dependabot opened issue, label it
6878
- check:
6979
- type: query
70-
value: "Issue.user.login == 'dependabot'"
80+
value: "Issue.User.Login == 'dependabot'"
7181
pass:
7282
- labels-add: ["dependencies"]
7383

@@ -77,8 +87,17 @@ issues:
7787
value: "### Description[\\n\\r]+\\[Enter feedback here\\][\\n\\r]+###"
7888
pass:
7989
- labels-add: ["needs-more-info"]
90+
- labels-remove: [":watch: Not Triaged"]
8091
- close
8192

93+
# Add links to related issues if it's a doc issue
94+
- check:
95+
- type: metadata-exists
96+
- type: variable-exists
97+
name: "document_version_independent_id"
98+
pass:
99+
- link-related-issues
100+
82101
reopened:
83102

84103
# Remove won't fix label
@@ -92,9 +111,24 @@ issues:
92111
# Check if the issue was closed by the user who opened it
93112
- check:
94113
- type: query
95-
value: "Issue.user.id == Issue.closed_by.id"
114+
value: "Issue.User.Id == EventPayload.sender.id"
96115
pass:
97116
- labels-add: ["resolved-by-customer"]
117+
- labels-remove: [":watch: Not Triaged"]
118+
119+
projects_v2_item:
120+
121+
reordered:
122+
123+
- labels-add: [":world_map: mapQUEST"]
124+
125+
edited:
126+
127+
- check:
128+
- type: query
129+
value: "EventPayload.changes.field_value.field_name == 'Priority' || EventPayload.changes.field_value.field_name == 'Size'"
130+
pass:
131+
- labels-add: [":world_map: mapQUEST"]
98132

99133
pull_request:
100134

@@ -107,7 +141,7 @@ pull_request:
107141

108142
- check:
109143
- type: query
110-
value: "PullRequest.base.ref != 'live'"
144+
value: "PullRequest.Base.Ref != 'live'"
111145
pass:
112146
- files-changed:
113147
# csharplang
@@ -384,7 +418,7 @@ issue_comment:
384418
# someone creates a comment with #please-review in it, add changes-addressed label
385419
- check:
386420
- type: query
387-
value: "Issue.state == 'open' && Issue.user.id == Comment.user.id"
421+
value: "Issue.State.StringValue == 'open' && Issue.User.Id == Comment.User.Id"
388422
- type: comment-body
389423
value: ^#please-review$
390424
pass:

docs/architecture/microservices/docker-application-development-process/docker-app-development-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ services:
385385
- "5433:1433"
386386
```
387387
388-
[!INCLUDE [managed-identities](../../../framework/includes/managed-identities.md)]
388+
[!INCLUDE [managed-identities](../../../includes/managed-identities.md)]
389389
390390
This docker-compose.yml file is a simplified and merged version. It contains static configuration data for each container (like the name of the custom image), which is always required, and configuration information that might depend on the deployment environment, like the connection string. In later sections, you will learn how to split the docker-compose.yml configuration into multiple docker-compose files and override values depending on the environment and execution type (debug or release).
391391

docs/architecture/microservices/implement-resilient-applications/implement-resilient-entity-framework-core-sql-connections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ builder.Services.AddDbContext<CatalogContext>(options =>
2828
});
2929
```
3030

31-
[!INCLUDE [managed-identities](../../../framework/includes/managed-identities.md)]
31+
[!INCLUDE [managed-identities](../../../includes/managed-identities.md)]
3232

3333
## Execution strategies and explicit transactions using BeginTransaction and multiple DbContexts
3434

docs/architecture/microservices/implement-resilient-applications/monitor-app-health.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public class SqlConnectionHealthCheck : IHealthCheck
9797
}
9898
```
9999

100-
[!INCLUDE [managed-identities](../../../framework/includes/managed-identities.md)]
100+
[!INCLUDE [managed-identities](../../../includes/managed-identities.md)]
101101

102102
Note that in the previous code, `Select 1` is the query used to check the Health of the database. To monitor the availability of your microservices, orchestrators like Kubernetes periodically perform health checks by sending requests to test the microservices. It's important to keep your database queries efficient so that these operations are quick and don’t result in a higher utilization of resources.
103103

docs/architecture/microservices/microservice-ddd-cqrs-patterns/nosql-database-persistence-infrastructure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ services:
275275
- ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
276276
```
277277
278-
[!INCLUDE [managed-identities](../../../framework/includes/managed-identities.md)]
278+
[!INCLUDE [managed-identities](../../../includes/managed-identities.md)]
279279
280280
The `ConnectionString` environment variable is resolved this way: If the `ESHOP_AZURE_COSMOSDB` global variable is defined in the `.env` file with the Azure Cosmos DB connection string, it will use it to access the Azure Cosmos DB database in the cloud. If it’s not defined, it will take the `mongodb://nosqldata` value and use the development MongoDB container.
281281

docs/architecture/microservices/multi-container-microservice-net-applications/data-driven-crud-microservice.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ builder.Services.AddDbContext<CatalogContext>(options =>
211211
});
212212
```
213213

214-
[!INCLUDE [managed-identities](../../../framework/includes/managed-identities.md)]
214+
[!INCLUDE [managed-identities](../../../includes/managed-identities.md)]
215215

216216
### Additional resources
217217

@@ -256,7 +256,7 @@ catalog-api:
256256
- "5101:80"
257257
```
258258
259-
[!INCLUDE [managed-identities](../../../framework/includes/managed-identities.md)]
259+
[!INCLUDE [managed-identities](../../../includes/managed-identities.md)]
260260
261261
The docker-compose.yml files at the solution level are not only more flexible than configuration files at the project or microservice level, but also more secure if you override the environment variables declared at the docker-compose files with values set from your deployment tools, like from Azure DevOps Services Docker deployment tasks.
262262

docs/architecture/microservices/multi-container-microservice-net-applications/test-aspnet-core-services-web-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ services:
185185
- "27017:27017"
186186
```
187187
188-
[!INCLUDE [managed-identities](../../../framework/includes/managed-identities.md)]
188+
[!INCLUDE [managed-identities](../../../includes/managed-identities.md)]
189189
190190
So, to run the functional/integration tests you must first run this command, from the solution test folder:
191191

docs/azure/includes/dotnet-all.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
| Maps Geolocation | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.Maps.Geolocation/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/Maps.Geolocation-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Geolocation_1.0.0-beta.2/sdk/maps/Azure.Maps.Geolocation/) |
6565
| Maps Render | NuGet [2.0.0-beta.1](https://www.nuget.org/packages/Azure.Maps.Rendering/2.0.0-beta.1) | [docs](/dotnet/api/overview/azure/Maps.Rendering-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [2.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Rendering_2.0.0-beta.1/sdk/maps/Azure.Maps.Rendering/) |
6666
| Maps Route | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Maps.Routing/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/Maps.Routing-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Routing_1.0.0-beta.3/sdk/maps/Azure.Maps.Routing/) |
67-
| Maps Search | NuGet [2.0.0-beta.2](https://www.nuget.org/packages/Azure.Maps.Search/2.0.0-beta.2) | [docs](/dotnet/api/overview/azure/Maps.Search-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [2.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Search_2.0.0-beta.2/sdk/maps/Azure.Maps.Search/) |
67+
| Maps Search | NuGet [2.0.0-beta.3](https://www.nuget.org/packages/Azure.Maps.Search/2.0.0-beta.3) | [docs](/dotnet/api/overview/azure/Maps.Search-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [2.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Search_2.0.0-beta.3/sdk/maps/Azure.Maps.Search/) |
6868
| Media Analytics Edge | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.Media.Analytics.Edge/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/Media.Analytics.Edge-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Media.Analytics.Edge_1.0.0-beta.1/sdk/mediaservices/Azure.Media.Analytics.Edge) |
6969
| Metrics Advisor | NuGet [1.1.0](https://www.nuget.org/packages/Azure.AI.MetricsAdvisor/1.1.0) | [docs](/dotnet/api/overview/azure/AI.MetricsAdvisor-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.MetricsAdvisor_1.1.0/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/) |
7070
| Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents | NuGet [1.0.1](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents/1.0.1) | [docs](/dotnet/api/overview/azure/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents_1.0.1/sdk/entra/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents/) |
@@ -74,7 +74,7 @@
7474
| Monitor Ingestion | NuGet [1.1.2](https://www.nuget.org/packages/Azure.Monitor.Ingestion/1.1.2) | [docs](/dotnet/api/overview/azure/Monitor.Ingestion-readme) | GitHub [1.1.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Monitor.Ingestion_1.1.2/sdk/monitor/Azure.Monitor.Ingestion/) |
7575
| Monitor Query | NuGet [1.5.0](https://www.nuget.org/packages/Azure.Monitor.Query/1.5.0) | [docs](/dotnet/api/overview/azure/Monitor.Query-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Monitor.Query_1.5.0/sdk/monitor/Azure.Monitor.Query/) |
7676
| OpenAI Assistants | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.AI.OpenAI.Assistants/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/AI.OpenAI.Assistants-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.OpenAI.Assistants_1.0.0-beta.4/sdk/openai/Azure.AI.OpenAI.Assistants/) |
77-
| OpenAI Inference | NuGet [2.0.0-beta.5](https://www.nuget.org/packages/Azure.AI.OpenAI/2.0.0-beta.5) | [docs](/dotnet/api/overview/azure/AI.OpenAI-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [2.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.OpenAI_2.0.0-beta.5/sdk/openai/Azure.AI.OpenAI/) |
77+
| OpenAI Inference | NuGet [2.0.0-beta.6](https://www.nuget.org/packages/Azure.AI.OpenAI/2.0.0-beta.6) | [docs](/dotnet/api/overview/azure/AI.OpenAI-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [2.0.0-beta.6](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.OpenAI_2.0.0-beta.6/sdk/openai/Azure.AI.OpenAI/) |
7878
| OpenTelemetry AspNetCore | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.AspNetCore/1.2.0)<br>NuGet [1.3.0-beta.1](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.AspNetCore/1.3.0-beta.1) | [docs](/dotnet/api/overview/azure/Monitor.OpenTelemetry.AspNetCore-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Monitor.OpenTelemetry.AspNetCore_1.2.0/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/)<br>GitHub [1.3.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Monitor.OpenTelemetry.AspNetCore_1.3.0-beta.1/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/) |
7979
| OpenTelemetry Exporter | NuGet [1.3.0](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.Exporter/1.3.0)<br>NuGet [1.4.0-beta.1](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.Exporter/1.4.0-beta.1) | [docs](/dotnet/api/overview/azure/Monitor.OpenTelemetry.Exporter-readme) | GitHub [1.3.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Monitor.OpenTelemetry.Exporter_1.3.0/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/)<br>GitHub [1.4.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Monitor.OpenTelemetry.Exporter_1.4.0-beta.1/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/) |
8080
| Personalizer | NuGet [2.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Personalizer/2.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Personalizer-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [2.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Personalizer_2.0.0-beta.2/sdk/personalizer/Azure.AI.Personalizer/) |
@@ -342,7 +342,7 @@
342342
| App Configuration Extension | NuGet [8.0.0-preview.3](https://www.nuget.org/packages/Microsoft.Azure.AppConfiguration.Functions.Worker/8.0.0-preview.3) | | |
343343
| App Configuration Provider | NuGet [8.0.0-preview.3](https://www.nuget.org/packages/Microsoft.Azure.AppConfiguration.AspNetCore/8.0.0-preview.3) | | |
344344
| Azure.Communication.Administration | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Communication.Administration/1.0.0-beta.3) | | |
345-
| Communication Calling Windows Client | NuGet [1.8.0](https://www.nuget.org/packages/Azure.Communication.Calling.WindowsClient/1.8.0)<br>NuGet [1.9.0-beta.1](https://www.nuget.org/packages/Azure.Communication.Calling.WindowsClient/1.9.0-beta.1) | | |
345+
| Communication Calling Windows Client | NuGet [1.9.0](https://www.nuget.org/packages/Azure.Communication.Calling.WindowsClient/1.9.0) | | |
346346
| DotNetty | NuGet [0.7.6](https://www.nuget.org/packages/DotNetty.Common/0.7.6) | | |
347347
| HTTP ASPNETCore Analyzers | NuGet [1.0.2](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore.Analyzers/1.0.2) | | |
348348
| Item Templates NetCore | NuGet [4.0.5022](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.ItemTemplates.NetCore/4.0.5022) | | |

0 commit comments

Comments
 (0)