Merge pull request #98927 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)

Author: rmca14

articles/active-directory/develop/msal-net-migration-ios-broker.md

@@ -143,7 +143,7 @@ result = await app.AcquireTokenInteractive(scopes)
 </table>
 
 ### Step 3: Update AppDelegate to handle the callback
-Both ADAL and MSAL call the broker, and the broker in turn calls back to your application through the `OpenUrl` method of the `AppDelegate` class. For more information, see [this documentation](msal-net-use-brokers-with-xamarin-apps.md#step-2-update-appdelegate-to-handle-the-callback).
+Both ADAL and MSAL call the broker, and the broker in turn calls back to your application through the `OpenUrl` method of the `AppDelegate` class. For more information, see [this documentation](msal-net-use-brokers-with-xamarin-apps.md#step-3-update-appdelegate-to-handle-the-callback).
 
 There are no changes here between ADAL.NET and MSAL.NET.
 
@@ -217,6 +217,7 @@ Uses
 <key>LSApplicationQueriesSchemes</key>
 <array>
      <string>msauthv2</string>
+     <string>msauthv3</string>
 </array>
 ```
 </table>
@@ -243,7 +244,7 @@ Example:
 
 </table>
 
-For more information about how to register the redirect URI in the portal, see [Leverage the broker in Xamarin.iOS applications](msal-net-use-brokers-with-xamarin-apps.md#step-7-make-sure-the-redirect-uri-is-registered-with-your-app).
+For more information about how to register the redirect URI in the portal, see [Leverage the broker in Xamarin.iOS applications](msal-net-use-brokers-with-xamarin-apps.md#step-8-make-sure-the-redirect-uri-is-registered-with-your-app).
 
 ## Next steps
 

articles/active-directory/develop/msal-net-use-brokers-with-xamarin-apps.md

@@ -43,7 +43,21 @@ var app = PublicClientApplicationBuilder
                 .Build();
 ```
 
-### Step 2: Update AppDelegate to handle the callback
+### Step 2: Enable keychain access
+
+To enable keychain access, your application must have a keychain access group. You can use the `WithIosKeychainSecurityGroup()` API to set your keychain access group when you create your application:
+
+```csharp
+var builder = PublicClientApplicationBuilder
+     .Create(ClientId)
+      
+     .WithIosKeychainSecurityGroup("com.microsoft.adalcache")
+     .Build();
+```
+
+For more information, see [Enable keychain access](msal-net-xamarin-ios-considerations.md#enable-keychain-access).
+
+### Step 3: Update AppDelegate to handle the callback
 When the Microsoft Authentication Library for .NET (MSAL.NET) calls the broker, the broker in turn calls back to your application through the `OpenUrl` method of the `AppDelegate` class. Because MSAL waits for the response from the broker, your application needs to cooperate to call MSAL.NET back. To enable this cooperation, update the `AppDelegate.cs` file to override the following method.
 
 ```csharp
@@ -68,7 +82,7 @@ public override bool OpenUrl(UIApplication app, NSUrl url,
 
 This method is invoked every time the application is launched. It's used as an opportunity to process the response from the broker and complete the authentication process initiated by MSAL.NET.
 
-### Step 3: Set a UIViewController()
+### Step 4: Set a UIViewController()
 Still in `AppDelegate.cs`, you need to set an object window. Normally, with Xamarin iOS, you don't need to set the object window. To send and receive responses from the broker, you need an object window. 
 
 To do this, you do two things. 
@@ -94,7 +108,7 @@ result = await app.AcquireTokenInteractive(scopes)
              .ExecuteAsync();
 ```
 
-### Step 4: Register a URL scheme
+### Step 5: Register a URL scheme
 MSAL.NET uses URLs to invoke the broker and then return the broker response back to your app. To finish the round trip, register a URL scheme for your app in the `Info.plist` file.
 
 The `CFBundleURLSchemes` name must include `msauth.` as a prefix, followed by your `CFBundleURLName`.
@@ -124,7 +138,7 @@ The `CFBundleURLSchemes` name must include `msauth.` as a prefix, followed by yo
     </array>
 ```
 
-### Step 5: Add the broker identifier to the LSApplicationQueriesSchemes section
+### Step 6: Add the broker identifier to the LSApplicationQueriesSchemes section
 MSAL uses `–canOpenURL:` to check if the broker is installed on the device. In iOS 9, Apple locked down what schemes an application can query for. 
 
 Add `msauthv2` to the `LSApplicationQueriesSchemes` section of the `Info.plist` file.
@@ -133,10 +147,11 @@ Add `msauthv2` to the `LSApplicationQueriesSchemes` section of the `Info.plist`
 <key>LSApplicationQueriesSchemes</key>
     <array>
       <string>msauthv2</string>
+      <string>msauthv3</string>
     </array>
 ```
 
-### Step 6: Register your redirect URI in the application portal
+### Step 7: Register your redirect URI in the application portal
 Using the broker adds an extra requirement on your redirect URI. The redirect URI _must_ have the following format:
 ```csharp
 $"msauth.{BundleId}://auth"
@@ -147,7 +162,7 @@ public static string redirectUriOnIos = "msauth.com.yourcompany.XForms://auth";
 ```
 Notice that the redirect URI matches the `CFBundleURLSchemes` name you included in the `Info.plist` file.
 
-### Step 7: Make sure the redirect URI is registered with your app
+### Step 8: Make sure the redirect URI is registered with your app
 
 This redirect URI needs to be registered on the app registration portal (https://portal.azure.com) as a valid redirect URI for your application. 
 
@@ -181,4 +196,4 @@ The MSAL Android native library already supports it. For details see [Brokered a
 
 ## Next steps
 
-Learn about [Universal Windows Platform-specific considerations with MSAL.NET](msal-net-uwp-considerations.md).
+Learn about [Universal Windows Platform-specific considerations with MSAL.NET](msal-net-uwp-considerations.md).

articles/azure-functions/functions-host-json.md

@@ -90,11 +90,15 @@ The following sections of this article explain each top-level property. All are
 
 This setting is a child of [logging](#logging).
 
-Controls the [sampling feature in Application Insights](./functions-monitoring.md#configure-sampling).
+Controls options for Application Insights, including [sampling options](./functions-monitoring.md#configure-sampling).
 
 ```json
 {
-    "applicationInsights": {
+    "applicationInsights": {        
+        "enableDependencyTracking": true,
+        "enablePerformanceCountersCollection": true,
+        "samplingExcludedTypes": "Trace;Exception",
+        "samplingIncludedTypes": "Request;Dependency",
         "samplingSettings": {
           "isEnabled": true,
           "maxTelemetryItemsPerSecond" : 20
@@ -108,11 +112,12 @@ Controls the [sampling feature in Application Insights](./functions-monitoring.m
 
 |Property  |Default | Description |
 |---------|---------|---------| 
-|isEnabled|true|Enables or disables sampling.| 
-|maxTelemetryItemsPerSecond|20|The threshold at which sampling begins.| 
-|EnableLiveMetrics |true|Enables live metrics collection.|
-|EnableDependencyTracking|true|Enables dependency tracking.|
-|EnablePerformanceCountersCollection|true|Enables Kudu performance counters collection.|
+|enableDependencyTracking|true|Enables dependency tracking.|
+|enablePerformanceCountersCollection|true|Enables performance counters collection.|
+|samplingExcludedTypes|null|A semi-colon delimited list of types that you do not want to be sampled. Recognized types are: Dependency, Event, Exception, PageView, Request, Trace. All instances of the specified types are transmitted; the types that are not specified are sampled.| 
+|samplingIncludedTypes|null|A semi-colon delimited list of types that you want to be sampled. Recognized types are: Dependency, Event, Exception, PageView, Request, Trace. The specified types are sampled; all instances of the other types will always be transmitted.|
+|samplingSettings.isEnabled|true|Enables or disables sampling.| 
+|samplingSettings.maxTelemetryItemsPerSecond|20|The threshold at which sampling begins.|
 
 ## cosmosDb
 

articles/machine-learning/service/how-to-label-images.md

@@ -12,7 +12,7 @@ ms.date: 11/04/2019
 
 # Tag images in a labeling project
 
-After your project administrator creates a labeling project in Azure Machine Learning, you can use the labeling tool to rapidly prepare data for a Machine Learning project. This article describes:
+After your project administrator [creates a labeling project](https://docs.microsoft.com/azure/machine-learning/service/how-to-create-labeling-projects#create-a-labeling-project) in Azure Machine Learning, you can use the labeling tool to rapidly prepare data for a Machine Learning project. This article describes:
 
 > [!div class="checklist"]
 > * How to access your labeling projects

articles/migrate/tutorial-prepare-vmware.md

@@ -119,7 +119,7 @@ Check appliance requirements before you deploy the appliance.
 
 1. [Verify](migrate-support-matrix-vmware.md#assessment-appliance-requirements) appliance requirements and limitations.
 2. If you're using a URL-based firewall proxy, [review](migrate-support-matrix-vmware.md#assessment-url-access-requirements) the Azure URLs that the appliance will need to access. Make sure that the proxy resolves any CNAME records received while looking up the URLs.
-3. Review the [performance data](migrate-appliance.md#collected-performance-data-vmware)] and [metadata](migrate-appliance.md#collected-metadata-vmware) that the appliance collects during discovery and assessment.
+3. Review the [performance data](migrate-appliance.md#collected-performance-data-vmware) and [metadata](migrate-appliance.md#collected-metadata-vmware) that the appliance collects during discovery and assessment.
 4. [Note](migrate-support-matrix-vmware.md#assessment-port-requirements) the ports accessed by the appliance.
 5. On vCenter Server, make sure that your account has permissions to create a VM using an OVA file. You deploy the Azure Migrate appliance as a VMware VM, using an OVA file.