Skip to content

Commit 4eb00d2

Browse files
authored
Merge pull request #43427 from dotnet/main
Merge main into live
2 parents b90a805 + 92e22a6 commit 4eb00d2

File tree

8 files changed

+77
-23
lines changed

8 files changed

+77
-23
lines changed

docs/azure/includes/dotnet-all.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
| Resource Management - App Compliance Automation | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.AppComplianceAutomation/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppComplianceAutomation-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppComplianceAutomation_1.0.0/sdk/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation/) |
166166
| Resource Management - App Configuration | NuGet [1.3.2](https://www.nuget.org/packages/Azure.ResourceManager.AppConfiguration/1.3.2) | [docs](/dotnet/api/overview/azure/ResourceManager.AppConfiguration-readme) | GitHub [1.3.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppConfiguration_1.3.2/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/) |
167167
| Resource Management - App Platform | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.AppPlatform/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.AppPlatform-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppPlatform_1.1.1/sdk/appplatform/Azure.ResourceManager.AppPlatform/) |
168-
| Resource Management - App Service | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.2.0)<br>NuGet [1.3.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.3.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.AppService-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.2.0/sdk/websites/Azure.ResourceManager.AppService/)<br>GitHub [1.3.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.3.0-beta.1/sdk/websites/Azure.ResourceManager.AppService/) |
168+
| Resource Management - App Service | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.2.0)<br>NuGet [1.3.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.3.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.AppService-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.2.0/sdk/websites/Azure.ResourceManager.AppService/)<br>GitHub [1.3.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.3.0-beta.2/sdk/websites/Azure.ResourceManager.AppService/) |
169169
| Resource Management - Application Insights | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ApplicationInsights/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ApplicationInsights-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApplicationInsights_1.0.0/sdk/applicationinsights/Azure.ResourceManager.ApplicationInsights/) |
170170
| Resource Management - Astro | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.Astro/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Astro-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.Astro_1.0.0-beta.1/sdk/astronomer/Azure.ResourceManager.Astro/) |
171171
| Resource Management - Attestation | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.Attestation/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.Attestation-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.ResourceManager.Attestation_1.0.0-beta.4/sdk/attestation/Azure.ResourceManager.Attestation/) |
@@ -395,7 +395,7 @@
395395
| Common | NuGet [2.2.1](https://www.nuget.org/packages/Microsoft.Azure.Common/2.2.1) | | |
396396
| Common - Dependencies | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Common.Dependencies/1.0.0) | | |
397397
| Computer Vision | NuGet [7.0.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.ComputerVision/7.0.1) | | GitHub [7.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.ComputerVision_6.0.0-preview.1/sdk/cognitiveservices/Vision.ComputerVision) |
398-
| Cosmos DB | NuGet [3.42.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.42.0)<br>NuGet [3.46.0-preview.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.46.0-preview.0) | [docs](https://learn.microsoft.com/dotnet/api/overview/azure/cosmosdb) | GitHub [3.42.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
398+
| Cosmos DB | NuGet [3.42.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.42.0)<br>NuGet [3.46.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.46.0-preview.1) | [docs](https://learn.microsoft.com/dotnet/api/overview/azure/cosmosdb) | GitHub [3.42.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
399399
| Custom Image Search | NuGet [2.1.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Search.BingCustomImageSearch/2.1.0-preview.1) | | GitHub [2.1.0-preview.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Search.BingCustomImageSearch_2.1.0-preview.1/sdk/cognitiveservices/Search.BingCustomImageSearch) |
400400
| Custom Image Search | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Search.CustomImageSearch/2.0.0) | | |
401401
| Custom Search | NuGet [2.1.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Search.BingCustomSearch/2.1.0-preview.1) | | GitHub [2.1.0-preview.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Search.BingCustomSearch_2.1.0-preview.1/sdk/cognitiveservices/Search.BingCustomSearch) |

docs/azure/includes/dotnet-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
| Resource Management - App Compliance Automation | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.AppComplianceAutomation/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppComplianceAutomation-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppComplianceAutomation_1.0.0/sdk/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation/) |
171171
| Resource Management - App Configuration | NuGet [1.3.2](https://www.nuget.org/packages/Azure.ResourceManager.AppConfiguration/1.3.2) | [docs](/dotnet/api/overview/azure/ResourceManager.AppConfiguration-readme) | GitHub [1.3.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppConfiguration_1.3.2/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/) |
172172
| Resource Management - App Platform | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.AppPlatform/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.AppPlatform-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppPlatform_1.1.1/sdk/appplatform/Azure.ResourceManager.AppPlatform/) |
173-
| Resource Management - App Service | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.2.0)<br>NuGet [1.3.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.3.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.AppService-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.2.0/sdk/websites/Azure.ResourceManager.AppService/)<br>GitHub [1.3.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.3.0-beta.1/sdk/websites/Azure.ResourceManager.AppService/) |
173+
| Resource Management - App Service | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.2.0)<br>NuGet [1.3.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.3.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.AppService-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.2.0/sdk/websites/Azure.ResourceManager.AppService/)<br>GitHub [1.3.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.3.0-beta.2/sdk/websites/Azure.ResourceManager.AppService/) |
174174
| Resource Management - Application Insights | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ApplicationInsights/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ApplicationInsights-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApplicationInsights_1.0.0/sdk/applicationinsights/Azure.ResourceManager.ApplicationInsights/) |
175175
| Resource Management - Arc ScVmm | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.ArcScVmm/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.ArcScVmm-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.ResourceManager.ArcScVmm_1.0.0-beta.4/sdk/arc-scvmm/Azure.ResourceManager.ArcScVmm/) |
176176
| Resource Management - Astro | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.Astro/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Astro-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.Astro_1.0.0-beta.1/sdk/astronomer/Azure.ResourceManager.Astro/) |

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

Lines changed: 6 additions & 3 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: 08/15/2024
5+
ms.date: 11/12/2024
66
---
77

88
# Credential chains in the Azure Identity library for .NET
@@ -43,7 +43,7 @@ The order in which `DefaultAzureCredential` attempts credentials follows.
4343

4444
| Order | Credential | Description | Enabled by default? |
4545
|-------|---------------------|-------------|---------------------|
46-
| 1 | [Environment][env-cred] |Reads a collection of environment variables to determine if an application service principal (application user) is configured for the app. If so, `DefaultAzureCredential` uses these values to authenticate the app to Azure. This method is most often used in server environments but can also be used when developing locally. | Yes |
46+
| 1 | [Environment][env-cred] |Reads a collection of [environment variables][env-vars] to determine if an application service principal (application user) is configured for the app. If so, `DefaultAzureCredential` uses these values to authenticate the app to Azure. This method is most often used in server environments but can also be used when developing locally. | Yes |
4747
| 2 | [Workload Identity][wi-cred] |If the app is deployed to an Azure host with Workload Identity enabled, authenticate that account. | Yes |
4848
| 3 | [Managed Identity][mi-cred] |If the app is deployed to an Azure host with Managed Identity enabled, authenticate the app to Azure using that Managed Identity. | Yes |
4949
| 4 | [Visual Studio][vs-cred] |If the developer authenticated to Azure by logging into Visual Studio, authenticate the app to Azure using that same account. | Yes |
@@ -114,7 +114,7 @@ Here's why:
114114

115115
- **Debugging challenges**: When authentication fails, it can be challenging to debug and identify the offending credential. You must enable logging to see the progression from one credential to the next and the success/failure status of each. For more information, see [Debug a chained credential](#debug-a-chained-credential).
116116
- **Performance overhead**: The process of sequentially trying multiple credentials can introduce performance overhead. For example, when running on a local development machine, managed identity is unavailable. Consequently, `ManagedIdentityCredential` always fails in the local development environment, unless explicitly disabled via its corresponding `Exclude`-prefixed property.
117-
- **Unpredictable behavior**: `DefaultAzureCredential` checks for the presence of certain [environment variables](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/identity/Azure.Identity/README.md#environment-variables). It's possible that someone could add or modify these environment variables at the system level on the host machine. Those changes apply globally and therefore alter the behavior of `DefaultAzureCredential` at runtime in any app running on that machine.
117+
- **Unpredictable behavior**: `DefaultAzureCredential` checks for the presence of certain [environment variables][env-vars]. It's possible that someone could add or modify these environment variables at the system level on the host machine. Those changes apply globally and therefore alter the behavior of `DefaultAzureCredential` at runtime in any app running on that machine.
118118

119119
## Debug a chained credential
120120

@@ -130,3 +130,6 @@ In the preceding output, notice that:
130130

131131
- `EnvironmentCredential`, `WorkloadIdentityCredential`, and `ManagedIdentityCredential` each failed to acquire a Microsoft Entra access token, in that order.
132132
- The `DefaultAzureCredential credential selected:`-prefixed entry indicates the credential that was selected&mdash;`VisualStudioCredential` in this case. Since `VisualStudioCredential` succeeded, no credentials beyond it were used.
133+
134+
<!-- LINKS -->
135+
[env-vars]: https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/identity/Azure.Identity/README.md#environment-variables

docs/core/docker/publish-as-container.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ Determining projects to restore...
127127
DotNet.ContainerImage -> .\Worker\bin\Release\net8.0\linux-x64\publish\
128128
Building image 'dotnet-worker-image' with tags latest on top of base image mcr.microsoft.com/dotnet/aspnet:8.0
129129
Pushed container 'dotnet-worker-image:latest' to Docker daemon
130+
```
130131
131132
This command compiles your worker app to the *publish* folder and pushes the container to your local docker registry.
132133

docs/core/project-sdk/overview.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ Modern .NET projects are associated with a project software development kit (SDK
1414

1515
The available SDKs include:
1616

17-
| ID | Description | Repo |
18-
|----------------------------|---------------------------------------------------------|----------------------------------------|
19-
| `Microsoft.NET.Sdk` | The .NET SDK | <https://github.com/dotnet/sdk> |
20-
| `Microsoft.NET.Sdk.Web` | The .NET [Web SDK](/aspnet/core/razor-pages/web-sdk) | <https://github.com/dotnet/sdk> |
21-
| `Microsoft.NET.Sdk.Razor` | The .NET [Razor SDK](/aspnet/core/razor-pages/sdk) | <https://github.com/dotnet/aspnetcore> |
17+
| ID | Description | Repo |
18+
|----------------------------|--------------------------------------------------------------------------------------|----------------------------------------|
19+
| `Microsoft.NET.Sdk` | The .NET SDK | <https://github.com/dotnet/sdk> |
20+
| `Microsoft.NET.Sdk.Web` | The .NET [Web SDK](/aspnet/core/razor-pages/web-sdk) | <https://github.com/dotnet/sdk> |
21+
| `Microsoft.NET.Sdk.Razor` | The .NET [Razor SDK](/aspnet/core/razor-pages/sdk) | <https://github.com/dotnet/aspnetcore> |
2222
| `Microsoft.NET.Sdk.BlazorWebAssembly` | The .NET [Blazor WebAssembly SDK](/aspnet/core/blazor#blazor-webassembly) | <https://github.com/dotnet/aspnetcore> |
23-
| `Microsoft.NET.Sdk.Worker` | The .NET [Worker Service](../extensions/workers.md) SDK | |
24-
| `Aspire.AppHost.Sdk` | The .NET Aspire SDK | <https://github.com/dotnet/aspire> |
25-
| `MSTest.Sdk` | The [MSTest SDK](../testing/unit-testing-mstest-sdk.md) | <https://github.com/microsoft/testfx> |
23+
| `Microsoft.NET.Sdk.Worker` | The .NET [Worker Service SDK](../extensions/workers.md) | <https://github.com/dotnet/aspnetcore> |
24+
| `Aspire.AppHost.Sdk` | The .NET [Aspire SDK](/dotnet/aspire/fundamentals/dotnet-aspire-sdk) | <https://github.com/dotnet/aspire> |
25+
| `MSTest.Sdk` | The [MSTest SDK](../testing/unit-testing-mstest-sdk.md) | <https://github.com/microsoft/testfx> |
2626

2727
The .NET SDK is the base SDK for .NET. The other SDKs reference the .NET SDK, and projects that are associated with the other SDKs have all the .NET SDK properties available to them. The Web SDK, for example, depends on both the .NET SDK and the Razor SDK.
2828

@@ -38,22 +38,22 @@ You can also author your own SDK that can be distributed via NuGet.
3838

3939
```xml
4040
<Project Sdk="Microsoft.NET.Sdk">
41-
...
41+
<!-- Omitted for brevity... -->
4242
</Project>
4343
```
4444

45-
Starting with .NET Aspire 9, the preceding example could instead use the .NET Aspire SDK.
45+
The `Project/Sdk` attribute and `Sdk` element enable additive SDKs. Consider the following example, where the .NET Aspire SDK (`Aspire.AppHost.Sdk`) is added to the project atop the `Microsoft.NET.Sdk`:
4646

4747
```xml
4848
<Project Sdk="Microsoft.NET.Sdk">
4949

50-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0-rc.1.24511.1" />
50+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
5151
<!-- Omitted for brevity... -->
5252

5353
</Project>
5454
```
5555

56-
For more information, see [.NET Aspire tooling and setup](/dotnet/aspire/fundamentals/setup-tooling).
56+
In the preceding project file, both SDKs are used to resolve dependencies in an additive nature. For more information, see [.NET Aspire SDK](/dotnet/aspire/fundamentals/dotnet-aspire-sdk)
5757

5858
To specify an SDK that comes from NuGet, include the version at the end of the name, or specify the name and version in the *global.json* file.
5959

docs/core/testing/unit-testing-platform-integration-dotnet-test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ By default, VSTest is used to run `Microsoft.Testing.Platform` tests. You can en
5858

5959
In this mode, you can supply extra parameters that are used to call the testing application in one of the following ways:
6060

61-
- Beginning with `Microsoft.Testing.Platform` version 1.4 (included with MSTest version 3.6), you can options after the double dash `--` on the command line:
61+
- Beginning with `Microsoft.Testing.Platform` version 1.4 (included with MSTest version 3.6), you can add options after the double dash `--` on the command line:
6262

6363
```dotnetcli
6464
dotnet test -- --minimum-expected-tests 10

0 commit comments

Comments
 (0)