Resolved Conflict

Author: Sreekanth Iyer (Ushta Te Consultancy Services)

articles/azure-app-configuration/enable-dynamic-configuration-aspnet-netfx.md

@@ -7,7 +7,7 @@ ms.service: azure-app-configuration
 ms.devlang: csharp
 ms.custom: devx-track-csharp, devx-track-dotnet
 ms.topic: tutorial
-ms.date: 03/20/2023
+ms.date: 03/19/2025
 ms.author: zhenlwa
 #Customer intent: I want to dynamically update my ASP.NET web application (.NET Framework) to use the latest configuration data in App Configuration.
 ---
@@ -52,15 +52,35 @@ Add the following key-values to the App Configuration store and leave **Label**
 
 ## Reload data from App Configuration
 
-1. Right-click your project and select **Manage NuGet Packages**. On the **Browse** tab, search and add the latest version of the following NuGet package to your project.
+1. Right-click your project and select **Manage NuGet Packages**. On the **Browse** tab, search and add the latest version of the following NuGet packages to your project.
 
-   *Microsoft.Extensions.Configuration.AzureAppConfiguration*
+    ### [Microsoft Entra ID (recommended)](#tab/entra-id)
+
+    - *Microsoft.Extensions.Configuration.AzureAppConfiguration*
+    - *Azure.Identity*
+
+    ### [Connection string](#tab/connection-string)
+    
+    - *Microsoft.Extensions.Configuration.AzureAppConfiguration*
+    ---
 
 1. Open *Global.asax.cs* file and add following namespaces.
+
+    ### [Microsoft Entra ID (recommended)](#tab/entra-id)
+
+    ```csharp
+    using Azure.Identity;
+    using Microsoft.Extensions.Configuration;
+    using Microsoft.Extensions.Configuration.AzureAppConfiguration;
+    ```
+
+    ### [Connection string](#tab/connection-string)
+
     ```csharp
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Configuration.AzureAppConfiguration;
     ```
+    ---
 
 1. Add the following static member variables to the `Global` class.
     ```csharp
@@ -69,27 +89,57 @@ Add the following key-values to the App Configuration store and leave **Label**
     ```
 
 1. Add an `Application_Start` method to the `Global` class. If the method already exists, add the following code to it.
+
+   ### [Microsoft Entra ID (recommended)](#tab/entra-id)
+
+    ```csharp
+    protected void Application_Start(object sender, EventArgs e)
+    {
+        ConfigurationBuilder builder = new ConfigurationBuilder();
+        builder.AddAzureAppConfiguration(options =>
+        {
+            string endpoint = Environment.GetEnvironmentVariable("Endpoint"); 
+            options.Connect(new Uri(endpoint), new DefaultAzureCredential())
+                   // Load all keys that start with `TestApp:` and have no label.
+                   .Select("TestApp:*")
+                   // Configure to reload configuration if the registered key 'TestApp:Settings:Sentinel' is modified.
+                   .ConfigureRefresh(refresh => 
+                   {
+                       refresh.Register("TestApp:Settings:Sentinel", refreshAll:true)
+                              .SetCacheExpiration(new TimeSpan(0, 5, 0));
+                   });
+            _configurationRefresher = options.GetRefresher();
+        });
+
+        Configuration = builder.Build();
+    }
+    ```
+
+    ### [Connection string](#tab/connection-string)
+
     ```csharp
     protected void Application_Start(object sender, EventArgs e)
     {
         ConfigurationBuilder builder = new ConfigurationBuilder();
         builder.AddAzureAppConfiguration(options =>
         {
             options.Connect(Environment.GetEnvironmentVariable("ConnectionString"))
-                    // Load all keys that start with `TestApp:` and have no label.
-                    .Select("TestApp:*")
-                    // Configure to reload configuration if the registered key 'TestApp:Settings:Sentinel' is modified.
-                    .ConfigureRefresh(refresh => 
-                    {
-                        refresh.Register("TestApp:Settings:Sentinel", refreshAll:true)
-                               .SetCacheExpiration(new TimeSpan(0, 5, 0));
-                    });
+                   // Load all keys that start with `TestApp:` and have no label.
+                   .Select("TestApp:*")
+                   // Configure to reload configuration if the registered key 'TestApp:Settings:Sentinel' is modified.
+                   .ConfigureRefresh(refresh => 
+                   {
+                       refresh.Register("TestApp:Settings:Sentinel", refreshAll:true)
+                              .SetCacheExpiration(new TimeSpan(0, 5, 0));
+                   });
             _configurationRefresher = options.GetRefresher();
         });
 
         Configuration = builder.Build();
     }
     ```
+    ---
+
     The `Application_Start` method is called upon the first request to your web application. It is called only once during the application's life cycle. As such it is a good place to initialize your `IConfiguration` object and load data from App Configuration.
 
     In the `ConfigureRefresh` method, a key within your App Configuration store is registered for change monitoring. The `refreshAll` parameter to the `Register` method indicates that all configuration values should be refreshed if the registered key changes. In this example, the key *TestApp:Settings:Sentinel* is a *sentinel key* that you update after you complete the change of all other keys. When a change is detected, your application refreshes all configuration values. This approach helps to ensure the consistency of configuration in your application compared to monitoring all keys for changes.
@@ -160,7 +210,33 @@ Add the following key-values to the App Configuration store and leave **Label**
 
 ## Build and run the application
 
-1. Set an environment variable named **ConnectionString** to the read-only key connection string obtained during your App Configuration store creation.
+1. Set an environment variable.
+
+    ### [Microsoft Entra ID (recommended)](#tab/entra-id)
+
+    Set an environment variable named `Endpoint` to the endpoint of your App Configuration store found under the **Overview** of your store in the Azure portal.
+
+    If you use the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
+
+    ```cmd
+    setx Endpoint "<endpoint-of-your-app-configuration-store>"
+    ```
+
+    If you use PowerShell, run the following command:
+
+    ```powershell
+    $Env:Endpoint = "<endpoint-of-your-app-configuration-store>"
+    ```
+
+    If you use macOS or Linux, run the following command:
+
+    ```bash
+    export Endpoint='<endpoint-of-your-app-configuration-store>'
+    ```
+
+    ### [Connection string](#tab/connection-string)
+
+    Set an environment variable named `ConnectionString` to the read-only key connection string found under **Access settings** of your store in the Azure portal.
 
     If you use the Windows command prompt, run the following command:
     ```console
@@ -172,6 +248,13 @@ Add the following key-values to the App Configuration store and leave **Label**
     $Env:ConnectionString = "<connection-string-of-your-app-configuration-store>"
     ```
 
+    If you use macOS or Linux, run the following command:
+
+    ```bash
+    export ConnectionString='<connection-string-of-your-app-configuration-store>'
+    ```
+    ---
+
 1. Restart Visual Studio to allow the change to take effect. 
 
 1. Press Ctrl + F5 to build and run the web application.

articles/azure-app-configuration/enable-dynamic-configuration-dotnet-core.md

@@ -9,7 +9,7 @@ ms.service: azure-app-configuration
 ms.devlang: csharp
 ms.custom: devx-track-csharp, devx-track-dotnet
 ms.topic: tutorial
-ms.date: 02/20/2024
+ms.date: 03/19/2025
 ms.author: malev
 #Customer intent: I want to dynamically update my .NET app to use the latest configuration data in App Configuration.
 ---
@@ -33,24 +33,28 @@ Finish the quickstart [Create a .NET app with App Configuration](./quickstart-do
 
 ## Activity-driven configuration refresh
 
-Open *Program.cs* and update the file with the following code.
+Open *Program.cs* and update the file with the following code. You can connect to App Configuration using either Microsoft Entra ID (recommended) or a connection string. The following code snippet demonstrates using Microsoft Entra ID.
+
+You use the `DefaultAzureCredential` to authenticate to your App Configuration store. While completing the quickstart listed in the prerequisites, you already [assigned your credential the **App Configuration Data Reader role**](./concept-enable-rbac.md#authentication-with-token-credentials).
 
 ```csharp
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.AzureAppConfiguration;
+using Azure.Identity;
 
 IConfiguration _configuration = null;
 IConfigurationRefresher _refresher = null;
 
 var builder = new ConfigurationBuilder();
 builder.AddAzureAppConfiguration(options =>
 {
-    options.Connect(Environment.GetEnvironmentVariable("ConnectionString"))
-            .ConfigureRefresh(refresh =>
-            {
-                refresh.Register("TestApp:Settings:Message")
-                       .SetCacheExpiration(TimeSpan.FromSeconds(10));
-            });
+    string endpoint = Environment.GetEnvironmentVariable("Endpoint"); 
+    options.Connect(new Uri(endpoint), new DefaultAzureCredential())
+           .ConfigureRefresh(refresh =>
+           {
+               refresh.Register("TestApp:Settings:Message")
+                      .SetCacheExpiration(TimeSpan.FromSeconds(10));
+           });
 
     _refresher = options.GetRefresher();
 });
@@ -114,22 +118,24 @@ In the previous code, you're manually saving an instance of `IConfigurationRefre
 
 ## Build and run the app locally
 
-1. Set an environment variable named **ConnectionString**, and set it to the access key to your App Configuration store. If you use the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
+1. Set an environment variable named **Endpoint** to the endpoint of your App Configuration store found under the *Overview* of your store in the Azure portal.
 
-    ```console
-     setx ConnectionString "<connection-string-of-your-app-configuration-store>"
+    If you use the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
+
+    ```cmd
+    setx Endpoint "<endpoint-of-your-app-configuration-store>"
     ```
 
-    If you use Windows PowerShell, run the following command:
+    If you use PowerShell, run the following command:
 
     ```powershell
-     $Env:ConnectionString = "<connection-string-of-your-app-configuration-store>"
+    $Env:Endpoint = "<endpoint-of-your-app-configuration-store>"
     ```
 
     If you use macOS or Linux, run the following command:
 
-    ```console
-     export ConnectionString='<connection-string-of-your-app-configuration-store>'
+    ```bash
+    export Endpoint='<endpoint-of-your-app-configuration-store>'
     ```
 
 1. Run the following command to build the console app: