Skip to content

Commit 53ca0ab

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #43373 from dotnet/main
Merge main into live
2 parents c63fee3 + d0a5a09 commit 53ca0ab

File tree

32 files changed

+713
-114
lines changed

32 files changed

+713
-114
lines changed

‎.github/policies/policy-edits.yml renamed to ‎.github/policies/disallow-edits.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ where:
88
configuration:
99
resourceManagementConfiguration:
1010
eventResponderTasks:
11-
- description: Flag PRs that change .github folder files.
11+
- description: Close PRs that change .github folder files.
1212
triggerOnOwnActions: true
1313
if:
1414
- payloadType: Pull_Request
@@ -38,3 +38,24 @@ configuration:
3838
reply: >-
3939
@${issueAuthor} - This PR edits a file in the .github folder, which is not allowed. CC @dotnet/docs.
4040
- closePullRequest
41+
42+
- description: Close PRs that change Framework Design Guidelines.
43+
triggerOnOwnActions: true
44+
if:
45+
- payloadType: Pull_Request
46+
- isAction:
47+
action: Opened
48+
- filesMatchPattern:
49+
pattern: docs/standard/design-guidelines/*
50+
matchAny: true
51+
- not:
52+
or:
53+
- activitySenderHasPermission:
54+
permission: admin
55+
- activitySenderHasPermission:
56+
permission: write
57+
then:
58+
- addReply:
59+
reply: >-
60+
@${issueAuthor} - This PR edits a file in the design-guidelines folder, which is disallowed. This content is reprinted by permission of Pearson Education, Inc. from Framework Design Guidelines: Conventions, Idioms, and Patterns for Reusable .NET Libraries, 2nd Edition, and cannot be edited. CC @dotnet/docs.
61+
- closePullRequest

‎docs/ai/how-to/snippets/semantic-kernel/semantic-kernel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
18-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.26.0" />
18+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.27.0" />
1919
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="1.9.0-alpha" />
2020
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Redis" Version="1.9.0-alpha" />
2121
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.9.0-alpha" />

‎docs/ai/quickstarts/snippets/local-ai/ollama.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.26.0" />
11+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.27.0" />
1212
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.22.0-alpha" />
1313
</ItemGroup>
1414

‎docs/ai/tutorials/snippets/llm-eval/llm-eval.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
15-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.26.0" />
15+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.27.0" />
1616
</ItemGroup>
1717

1818
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
| WCF Storage Queues | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Microsoft.WCF.Azure.StorageQueues/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/Microsoft.WCF.Azure.StorageQueues-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.WCF.Azure.StorageQueues_1.0.0-beta.1/sdk/extension-wcf/Microsoft.WCF.Azure.StorageQueues/) |
115115
| Web PubSub | NuGet [1.4.0](https://www.nuget.org/packages/Azure.Messaging.WebPubSub/1.4.0) | [docs](/dotnet/api/overview/azure/Messaging.WebPubSub-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.WebPubSub_1.4.0/sdk/webpubsub/Azure.Messaging.WebPubSub/) |
116116
| Web PubSub Client | NuGet [1.0.0](https://www.nuget.org/packages/Azure.Messaging.WebPubSub.Client/1.0.0) | [docs](/dotnet/api/overview/azure/Messaging.WebPubSub.Client-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.WebPubSub.Client_1.0.0/sdk/webpubsub/Azure.Messaging.WebPubSub.Client/) |
117-
| Azure client library integration for ASP.NET Core | NuGet [1.7.6](https://www.nuget.org/packages/Microsoft.Extensions.Azure/1.7.6) | [docs](/dotnet/api/overview/azure/Microsoft.Extensions.Azure-readme) | GitHub [1.7.6](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Extensions.Azure_1.7.6/sdk/extensions/Microsoft.Extensions.Azure/) |
117+
| Azure client library integration for ASP.NET Core | NuGet [1.8.0](https://www.nuget.org/packages/Microsoft.Extensions.Azure/1.8.0) | [docs](/dotnet/api/overview/azure/Microsoft.Extensions.Azure-readme) | GitHub [1.8.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Extensions.Azure_1.8.0/sdk/extensions/Microsoft.Extensions.Azure/) |
118118
| Blob Storage Key Store for .NET Data Protection | NuGet [1.3.4](https://www.nuget.org/packages/Azure.Extensions.AspNetCore.DataProtection.Blobs/1.3.4) | [docs](/dotnet/api/overview/azure/Extensions.AspNetCore.DataProtection.Blobs-readme) | GitHub [1.3.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Extensions.AspNetCore.DataProtection.Blobs_1.3.4/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/) |
119119
| CloudNative CloudEvents with Event Grid | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/1.0.0) | [docs](/dotnet/api/overview/azure/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents_1.0.0/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/) |
120120
| Core - Client - Spatial | NuGet [1.1.0](https://www.nuget.org/packages/Microsoft.Azure.Core.Spatial/1.1.0)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Microsoft.Azure.Core.Spatial/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/Microsoft.Azure.Core.Spatial-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Core.Spatial_1.1.0/sdk/core/Microsoft.Azure.Core.Spatial/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Core.Spatial_1.2.0-beta.1/sdk/core/Microsoft.Azure.Core.Spatial/) |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
| WCF Storage Queues | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Microsoft.WCF.Azure.StorageQueues/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/Microsoft.WCF.Azure.StorageQueues-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.WCF.Azure.StorageQueues_1.0.0-beta.1/sdk/extension-wcf/Microsoft.WCF.Azure.StorageQueues/) |
120120
| Web PubSub | NuGet [1.4.0](https://www.nuget.org/packages/Azure.Messaging.WebPubSub/1.4.0) | [docs](/dotnet/api/overview/azure/Messaging.WebPubSub-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.WebPubSub_1.4.0/sdk/webpubsub/Azure.Messaging.WebPubSub/) |
121121
| Web PubSub Client | NuGet [1.0.0](https://www.nuget.org/packages/Azure.Messaging.WebPubSub.Client/1.0.0) | [docs](/dotnet/api/overview/azure/Messaging.WebPubSub.Client-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.WebPubSub.Client_1.0.0/sdk/webpubsub/Azure.Messaging.WebPubSub.Client/) |
122-
| Azure client library integration for ASP.NET Core | NuGet [1.7.6](https://www.nuget.org/packages/Microsoft.Extensions.Azure/1.7.6) | [docs](/dotnet/api/overview/azure/Microsoft.Extensions.Azure-readme) | GitHub [1.7.6](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Extensions.Azure_1.7.6/sdk/extensions/Microsoft.Extensions.Azure/) |
122+
| Azure client library integration for ASP.NET Core | NuGet [1.8.0](https://www.nuget.org/packages/Microsoft.Extensions.Azure/1.8.0) | [docs](/dotnet/api/overview/azure/Microsoft.Extensions.Azure-readme) | GitHub [1.8.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Extensions.Azure_1.8.0/sdk/extensions/Microsoft.Extensions.Azure/) |
123123
| Blob Storage Key Store for .NET Data Protection | NuGet [1.3.4](https://www.nuget.org/packages/Azure.Extensions.AspNetCore.DataProtection.Blobs/1.3.4) | [docs](/dotnet/api/overview/azure/Extensions.AspNetCore.DataProtection.Blobs-readme) | GitHub [1.3.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Extensions.AspNetCore.DataProtection.Blobs_1.3.4/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/) |
124124
| CloudNative CloudEvents with Event Grid | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/1.0.0) | [docs](/dotnet/api/overview/azure/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents_1.0.0/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/) |
125125
| Core - Client - Spatial | NuGet [1.1.0](https://www.nuget.org/packages/Microsoft.Azure.Core.Spatial/1.1.0)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Microsoft.Azure.Core.Spatial/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/Microsoft.Azure.Core.Spatial-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Core.Spatial_1.1.0/sdk/core/Microsoft.Azure.Core.Spatial/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Core.Spatial_1.2.0-beta.1/sdk/core/Microsoft.Azure.Core.Spatial/) |

‎docs/azure/sdk/authentication/create-token-credentials-from-configuration.md

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create token credentials from configuration
33
description: This article describes how to create Microsoft Entra token credentials from configuration files.
44
ms.topic: how-to
55
ms.custom: devx-track-dotnet, engagement-fy23
6-
ms.date: 1/16/2024
6+
ms.date: 11/05/2024
77
---
88

99
# Create Microsoft Entra credential types using configuration files
@@ -68,25 +68,39 @@ You can create both user-assigned and system-assigned managed identities using c
6868

6969
#### User-assigned managed identities
7070

71-
Specify a user-assigned managed identity via a client ID:
71+
A user-assigned managed identity can be used by providing a client ID, resource ID, or object ID:
7272

73-
```json
74-
{
75-
"credential": "managedidentity",
76-
"clientId": "<clientId>"
77-
}
78-
```
73+
- **Client ID:**
7974

80-
Alternatively, specify a user-assigned managed identity via a resource ID:
75+
```json
76+
{
77+
"credential": "managedidentity",
78+
"clientId": "<clientId>"
79+
}
80+
```
8181

82-
```json
83-
{
84-
"credential": "managedidentity",
85-
"managedIdentityResourceId": "<managedIdentityResourceId>"
86-
}
87-
```
82+
- **Resource ID:**
83+
84+
```json
85+
{
86+
"credential": "managedidentity",
87+
"managedIdentityResourceId": "<managedIdentityResourceId>"
88+
}
89+
```
90+
91+
The resource ID takes the form `/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}`.
92+
93+
- **Object ID:**
94+
95+
```json
96+
{
97+
"credential": "managedidentity",
98+
"managedIdentityObjectId": "<managedIdentityObjectId>"
99+
}
100+
```
88101

89-
The resource ID takes the form `/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}`.
102+
> [!IMPORTANT]
103+
> The `managedIdentityObjectId` JSON property is supported in `Microsoft.Extensions.Azure` versions 1.8.0 and later.
90104

91105
#### System-assigned managed identities
92106

‎docs/azure/sdk/snippets/logging/LoggingSampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
1111
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.4" />
1212
<PackageReference Include="Azure.Identity" Version="1.13.1" />
13-
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
13+
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.8.0" />
1414
</ItemGroup>
1515

1616
</Project>

‎docs/azure/sdk/snippets/pagination/pagination.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
13-
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
13+
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.8.0" />
1414
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
1515
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
1616
</ItemGroup>

‎docs/core/compatibility/9.0.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ If you're migrating an app to .NET 9, the breaking changes listed here might aff
4646
| [InMemoryDirectoryInfo prepends rootDir to files](core-libraries/9.0/inmemorydirinfo-prepends-rootdir.md) | Behavioral change | Preview 1 |
4747
| [New TimeSpan.From*() overloads that take integers](core-libraries/9.0/timespan-from-overloads.md) | Source incompatible | Preview 3 |
4848
| [RuntimeHelpers.GetSubArray returns different type](core-libraries/9.0/getsubarray-return.md) | Behavioral change | Preview 1 |
49+
| [String.Trim(params ReadOnlySpan\<char>) overload removed](core-libraries/9.0/string-trim.md) | Source/binary incompatible | GA |
4950
| [Support for empty environment variables](core-libraries/9.0/empty-env-variable.md) | Behavioral change | Preview 6 |
5051
| [ZipArchiveEntry names and comments respect UTF8 flag](core-libraries/9.0/ziparchiveentry-encoding.md) | Behavioral change | RC 1 |
5152

@@ -80,8 +81,13 @@ If you're migrating an app to .NET 9, the breaking changes listed here might aff
8081

8182
| Title | Type of change | Introduced version |
8283
|-----------------------------------------------------------------------------------|---------------------|--------------------|
84+
| [API obsoletions](core-libraries/9.0/obsolete-apis-with-custom-diagnostics.md) | Source incompatible | Preview 6 |
85+
| [HttpClient metrics report `server.port` unconditionally](networking/9.0/server-port-attribute.md) | Behavioral change | Preview 7 |
8386
| [HttpClientFactory logging redacts header values by default](networking/9.0/redact-headers.md) | Behavioral change | RC 1 |
87+
| [HttpClientFactory uses SocketsHttpHandler as primary handler](networking/9.0/default-handler.md) | Behavioral change | Preview 6 |
8488
| [HttpListenerRequest.UserAgent is nullable](networking/9.0/useragent-nullable.md) | Source incompatible | Preview 1 |
89+
| [URI query redaction in HttpClient EventSource events](networking/9.0/query-redaction-events.md) | Behavioral change | Preview 7 |
90+
| [URI query redaction in IHttpClientFactory logs](networking/9.0/query-redaction-logs.md) | Behavioral change | Preview 7 |
8591

8692
## SDK and MSBuild
8793

0 commit comments

Comments
 (0)