Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mqtt-broker-batch2

Author: paulth1

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/defender-for-iot/organizations/appliance-catalog/virtual-management-hyper-v.md",
+      "redirect_url": "/previous-versions/azure/defender-for-iot/organizations/appliance-catalog/virtual-management-hyper-v",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/defender-for-iot/organizations/appliance-catalog/virtual-management-vmware.md",
+      "redirect_url": "/previous-versions/azure/defender-for-iot/organizations/appliance-catalog/virtual-management-vmware",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/defender-for-iot/organizations/api/management-alert-apis.md",
       "redirect_url": "/previous-versions/azure/defender-for-iot/organizations/api/management-alert-apis",

articles/active-directory-b2c/partner-cloudflare.md

@@ -1,7 +1,7 @@
 ---
-title: Tutorial to configure Azure Active Directory B2C with Cloudflare Web Application Firewall
+title: Configure Azure Active Directory B2C with Cloudflare Web Application Firewall
 titleSuffix: Azure AD B2C
-description: Tutorial to configure Azure Active Directory B2C with Cloudflare Web application firewall and protect applications from malicious attacks 
+description: Configure Azure Active Directory B2C with Cloudflare Web application firewall and protect applications from malicious attacks 
 author: gargi-sinha
 manager: martinco
 ms.reviewer: kengaderdus
@@ -13,9 +13,9 @@ ms.subservice: b2c
 
 # Customer intent: I'm a developer configuring Azure AD B2C with Cloudflare WAF. I need to enable and configure the Web Application Firewall, so I can protect my application from malicious attacks such as SQL Injection and cross-site scripting (XSS).
 ---
-# Tutorial: Configure Cloudflare Web Application Firewall with Azure Active Directory B2C
+# Configure Cloudflare Web Application Firewall with Azure Active Directory B2C
 
-In this tutorial, you can learn how to configure the [Cloudflare Web Application Firewall (WAF)](https://www.cloudflare.com/application-services/products/waf/) solution for Azure Active Directory B2C (Azure AD B2C) tenant with custom domain. Use Cloudflare WAF to help protect organizations from malicious attacks that can exploit vulnerabilities such as SQL Injection, and cross-site scripting (XSS).
+In this article, you can learn how to configure the [Cloudflare Web Application Firewall (WAF)](https://www.cloudflare.com/application-services/products/waf/) solution for Azure Active Directory B2C (Azure AD B2C) tenant with custom domain. Use Cloudflare WAF to help protect organizations from malicious attacks that can exploit vulnerabilities such as SQL Injection, and cross-site scripting (XSS).
 
 ## Prerequisites
 

articles/azure-app-configuration/feature-management-dotnet-reference.md

@@ -275,7 +275,7 @@ configurationBuilder.AddAzureAppConfiguration(options =>
 ```
 
 > [!NOTE]
-> Load balancing support is available if you use version **8.0.0-preview.3** or later of any of the following packages.
+> Load balancing support is available if you use version **8.0.0** or later of any of the following packages.
 > - `Microsoft.Extensions.Configuration.AzureAppConfiguration`
 > - `Microsoft.Azure.AppConfiguration.AspNetCore`
 > - `Microsoft.Azure.AppConfiguration.Functions.Worker`

articles/azure-app-configuration/howto-geo-replication.md

@@ -199,68 +199,26 @@ In this section, you create a web application that allows users to sign in and u
 
 ## Enable targeting for the web application
 
-The targeting filter evaluates a user's feature state based on the user's targeting context, which comprises the user ID and the groups the user belongs to. In this example, you use the signed-in user's email address as the user ID and the domain name of the email address as the group.
+A targeting context is required for feature evaluation with targeting. You can provide it as a parameter to the `featureManager.IsEnabledAsync` API explicitly. In ASP.NET Core, the targeting context can also be provided through the service collection as an ambient context by implementing the [ITargetingContextAccessor](./feature-management-dotnet-reference.md#itargetingcontextaccessor) interface.
 
-1. Add an *ExampleTargetingContextAccessor.cs* file with the following code. You implement the `ITargetingContextAccessor` interface to provide the targeting context for the signed-in user of the current request.
+### Targeting Context Accessor
 
-    ```csharp
-    using Microsoft.FeatureManagement.FeatureFilters;
+To provide the targeting context, pass your implementation type of the `ITargetingContextAccessor` to the `WithTargeting<T>` method. If no type is provided, a default implementation is used, as shown in the following code snippet. The default targeting context accessor utilizes `HttpContext.User.Identity.Name` as `UserId` and `HttpContext.User.Claims` of type [`Role`](/dotnet/api/system.security.claims.claimtypes.role#system-security-claims-claimtypes-role) for `Groups`. You can reference the [DefaultHttpTargetingContextAccessor](https://github.com/microsoft/FeatureManagement-Dotnet/blob/main/src/Microsoft.FeatureManagement.AspNetCore/DefaultHttpTargetingContextAccessor.cs) to implement your own if customization is needed. To learn more about implementing the `ITargetingContextAccessor`, see the [feature reference for targeting](./feature-management-dotnet-reference.md#itargetingcontextaccessor).
 
-    namespace TestFeatureFlags
-    {
-        public class ExampleTargetingContextAccessor : ITargetingContextAccessor
-        {
-            private const string TargetingContextLookup = "ExampleTargetingContextAccessor.TargetingContext";
-            private readonly IHttpContextAccessor _httpContextAccessor;
-
-            public ExampleTargetingContextAccessor(IHttpContextAccessor httpContextAccessor)
-            {
-                _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
-            }
-
-            public ValueTask<TargetingContext> GetContextAsync()
-            {
-                HttpContext httpContext = _httpContextAccessor.HttpContext;
-                if (httpContext.Items.TryGetValue(TargetingContextLookup, out object value))
-                {
-                    return new ValueTask<TargetingContext>((TargetingContext)value);
-                }
-                List<string> groups = new List<string>();
-                if (httpContext.User.Identity.Name != null)
-                {
-                    groups.Add(httpContext.User.Identity.Name.Split("@", StringSplitOptions.None)[1]);
-                }
-                TargetingContext targetingContext = new TargetingContext
-                {
-                    UserId = httpContext.User.Identity.Name,
-                    Groups = groups
-                };
-                httpContext.Items[TargetingContextLookup] = targetingContext;
-                return new ValueTask<TargetingContext>(targetingContext);
-            }
-        }
-    }
-    ```
+``` C#
+// Existing code in Program.cs
+// ... ...
 
-1. Open the *Program.cs* file and enable the targeting filter by calling the `WithTargeting` method. You pass in the type `ExampleTargetingContextAccessor` that the targeting filter will use to get the targeting context during feature flag evaluation. Add `HttpContextAccessor` to the service collection to allow `ExampleTargetingContextAccessor` to access the signed-in user information from the `HttpContext`.
+// Add feature management to the container of services
+builder.Services.AddFeatureManagement()
+                .WithTargeting();
 
-    ```csharp
-    // Existing code in Program.cs
-    // ... ...
-
-    // Add feature management to the container of services
-    builder.Services.AddFeatureManagement()
-                    .WithTargeting<ExampleTargetingContextAccessor>();
+// The rest of existing code in Program.cs
+// ... ...
+```
 
-    // Add HttpContextAccessor to the container of services.
-    builder.Services.AddHttpContextAccessor();
-
-    // The rest of existing code in Program.cs
-    // ... ...
-    ```
-    
-    > [!NOTE]
-    > For Blazor applications, see [instructions](./faq.yml#how-to-enable-feature-management-in-blazor-applications-or-as-scoped-services-in--net-applications) for enabling feature management as scoped services.
+> [!NOTE]
+> For Blazor applications, see [instructions](./faq.yml#how-to-enable-feature-management-in-blazor-applications-or-as-scoped-services-in--net-applications) for enabling feature management as scoped services.
 
 ## Targeting filter in action
 
@@ -280,10 +238,6 @@ The targeting filter evaluates a user's feature state based on the user's target
 
     Now sign in as `[email protected]`, using the password you set when registering the account. The **Beta** item doesn't appear on the toolbar, because `[email protected]` is specified as an excluded user.
 
-    You can create more users with `@contoso.com` and `@contoso-xyz.com` email addresses to see the behavior of the group settings.
-
-    Users with `contoso-xyz.com` email addresses won't see the **Beta** item. While 50% of users with `@contoso.com` email addresses will see the **Beta** item, the other 50% won't see the **Beta** item.
-
 ## Next steps
 
 To learn more about the feature filters, continue to the following documents.

articles/azure-app-configuration/howto-targetingfilter-aspnet-core.md

@@ -134,10 +134,10 @@ This project will use [dependency injection in .NET Azure Functions](../azure-fu
    Add a constructor used to obtain instances of `_featureManagerSnapshot` and `IConfigurationRefresherProvider` through dependency injection. From the `IConfigurationRefresherProvider`, you can obtain the instance of `IConfigurationRefresher`.
 
     ```csharp
-    private readonly IFeatureManagerSnapshot _featureManagerSnapshot;
+    private readonly IVariantFeatureManagerSnapshot _featureManagerSnapshot;
     private readonly IConfigurationRefresher _configurationRefresher;
 
-    public Function1(IFeatureManagerSnapshot featureManagerSnapshot, IConfigurationRefresherProvider refresherProvider)
+    public Function1(IVariantFeatureManagerSnapshot featureManagerSnapshot, IConfigurationRefresherProvider refresherProvider)
     {
         _featureManagerSnapshot = featureManagerSnapshot;
         _configurationRefresher = refresherProvider.Refreshers.First();

articles/azure-app-configuration/quickstart-feature-flag-azure-functions-csharp.md

@@ -117,16 +117,16 @@ Add a feature flag called *Beta* to the App Configuration store and leave **Labe
     using Microsoft.FeatureManagement;
     ```
 
-1. Update the constructor of the `Worker` service to obtain instances of `IConfigurationRefresher` and `IFeatureManager` through dependency injection.
+1. Update the constructor of the `Worker` service to obtain instances of `IConfigurationRefresher` and `IVariantFeatureManager` through dependency injection.
 
     ```csharp
     public class Worker : BackgroundService
     {
         private readonly ILogger<Worker> _logger;
         private readonly IConfigurationRefresher _refresher;
-        private readonly IFeatureManager _featureManager;
+        private readonly IVariantFeatureManager _featureManager;
 
-        public Worker(ILogger<Worker> logger, IConfigurationRefresher refresher, IFeatureManager featureManager)
+        public Worker(ILogger<Worker> logger, IConfigurationRefresher refresher, IVariantFeatureManager featureManager)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _refresher = refresher ?? throw new ArgumentNullException(nameof(refresher));

articles/azure-app-configuration/quickstart-feature-flag-dotnet-background-service.md

@@ -40,9 +40,9 @@ You can use Visual Studio to create a new console app project.
 
 1. Start Visual Studio, and select **File** > **New** > **Project**.
 
-1. In **Create a new project**, filter on the **Console** project type and select **Console App**. If you want to create a .NET Framework app, please select **Console App (.NET Framework)** instead. Click **Next**.
+1. In **Create a new project**, filter on the **Console** project type and select **Console App**. If you want to create a .NET Framework app, select **Console App (.NET Framework)** instead. Click **Next**.
 
-1. In **Configure your new project**, enter a project name. If you are creating a .NET Framework app, please select **.NET Framework 4.7.2** or higher under **Framework**. Click **Create**.
+1. In **Configure your new project**, enter a project name. If you're creating a .NET Framework app, select **.NET Framework 4.7.2** or higher under **Framework**. Click **Create**.
 
 ## Use the feature flag
 
@@ -77,7 +77,7 @@ You can use Visual Studio to create a new console app project.
 
     IFeatureDefinitionProvider featureDefinitionProvider = new ConfigurationFeatureDefinitionProvider(configuration);
 
-    IFeatureManager featureManager = new FeatureManager(
+    IVariantFeatureManager featureManager = new FeatureManager(
         featureDefinitionProvider, 
         new FeatureManagementOptions());
 
@@ -103,7 +103,7 @@ You can use Visual Studio to create a new console app project.
 
         IFeatureDefinitionProvider featureDefinitionProvider = new ConfigurationFeatureDefinitionProvider(configuration);
 
-        IFeatureManager featureManager = new FeatureManager(
+        IVariantFeatureManager featureManager = new FeatureManager(
             featureDefinitionProvider, 
             new FeatureManagementOptions());
 
@@ -130,7 +130,7 @@ You can use Visual Studio to create a new console app project.
     setx ConnectionString "<connection-string-of-your-app-configuration-store>"
     ```
 
-    Restart the command prompt to allow the change to take effect. Print the value of the environment variable to validate that it's set properly.
+    Restart the command prompt to allow the change to take effect. Validate that it's set properly by printing the value of the environment variable.
 
     ### [PowerShell](#tab/powershell)
 

articles/azure-app-configuration/quickstart-feature-flag-dotnet.md

@@ -36,65 +36,68 @@ map.layers.add(layer);
 The following code snippet demonstrates using a simple data layer, referencing the data from an online source.
 
 ```javascript
-function InitMap()
-{
-  var map = new atlas.Map('myMap', {
-    center: [-73.967605, 40.780452],
-    zoom: 12,
-    view: "Auto",
-
-    //Add authentication details for connecting to Azure Maps.
-    authOptions: {
-      // Get an Azure Maps key at https://azuremaps.com/.
-      authType: 'subscriptionKey',
-      subscriptionKey: '{Your-Azure-Maps-Subscription-key}'
-    },
-  });    
-
-  //Wait until the map resources are ready.
-  map.events.add('ready', function () {
-
-    //Create a data source and add it to the map.
-    var datasource = new atlas.source.DataSource();
-    map.sources.add(datasource);
-
-    //Add a simple data layer for rendering data.
-    var layer = new atlas.layer.SimpleDataLayer(datasource);
-    map.layers.add(layer);
-
-    //Load an initial data set.
-    const dataSet = {
-        "type": "Feature",
-        "geometry": {
-            "type": "Point",
-            "coordinates": [0, 0]
-        },
-        "properties": {
-            "color": "red"
-        }
-    };
-    
-    loadDataSet(dataSet);
-
-    function loadDataSet(url) {
-      //Read the spatial data and add it to the map.
-      atlas.io.read(url).then(r => {
-      if (r) {
-        //Update the features in the data source.
-        datasource.setShapes(r);
-
-        //If bounding box information is known for data, set the map view to it.
-        if (r.bbox) {
-          map.setCamera({
-            bounds: r.bbox,
-            padding: 50
-          });
-        }
-      }
-      });
+<script src="https://atlas.microsoft.com/sdk/javascript/spatial/0/atlas-spatial.min.js"></script>
+
+<script>
+    function InitMap() {
+        var map = new atlas.Map("myMap", {
+            center: [-73.967605, 40.780452],
+            zoom: 12,
+            view: "Auto",
+
+            //Add authentication details for connecting to Azure Maps.
+            authOptions: {
+                // Get an Azure Maps key at https://azuremaps.com/.
+                authType: "subscriptionKey",
+                subscriptionKey: '{Your-Azure-Maps-Subscription-key}'
+            }
+        });
+
+        //Wait until the map resources are ready.
+        map.events.add("ready", function () {
+            //Create a data source and add it to the map.
+            var datasource = new atlas.source.DataSource();
+            map.sources.add(datasource);
+
+            //Add a simple data layer for rendering data.
+            var layer = new atlas.layer.SimpleDataLayer(datasource);
+            map.layers.add(layer);
+
+            //Load an initial data set.
+            const dataSet = {
+                type: "FeatureCollection",
+                bbox: [0, 0, 0, 0],
+                features: [
+                    {
+                        type: "Feature",
+                        geometry: {
+                            type: "Point",
+                            coordinates: [0, 0]
+                        },
+                        properties: {
+                            color: "red"
+                        }
+                    }
+                ]
+            };
+
+            loadDataSet(dataSet);
+
+            function loadDataSet(r) {
+                //Update the features in the data source.
+                datasource.setShapes(r);
+
+                //If bounding box information is known for data, set the map view to it.
+                if (r.bbox) {
+                    map.setCamera({
+                        bounds: r.bbox,
+                        padding: 50
+                    });
+                }
+            }
+        });
     }
-  });
-}
+</script>
 ```
 
 Once you add features to the data source, the simple data layer figures out how best to render them. Styles for individual features can be set as properties on the feature.
@@ -114,10 +117,6 @@ This sample code renders the point feature using the simple data layer, and appe
 >
 > &emsp; "coordinates": [0, 0]
 
-<!------------------------------------
-> [!VIDEO //codepen.io/azuremaps/embed/zYGzpQV/?height=500&theme-id=0&default-tab=js,result&editable=true]
------------------------------------->
-
 The real power of the simple data layer comes when:
 
 - There are several different types of features in a data source; or