Skip to content

Commit 184562f

Browse files
authored
Merge pull request #291132 from MicrosoftDocs/main
Publish to Live Wednesday 4AM PST, 11/27
2 parents 393f078 + f57aa6e commit 184562f

29 files changed

+506
-389
lines changed

articles/azure-app-configuration/quickstart-aspnet-core-app.md

Lines changed: 79 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Quickstart for Azure App Configuration with ASP.NET Core | Microsoft Docs
2+
title: Quickstart for Azure App Configuration with ASP.NET Core
33
description: Create an ASP.NET Core app with Azure App Configuration to centralize storage and management of application settings for an ASP.NET Core application.
44
services: azure-app-configuration
55
author: zhenlan
66
ms.service: azure-app-configuration
77
ms.devlang: csharp
88
ms.custom: devx-track-csharp, mode-other, engagement-fy23
99
ms.topic: quickstart
10-
ms.date: 02/20/2024
10+
ms.date: 11/20/2024
1111
ms.author: zhenlwa
1212
#Customer intent: As an ASP.NET Core developer, I want to learn how to manage all my app settings in one place.
1313
---
@@ -42,18 +42,48 @@ Use the [.NET command-line interface (CLI)](/dotnet/core/tools) to create a new
4242
Run the following command to create an ASP.NET Core web app in a new *TestAppConfig* folder:
4343

4444
```dotnetcli
45-
dotnet new webapp --output TestAppConfig --framework net6.0
45+
dotnet new webapp --output TestAppConfig
4646
```
4747

4848
## Connect to the App Configuration store
4949

50-
1. Navigate into the project's directory *TestAppConfig*, and run the following command to add a [Microsoft.Azure.AppConfiguration.AspNetCore](https://www.nuget.org/packages/Microsoft.Azure.AppConfiguration.AspNetCore) NuGet package reference:
50+
Connect to your App Configuration store using Microsoft Entra ID (recommended), or a connection string.
5151

52+
1. Navigate into the project's directory *TestAppConfig*, and run the following command to add NuGet package references.
53+
54+
### [Microsoft Entra ID (recommended)](#tab/entra-id)
55+
56+
```dotnetcli
57+
dotnet add package Microsoft.Azure.AppConfiguration.AspNetCore
58+
dotnet add package Azure.Identity
59+
```
60+
61+
### [Connection string](#tab/connection-string)
5262
```dotnetcli
5363
dotnet add package Microsoft.Azure.AppConfiguration.AspNetCore
5464
```
65+
---
66+
67+
1. Run the following command to restore packages for your project:
68+
69+
```dotnetcli
70+
dotnet restore
71+
```
72+
73+
1. Create a user secret for the application by navigating into the *TestAppConfig* folder and running the following command.
74+
75+
### [Microsoft Entra ID (recommended)](#tab/entra-id)
76+
77+
The command uses [Secret Manager](/aspnet/core/security/app-secrets) to store a secret named `Endpoints:AppConfiguration`, which stores the endpoint for your App Configuration store. Replace the `<your-App-Configuration-endpoint>` placeholder with your App Configuration store's endpoint. You can find the endpoint in your App Configuration store's **Overview** blade in the Azure portal.
78+
79+
```dotnetcli
80+
dotnet user-secrets init
81+
dotnet user-secrets set Endpoints:AppConfiguration "<your-App-Configuration-endpoint>"
82+
```
83+
84+
### [Connection string](#tab/connection-string)
5585
56-
1. Run the following command. The command uses [Secret Manager](/aspnet/core/security/app-secrets) to store a secret named `ConnectionStrings:AppConfig`, which stores the connection string for your App Configuration store. Replace the `<your_connection_string>` placeholder with your App Configuration store's connection string. You can find the connection string under **Access Keys** of your App Configuration store in the Azure portal.
86+
The command uses [Secret Manager](/aspnet/core/security/app-secrets) to store a secret named `ConnectionStrings:AppConfig`, which stores the connection string for your App Configuration store. Replace the `<your_connection_string>` placeholder with your App Configuration store's connection string. You can find the connection string in your App Configuration store's **Access settings** in the Azure portal.
5787
5888
```dotnetcli
5989
dotnet user-secrets init
@@ -62,10 +92,49 @@ dotnet new webapp --output TestAppConfig --framework net6.0
6292
6393
> [!TIP]
6494
> Some shells will truncate the connection string unless it's enclosed in quotes. Ensure that the output of the `dotnet user-secrets list` command shows the entire connection string. If it doesn't, rerun the command, enclosing the connection string in quotes.
65-
95+
6696
Secret Manager stores the secret outside of your project tree, which helps prevent the accidental sharing of secrets within source code. It's used only to test the web app locally. When the app is deployed to Azure like [App Service](../app-service/overview.md), use the *Connection strings*, *Application settings* or environment variables to store the connection string. Alternatively, to avoid connection strings all together, you can [connect to App Configuration using managed identities](./howto-integrate-azure-managed-service-identity.md) or your other [Microsoft Entra identities](./concept-enable-rbac.md).
97+
98+
---
6799
68-
1. Open *Program.cs* and add Azure App Configuration as an extra configuration source by calling the `AddAzureAppConfiguration` method.
100+
1. Open *Program.cs* and add the following namespaces:
101+
102+
103+
### [Microsoft Entra ID (recommended)](#tab/entra-id)
104+
```csharp
105+
using Microsoft.Extensions.Configuration;
106+
using Microsoft.Azure.AppConfiguration.AspNetCore;
107+
using Azure.Identity;
108+
```
109+
110+
### [Connection string](#tab/connection-string)
111+
```csharp
112+
using Microsoft.Extensions.Configuration;
113+
using Microsoft.Azure.AppConfiguration.AspNetCore;
114+
```
115+
---
116+
117+
1. Connect to your App Configuration store by calling the `AddAzureAppConfiguration` method in the `Program.cs` file.
118+
119+
### [Microsoft Entra ID (recommended)](#tab/entra-id)
120+
121+
You use the `DefaultAzureCredential` to authenticate to your App Configuration store. Follow the [instructions](./concept-enable-rbac.md#authentication-with-token-credentials) to assign your credential the **App Configuration Data Reader** role. Be sure to allow sufficient time for the permission to propagate before running your application.
122+
123+
```csharp
124+
var builder = WebApplication.CreateBuilder(args);
125+
126+
// Load configuration from Azure App Configuration
127+
builder.Configuration.AddAzureAppConfiguration(options =>
128+
{
129+
string endpoint = builder.Configuration.Get("Endpoints:AppConfiguration");
130+
options.Connect(new Uri(endpoint), new DefaultAzureCredential());
131+
});
132+
133+
// The rest of existing code in program.cs
134+
// ... ...
135+
```
136+
137+
### [Connection string](#tab/connection-string)
69138
70139
```csharp
71140
var builder = WebApplication.CreateBuilder(args);
@@ -79,8 +148,10 @@ dotnet new webapp --output TestAppConfig --framework net6.0
79148
// The rest of existing code in program.cs
80149
// ... ...
81150
```
151+
---
152+
153+
This code loads *all* key-values that have *no label* from your App Configuration store. For more information on loading data from App Configuration, see the [App Configuration provider API reference](/dotnet/api/Microsoft.Extensions.Configuration.AzureAppConfigurationExtensions).
82154
83-
This code will connect to your App Configuration store using a connection string and load *all* key-values that have *no labels*. For more information on the App Configuration provider, see the [App Configuration provider API reference](/dotnet/api/Microsoft.Extensions.Configuration.AzureAppConfiguration).
84155
85156
## Read from the App Configuration store
86157

articles/azure-functions/functions-bindings-azure-mysql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Azure Database for MySQL bindings for Azure Functions have a required property f
166166

167167
## Samples
168168

169-
In addition to the samples for C#, Java, JavaScript, PowerShell, and Python available in the [Azure SQL bindings GitHub repository](https://github.com/Azure/azure-functions-mysql-extension/tree/main/samples), more are available in Azure Samples.
169+
In addition to the samples for C#, Java, JavaScript, PowerShell, and Python available in the [Azure MySQL bindings GitHub repository](https://github.com/Azure/azure-functions-mysql-extension/tree/main/samples), more are available in Azure Samples.
170170

171171

172172
## Next steps

articles/azure-web-pubsub/includes/reference-json-requests.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,16 @@ binary
272272

273273
The `Content-Type` for the CloudEvents HTTP request is `application/octet-stream` when `dataType` is `binary`. The WebSocket frame can be `text` format for text message frames or UTF8 encoded binaries for `binary` message frames.
274274

275-
The Web PubSub service declines the client if the message doesn't match the described format.
275+
The Web PubSub service declines the client if the message doesn't match the described format.
276+
277+
### Ping
278+
279+
Format:
280+
281+
```json
282+
{
283+
"type": "ping",
284+
}
285+
```
286+
287+
The client can send a `ping` message to the service to enable the Web PubSub service to detect the client's liveness.

articles/azure-web-pubsub/includes/reference-protobuf-requests.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,3 +244,8 @@ ce-eventName: <event_name>
244244
For `dataType`=`binary`, the `Content-Type` for the CloudEvents HTTP request is `application/octet-stream`. The WebSocket frame can be in `text` format for text message frames or UTF-8-encoded binaries for `binary` message frames.
245245

246246
The service declines the client if the message doesn't match the prescribed format.
247+
248+
### Ping
249+
250+
The client can send a `PingMessage` to the service to enable the Web PubSub service to detect the client's liveness.
251+

articles/azure-web-pubsub/reference-json-reliable-webpubsub-subprotocol.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Reliable PubSub WebSocket client must send a sequence ack message once it receiv
6060

6161
## Responses
6262

63-
Messages received by the client can be several types: `ack`, `message`, and `system`. Messages with type `message` have `sequenceId` property. Client must send a [Sequence Ack](#sequence-ack) to the service once it receives a message.
63+
Messages received by the client can be several types: `ack`, `message`, `system`, and `pong`. Messages with type `message` have `sequenceId` property. Client must send a [Sequence Ack](#sequence-ack) to the service once it receives a message.
6464

6565
### Ack response
6666

@@ -162,7 +162,19 @@ If the REST API is sending a string `Hello World` using `application/json` conte
162162

163163
### System response
164164

165-
The Web PubSub service can return system-related responses to the client.
165+
The Web PubSub service can return system-related responses to the client.
166+
167+
### Pong response
168+
169+
The Web PubSub service sends a `pong` message to the client when it receives a `ping` message from the client.
170+
171+
Format:
172+
173+
```json
174+
{
175+
"type": "pong",
176+
}
177+
```
166178

167179
#### Connected
168180

articles/azure-web-pubsub/reference-json-webpubsub-subprotocol.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Message types received by the client can be:
4545
* ack - The response to a request containing an `ackId`.
4646
* message - Messages from the group or server.
4747
* system - Messages from the Web PubSub service.
48+
* pong - The response to a `ping` message.
4849

4950
### Ack response
5051

@@ -142,7 +143,19 @@ If the REST API is sending a string `Hello World` using `application/json` conte
142143

143144
### System response
144145

145-
The Web PubSub service sends system-related messages to clients.
146+
The Web PubSub service sends system-related messages to clients.
147+
148+
### Pong response
149+
150+
The Web PubSub service sends a `pong` message to the client when it receives a `ping` message from the client.
151+
152+
Format:
153+
154+
```json
155+
{
156+
"type": "pong",
157+
}
158+
```
146159

147160
#### Connected
148161

articles/azure-web-pubsub/reference-protobuf-reliable-webpubsub-subprotocol.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ message UpstreamMessage {
4747
EventMessage event_message = 5;
4848
JoinGroupMessage join_group_message = 6;
4949
LeaveGroupMessage leave_group_message = 7;
50+
SequenceAckMessage sequence_ack_message = 8;
51+
PingMessage ping_message = 9;
5052
}
5153
5254
message SendToGroupMessage {
@@ -75,6 +77,9 @@ message UpstreamMessage {
7577
message SequenceAckMessage {
7678
uint64 sequence_id = 1;
7779
}
80+
81+
message PingMessage {
82+
}
7883
}
7984
8085
message MessageData {
@@ -104,6 +109,7 @@ message DownstreamMessage {
104109
AckMessage ack_message = 1;
105110
DataMessage data_message = 2;
106111
SystemMessage system_message = 3;
112+
PongMessage pong_message = 4;
107113
}
108114
109115
message AckMessage {
@@ -140,6 +146,9 @@ message DownstreamMessage {
140146
string reason = 2;
141147
}
142148
}
149+
150+
message PongMessage {
151+
}
143152
}
144153
```
145154

@@ -170,7 +179,11 @@ The sender's `dataType` will cause one of the following messages to be sent:
170179

171180
### System response
172181

173-
The Web PubSub service can also send system-related responses to the client.
182+
The Web PubSub service can also send system-related responses to the client.
183+
184+
### Pong response
185+
186+
The Web PubSub service sends a `PongMessage` to the client when it receives a `PingMessage` from the client.
174187

175188
#### Connected
176189

articles/azure-web-pubsub/reference-protobuf-webpubsub-subprotocol.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ message UpstreamMessage {
4747
EventMessage event_message = 5;
4848
JoinGroupMessage join_group_message = 6;
4949
LeaveGroupMessage leave_group_message = 7;
50+
SequenceAckMessage sequence_ack_message = 8;
51+
PingMessage ping_message = 9;
5052
}
5153
5254
message SendToGroupMessage {
@@ -70,6 +72,9 @@ message UpstreamMessage {
7072
string group = 1;
7173
optional uint64 ack_id = 2;
7274
}
75+
76+
message PingMessage {
77+
}
7378
}
7479
7580
message MessageData {
@@ -93,6 +98,7 @@ message DownstreamMessage {
9398
AckMessage ack_message = 1;
9499
DataMessage data_message = 2;
95100
SystemMessage system_message = 3;
101+
PongMessage pong_message = 4;
96102
}
97103
98104
message AckMessage {
@@ -127,10 +133,13 @@ message DownstreamMessage {
127133
string reason = 2;
128134
}
129135
}
136+
137+
message PongMessage {
138+
}
130139
}
131140
```
132141

133-
Messages received by the client can be in any of three types: `ack`, `message`, or `system`.
142+
Messages received by the client can be in any of three types: `ack`, `message`, `system` or `pong`.
134143

135144
### Ack response
136145

@@ -157,7 +166,7 @@ The sender's `dataType` will cause one of the following messages to be sent:
157166

158167
### System response
159168

160-
The Web PubSub service can also send system-related responses to the client.
169+
The Web PubSub service can also send system-related responses to the client.
161170

162171
#### Connected
163172

@@ -167,6 +176,10 @@ When the client connects to the service, you receive a `DownstreamMessage.System
167176

168177
When the server closes the connection or the service declines the client, you receive a `DownstreamMessage.SystemMessage.DisconnectedMessage` message.
169178

179+
### Pong response
180+
181+
The Web PubSub service sends a `PongMessage` to the client when it receives a `PingMessage` from the client.
182+
170183
## Next steps
171184

172185
[!INCLUDE [next step](includes/include-next-step.md)]

articles/backup/azure-file-share-support-matrix.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support Matrix for Azure file share backup by using Azure Backup
33
description: Provides a summary of support settings and limitations when backing up Azure file shares.
44
ms.topic: reference
5-
ms.date: 11/20/2024
5+
ms.date: 11/27/2024
66
ms.custom: references_regions, engagement-fy24
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
@@ -28,7 +28,9 @@ Azure file shares backup is available in all regions, **except** for Germany Cen
2828

2929
# [Vault-standard tier (preview)](#tab/vault-tier)
3030

31-
Vaulted backup for Azure Files (preview) is available in West Central US, Southeast Asia, UK South, East Asia, UK West, India Central.
31+
Vaulted backup for Azure Files (preview) is available in the following regions: UK South, UK West, Southeast Asia, East Asia, West Central US, Central US, Central India, North Europe, Australia East, West US, East US, South India, France Central, Canada Central, North Central US, East US 2, Australia Southeast, Germany North, France South, West US 2, Brazil South, Japan West, Germany West Central, Canada East, Korea South, Jio India West, Korea Central, South Africa West, Japan East, Norway East, Switzerland West, Norway West, South Africa North, UAE North, West Europe, Sweden Central, Switzerland North.
32+
33+
Cross Region Restore is currently not supported in Sweden Central, UAE North, Jio India West.
3234

3335
---
3436

0 commit comments

Comments
 (0)