Skip to content

Commit 7bd5e96

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #46501 from dotnet/main
Merge main into live
2 parents d6df3bf + ddca34c commit 7bd5e96

36 files changed

+487
-470
lines changed

‎.openpublishing.redirection.csharp.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,10 @@
343343
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0260.md",
344344
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/partial-declarations"
345345
},
346+
{
347+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1112.md",
348+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
349+
},
346350
{
347351
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1683.md",
348352
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/assembly-references"
@@ -1818,14 +1822,50 @@
18181822
"source_path_from_root": "/docs/csharp/misc/cs1020.md",
18191823
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overload-resolution"
18201824
},
1825+
{
1826+
"source_path_from_root": "/docs/csharp/misc/cs1100.md",
1827+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1828+
},
1829+
{
1830+
"source_path_from_root": "/docs/csharp/misc/cs1101.md",
1831+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1832+
},
1833+
{
1834+
"source_path_from_root": "/docs/csharp/misc/cs1102.md",
1835+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1836+
},
1837+
{
1838+
"source_path_from_root": "/docs/csharp/misc/cs1103.md",
1839+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1840+
},
18211841
{
18221842
"source_path_from_root": "/docs/csharp/misc/cs1104.md",
18231843
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/params-arrays"
18241844
},
1845+
{
1846+
"source_path_from_root": "/docs/csharp/misc/cs1105.md",
1847+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1848+
},
1849+
{
1850+
"source_path_from_root": "/docs/csharp/misc/cs1106.md",
1851+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1852+
},
18251853
{
18261854
"source_path_from_root": "/docs/csharp/misc/cs1007.md",
18271855
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overload-resolution"
18281856
},
1857+
{
1858+
"source_path_from_root": "/docs/csharp/misc/cs1109.md",
1859+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1860+
},
1861+
{
1862+
"source_path_from_root": "/docs/csharp/misc/cs1110.md",
1863+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1864+
},
1865+
{
1866+
"source_path_from_root": "/docs/csharp/misc/cs1113.md",
1867+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
1868+
},
18291869
{
18301870
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1502.md",
18311871
"redirect_url": "/dotnet/csharp/misc/cs1503"

‎docs/azure/includes/dotnet-all.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@
300300
| Resource Management - Mixed Reality | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.MixedReality/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.MixedReality-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MixedReality_1.1.1/sdk/mixedreality/Azure.ResourceManager.MixedReality/) |
301301
| Resource Management - Mobile Network | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.MobileNetwork/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.MobileNetwork-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MobileNetwork_1.2.0/sdk/mobilenetwork/Azure.ResourceManager.MobileNetwork/) |
302302
| Resource Management - Mongo Cluster | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.MongoCluster/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.MongoCluster-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MongoCluster_1.0.0-beta.1/sdk/mongocluster/Azure.ResourceManager.MongoCluster/) |
303+
| Resource Management - Mongodbatlas | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.MongoDBAtlas/1.0.0-beta.1) | | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MongoDBAtlas_1.0.0-beta.1/sdk/mongodbatlas/Azure.ResourceManager.MongoDBAtlas/) |
303304
| Resource Management - Monitor | NuGet [1.3.1](https://www.nuget.org/packages/Azure.ResourceManager.Monitor/1.3.1)<br>NuGet [1.4.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.Monitor/1.4.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.Monitor-readme) | GitHub [1.3.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Monitor_1.3.1/sdk/monitor/Azure.ResourceManager.Monitor/)<br>GitHub [1.4.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Monitor_1.4.0-beta.3/sdk/monitor/Azure.ResourceManager.Monitor/) |
304305
| Resource Management - MySQL | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.MySql/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.MySql-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MySql_1.1.1/sdk/mysql/Azure.ResourceManager.MySql/) |
305306
| Resource Management - Neon Postgres | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.NeonPostgres/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NeonPostgres-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NeonPostgres_1.0.0/sdk/neonpostgres/Azure.ResourceManager.NeonPostgres/) |
@@ -509,7 +510,7 @@
509510
| App Service - API Apps Service | NuGet [0.9.64](https://www.nuget.org/packages/Microsoft.Azure.AppService.ApiApps.Service/0.9.64) | | |
510511
| Code Analyzers for Durable Functions | NuGet [0.5.0](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.DurableTask.Analyzers/0.5.0) | | GitHub [0.5.0](https://github.com/Azure/azure-functions-durable-extension/tree/Analyzer-v0.3.0/src/WebJobs.Extensions.DurableTask.Analyzers) |
511512
| Cosmos DB - BulkExecutor | NuGet [2.5.1-preview](https://www.nuget.org/packages/Microsoft.Azure.CosmosDB.BulkExecutor/2.5.1-preview) | | GitHub [2.5.1-preview](https://github.com/Azure/azure-cosmosdb-bulkexecutor-dotnet-getting-started) |
512-
| Cosmos DB - Direct | NuGet [3.39.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Direct/3.39.0) | | GitHub [3.39.0](https://github.com/Azure/azure-cosmos-dotnet-v3) |
513+
| Cosmos DB - Direct | NuGet [3.39.1](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Direct/3.39.1) | | GitHub [3.39.1](https://github.com/Azure/azure-cosmos-dotnet-v3) |
513514
| Cosmos DB - Encryption | NuGet [2.0.3](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.0.3)<br>NuGet [2.1.0-preview4](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.1.0-preview4) | | GitHub [2.0.3](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/releases/encryption/1.0.0-preview4/Microsoft.Azure.Cosmos.Encryption) |
514515
| Cosmos DB - Encryption | NuGet [1.0.0-preview07](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption.Custom/1.0.0-preview07) | | |
515516
| Extensions - Caching Cosmos | NuGet [1.7.0](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Cosmos/1.7.0) | | GitHub [1.7.0](https://github.com/Azure/Microsoft.Extensions.Caching.Cosmos/tree/v1.0.0-preview4) |

‎docs/azure/includes/dotnet-new.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@
307307
| Resource Management - Mixed Reality | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.MixedReality/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.MixedReality-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MixedReality_1.1.1/sdk/mixedreality/Azure.ResourceManager.MixedReality/) |
308308
| Resource Management - Mobile Network | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.MobileNetwork/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.MobileNetwork-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MobileNetwork_1.2.0/sdk/mobilenetwork/Azure.ResourceManager.MobileNetwork/) |
309309
| Resource Management - Mongo Cluster | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.MongoCluster/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.MongoCluster-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.ResourceManager.MongoCluster_1.0.0-beta.1/sdk/mongocluster/Azure.ResourceManager.MongoCluster/) |
310+
| Resource Management - Mongodbatlas | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.MongoDBAtlas/1.0.0-beta.1) | | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MongoDBAtlas_1.0.0-beta.1/sdk/mongodbatlas/Azure.ResourceManager.MongoDBAtlas/) |
310311
| Resource Management - Monitor | NuGet [1.3.1](https://www.nuget.org/packages/Azure.ResourceManager.Monitor/1.3.1)<br>NuGet [1.4.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.Monitor/1.4.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.Monitor-readme) | GitHub [1.3.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Monitor_1.3.1/sdk/monitor/Azure.ResourceManager.Monitor/)<br>GitHub [1.4.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Monitor_1.4.0-beta.3/sdk/monitor/Azure.ResourceManager.Monitor/) |
311312
| Resource Management - MySQL | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.MySql/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.MySql-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MySql_1.1.1/sdk/mysql/Azure.ResourceManager.MySql/) |
312313
| Resource Management - Neon Postgres | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.NeonPostgres/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NeonPostgres-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NeonPostgres_1.0.0/sdk/neonpostgres/Azure.ResourceManager.NeonPostgres/) |

‎docs/azure/sdk/authentication/credential-chains.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: 'Credential chains in the Azure Identity library for .NET'
33
description: 'This article describes the DefaultAzureCredential and ChainedTokenCredential classes in the Azure Identity library.'
44
ms.topic: conceptual
5-
ms.date: 02/13/2025
5+
ms.date: 05/30/2025
66
---
77

88
# Credential chains in the Azure Identity library for .NET
@@ -70,7 +70,11 @@ In its simplest form, you can use the parameterless version of `DefaultAzureCred
7070
7171
### How to customize DefaultAzureCredential
7272

73-
To remove a credential from `DefaultAzureCredential`, use the corresponding `Exclude`-prefixed property in [DefaultAzureCredentialOptions](/dotnet/api/azure.identity.defaultazurecredentialoptions?view=azure-dotnet&preserve-view=true#properties). For example:
73+
The following sections describe strategies for omitting credentials from the chain.
74+
75+
#### Exclude an individual credential
76+
77+
To exclude an individual credential from `DefaultAzureCredential`, use the corresponding `Exclude`-prefixed property in [DefaultAzureCredentialOptions](/dotnet/api/azure.identity.defaultazurecredentialoptions?view=azure-dotnet&preserve-view=true#properties). For example:
7478

7579
:::code language="csharp" source="../snippets/authentication/credential-chains/Program.cs" id="snippet_DacExcludes" highlight="11-13":::
7680

@@ -93,6 +97,19 @@ As more `Exclude`-prefixed properties are set to `true` (credential exclusions a
9397

9498
---
9599

100+
#### Exclude a credential type category
101+
102+
To exclude all `Developer tool` or `Deployed service` credentials, set environment variable `AZURE_TOKEN_CREDENTIALS` to `prod` or `dev`, respectively. When a value of `prod` is used, the underlying credential chain looks as follows:
103+
104+
:::image type="content" source="../media/mermaidjs/DefaultAzureCredentialEnvVarProd.svg" alt-text="DefaultAzureCredential with AZURE_TOKEN_CREDENTIALS set to 'prod'":::
105+
106+
When a value of `dev` is used, the chain looks as follows:
107+
108+
:::image type="content" source="../media/mermaidjs/DefaultAzureCredentialEnvVarDev.svg" alt-text="DefaultAzureCredential with AZURE_TOKEN_CREDENTIALS set to 'dev'":::
109+
110+
> [!IMPORTANT]
111+
> The `AZURE_TOKEN_CREDENTIALS` environment variable is supported in `Azure.Identity` package versions 1.14.0 and later.
112+
96113
## ChainedTokenCredential overview
97114

98115
[ChainedTokenCredential](/dotnet/api/azure.identity.chainedtokencredential?view=azure-dotnet&preserve-view=true) is an empty chain to which you add credentials to suit your app's needs. For example:

‎docs/azure/sdk/media/mermaidjs/DefaultAzureCredentialEnvVarDev.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
ms.topic: include
3+
ms.date: 05/30/2025
4+
---
5+
6+
```mermaid
7+
%% STEPS TO GENERATE IMAGE
8+
%% =======================
9+
%% 1. Install mermaid CLI v10.9.1 (see https://github.com/mermaid-js/mermaid-cli/blob/master/README.md):
10+
%% npm i -g @mermaid-js/[email protected]
11+
%% 2. Run command: mmdc -i DefaultAzureCredentialEnvVarDev.md -o ../../media/mermaidjs/DefaultAzureCredentialEnvVarDev.svg
12+
13+
%%{
14+
init: {
15+
'theme': 'base',
16+
'themeVariables': {
17+
'tertiaryBorderColor': '#fff',
18+
'tertiaryColor': '#fff'
19+
}
20+
}
21+
}%%
22+
23+
flowchart LR;
24+
accTitle: DefaultAzureCredential authentication flow without deployed service credentials;
25+
accDescr: Flowchart showing the credential chain implemented by DefaultAzureCredential when AZURE_TOKEN_CREDENTIALS is set to "dev";
26+
27+
D(Visual Studio):::developer --> E(Azure CLI):::developer --> F(Azure PowerShell):::developer --> G(Azure Developer CLI):::developer;
28+
29+
%% Define styles for credential type boxes
30+
classDef developer fill:#F5AF6F, stroke:#EB7C39, stroke-width:2px;
31+
```

0 commit comments

Comments
 (0)