Merge pull request #183976 from AlexandraKemperMS/Net6ASPNETConfig

Adding .NET 6 support for ASP.NET Quicktstart

Author: Court72

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

@@ -7,7 +7,7 @@ ms.service: azure-app-configuration
 ms.devlang: csharp
 ms.custom: devx-track-csharp, contperf-fy21q1, mode-other
 ms.topic: quickstart
-ms.date: 09/25/2020
+ms.date: 1/3/2022
 ms.author: alkemper
 #Customer intent: As an ASP.NET Core developer, I want to learn how to manage all my app settings in one place.
 ---
@@ -71,61 +71,115 @@ dotnet new mvc --no-https --output TestAppConfig
 
     Access this secret using the .NET Core Configuration API. A colon (`:`) works in the configuration name with the Configuration API on all supported platforms. For more information, see [Configuration keys and values](/aspnet/core/fundamentals/configuration#configuration-keys-and-values).
 
-1. In *Program.cs*, add a reference to the .NET Core Configuration API namespace:
+1. Select the correct syntax based on your environment.
 
-    ```csharp
-    using Microsoft.Extensions.Configuration;
-    ```
-
-1. Update the `CreateWebHostBuilder` method to use App Configuration by calling the `AddAzureAppConfiguration` method.
-
-    > [!IMPORTANT]
-    > `CreateHostBuilder` replaces `CreateWebHostBuilder` in .NET Core 3.x. Select the correct syntax based on your environment.
-
-     #### [.NET 5.x](#tab/core5x)
+    #### [.NET 6.x](#tab/core6x)
+    In *Program.cs*, replace its content with the following code: 
 
     ```csharp
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-                webBuilder.ConfigureAppConfiguration(config =>
-                {
-                    var settings = config.Build();
-                    var connection = settings.GetConnectionString("AppConfig");
-                    config.AddAzureAppConfiguration(connection);
-                }).UseStartup<Startup>());
+    var builder = WebApplication.CreateBuilder(args);
+    //Retrieve the Connection String from the secrets manager 
+    var connectionString = builder.Configuration["AppConfig"];
+    
+    builder.Host.ConfigureAppConfiguration(builder =>
+                    {
+                        //Connect to your App Config Store using the connection string
+                        builder.AddAzureAppConfiguration(connectionString);
+                    })
+                .ConfigureServices(services =>
+                    {
+                        services.AddControllersWithViews();
+                    });
+
+    var app = builder.Build();
+    
+    // Configure the HTTP request pipeline.
+    if (!app.Environment.IsDevelopment())
+    {
+        app.UseExceptionHandler("/Home/Error");
+    }
+    app.UseStaticFiles(); 
+    
+    app.UseRouting();
+    
+    app.UseAuthorization();
+    
+    app.MapControllerRoute(
+        name: "default",
+        pattern: "{controller=Home}/{action=Index}/{id?}");
+    
+    app.Run();
     ```
+    
+    #### [.NET 5.x](#tab/core5x)
+    
+    1. In *Program.cs*, add a reference to the .NET Core Configuration API namespace:
+    
+        ```csharp
+        using Microsoft.Extensions.Configuration;
+        ```
+
+    1. Update the `CreateHostBuilder` method to use App Configuration by calling the `AddAzureAppConfiguration` method.
+    
+        ```csharp
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                    webBuilder.ConfigureAppConfiguration(config =>
+                    {
+                        var settings = config.Build();
+                        var connection = settings.GetConnectionString("AppConfig");
+                        config.AddAzureAppConfiguration(connection);
+                    }).UseStartup<Startup>());
+        ```
     #### [.NET Core 3.x](#tab/core3x)
 
-    ```csharp
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-                webBuilder.ConfigureAppConfiguration(config =>
+    > [!IMPORTANT]
+    > `CreateHostBuilder` in .NET 3.x replaces `CreateWebHostBuilder` in .NET Core 2.x. 
+
+    1. In *Program.cs*, add a reference to the .NET Core Configuration API namespace:
+    
+        ```csharp
+        using Microsoft.Extensions.Configuration;
+        ```
+    1. Update the `CreateHostBuilder` method to use App Configuration by calling the `AddAzureAppConfiguration` method.
+    
+        ```csharp
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                    webBuilder.ConfigureAppConfiguration(config =>
+                    {
+                        var settings = config.Build();
+                        var connection = settings.GetConnectionString("AppConfig");
+                        config.AddAzureAppConfiguration(connection);
+                    }).UseStartup<Startup>());
+        ```
+    
+    #### [.NET Core 2.x](#tab/core2x)
+    
+    1. In *Program.cs*, add a reference to the .NET Core Configuration API namespace:
+    
+        ```csharp
+        using Microsoft.Extensions.Configuration;
+        ```
+    
+    1. Update the `CreateWebHostBuilder` method to use App Configuration by calling the `AddAzureAppConfiguration` method.
+    
+        ```csharp
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .ConfigureAppConfiguration(config =>
                 {
                     var settings = config.Build();
                     var connection = settings.GetConnectionString("AppConfig");
                     config.AddAzureAppConfiguration(connection);
-                }).UseStartup<Startup>());
-    ```
-
-    #### [.NET Core 2.x](#tab/core2x)
-
-    ```csharp
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .ConfigureAppConfiguration(config =>
-            {
-                var settings = config.Build();
-                var connection = settings.GetConnectionString("AppConfig");
-                config.AddAzureAppConfiguration(connection);
-            })
-            .UseStartup<Startup>();
-    ```
-
-    ---
+                })
+                .UseStartup<Startup>();
+        ```  
+---
 
-    With the preceding change, the [configuration provider for App Configuration](/dotnet/api/Microsoft.Extensions.Configuration.AzureAppConfiguration) has been registered with the .NET Core Configuration API.
+This code will connect to your App Configuration store using a connection string and load all keys that have the *TestApp* prefix from a previous step. For more information on the configuration provider APIs, reference the [configuration provider for App Configuration docs](/dotnet/api/Microsoft.Extensions.Configuration.AzureAppConfiguration). 
 
 ## Read from the App Configuration store
 
@@ -171,7 +225,7 @@ In the preceding code, the App Configuration store's keys are used as follows:
     dotnet run
     ```
 
-1. If you're working on your local machine, use a browser to navigate to `http://localhost:5000`. This address is the default URL for the locally hosted web app. If you're working in the Azure Cloud Shell, select the **Web Preview** button followed by **Configure**.
+1. If you're working on your local machine, use a browser to navigate to `http://localhost:5000` or as specified in the command output. This address is the default URL for the locally hosted web app. If you're working in the Azure Cloud Shell, select the **Web Preview** button followed by **Configure**.
 
     ![Locate the Web Preview button](./media/quickstarts/cloud-shell-web-preview.png)
 

includes/azure-app-configuration-add-secret-manager.md

@@ -2,6 +2,28 @@
 
 A tool called Secret Manager stores sensitive data for development work outside of your project tree. This approach helps prevent the accidental sharing of app secrets within source code. Complete the following steps to enable the use of Secret Manager in the ASP.NET Core project:
 
+#### [.NET 6.x](#tab/core6x)
+
+Navigate to the project's root directory, and run the following command to enable secrets storage in the project:
+
+```dotnetcli
+dotnet user-secrets init
+```
+
+A `UserSecretsId` element containing a GUID is added to the *.csproj* file:
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>8296b5b7-6db3-4ae9-a590-899ac642c0d7</UserSecretsId>
+  </PropertyGroup>
+
+</Project>
+```
 #### [.NET 5.x](#tab/core5x)
 
 Navigate to the project's root directory, and run the following command to enable secrets storage in the project:

includes/azure-app-configuration-create.md

@@ -7,12 +7,13 @@ ms.date: 1/31/2020
 ---
 
 1. To create a new App Configuration store, sign in to the [Azure portal](https://portal.azure.com). In the upper-left corner of the home page, select **Create a resource**. In the **Search the Marketplace** box, enter *App Configuration* and select <kbd>Enter</kbd>.
-
-    ![Search for App Configuration](media/azure-app-configuration-create/azure-portal-search.png)
+    
+    :::image type="content" source="media/azure-app-configuration-create/azure-portal-search.png" alt-text="Search for App Configuration":::
+    
 
 1. Select **App Configuration** from the search results, and then select **Create**.
 
-    ![Select Create](media/azure-app-configuration-create/azure-portal-app-configuration-create.png)
+    :::image type="content" source="media/azure-app-configuration-create/azure-portal-app-configuration-create.png" alt-text="Select Create":::
 
 1. On the **Create App Configuration** pane, enter the following settings: