Merge branch 'MicrosoftDocs:main' into main

Author: GabstaMSFT

.openpublishing.redirection.azure-monitor.json

@@ -6176,7 +6176,7 @@
             "redirect_url": "/azure/azure-monitor/app/javascript-sdk-configuration",
             "redirect_document_id": false
         },
-       {
+        {
             "source_path_from_root": "/articles/azure-monitor/agents/data-collection-firewall.md",
             "redirect_url": "/azure/azure-monitor/agents/data-collection-rule-azure-monitor-agent",
             "redirect_document_id": false
@@ -6185,6 +6185,16 @@
             "source_path_from_root": "/articles/azure-monitor/autoscale/tutorial-autoscale-performance-schedule.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/autoscale/tutorial-autoscale-performance-schedule",
             "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/azure/azure-monitor/essentials/metrics-supported.md",
+            "redirect_url": "/azure/azure-monitor/reference/supported-metrics/metrics-index",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/azure/azure-monitor/essentials/resource-logs-categories.md",
+            "redirect_url": "/azure/azure-monitor/reference/supported-logs/logs-index",
+            "redirect_document_id": false
         } 
     ]
 }

.openpublishing.redirection.json

@@ -24036,7 +24036,12 @@
         {
             "source_path_from_root": "/articles/virtual-machines/virtual-machines-reliability.md",
             "redirect_url": "/azure/virtual-machines/reliability-virtual-machines",
-            "redirect_document_id": true
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/private-link/tutorial-private-endpoint-webapp-portal.md",
+            "redirect_url": "/azure/private-link/create-private-endpoint-portal",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory/conditional-access/how-to-app-protection-policy-windows.md

@@ -23,19 +23,7 @@ App protection policies apply mobile application management (MAM) to specific ap
 
 ## Prerequisites
 
-The following requirements must be met before you can apply an [app protection policy] to Windows client devices:
-
-- Ensure your Windows client version is Windows 11, build 10.0.22621 (22H2) or newer.
-- Ensure your device isn't managed, including:
-   - Not Azure AD joined or enrolled in Mobile Device Management (MDM) for the same tenant
-as your MAM user.
-   - Not Azure AD registered (workplace joined) with more than two users besides the MAM user. There's a limit of no more than [three Azure AD registered users to a device](../devices/faq.yml#i-can-t-add-more-than-3-azure-ad-user-accounts-under-the-same-user-session-on-a-windows-10-11-device--why).
-- Clients must be running Microsoft Edge build v115.0.1901.155 or newer.
-   - You can check the version by going to `edge://settings/help` in the address bar.
-- Clients must have the **Enable MAM on Edge desktop platforms** flag enabled.
-   - You can enable this going to `edge://flags/#edge-desktop-mam` in the address bar.
-   - Enable **Enable MAM on Edge desktop platforms**
-   - Click the **Restart** button at the bottom of the window.
+Customers interested in the public preview will need to opt-in using the [MAM for Windows Public Preview Sign Up Form](https://aka.ms/MAMforWindowsPublic).
 
 ## User exclusions
 [!INCLUDE [active-directory-policy-exclusions](../../../includes/active-directory-policy-exclude-user.md)]

articles/active-directory/develop/msal-net-migration-confidential-client.md

@@ -134,12 +134,21 @@ public partial class AuthWrapper
 
  public async Task<AuthenticationResult> GetAuthenticationResult()
  {
-  if (app == null)
-  {
-   app = ConfidentialClientApplicationBuilder.Create(ClientId)
+
+   var app = ConfidentialClientApplicationBuilder.Create(ClientId)
            .WithCertificate(certificate)
            .WithAuthority(authority)
            .Build();
+
+  // Setup token caching https://learn.microsoft.com/azure/active-directory/develop/msal-net-token-cache-serialization?tabs=aspnet
+  // For example, for an in-memory cache with 1GB limit, use  
+  app.AddInMemoryTokenCache(services =>
+  {
+      // Configure the memory cache options
+      services.Configure<MemoryCacheOptions>(options =>
+      {
+          options.SizeLimit = 1024 * 1024 * 1024; // in bytes (1 GB of memory)
+      });
   }
 
   var authResult = await app.AcquireTokenForClient(
@@ -158,9 +167,9 @@ public partial class AuthWrapper
 
 #### Benefit from token caching
 
-To benefit from the in-memory cache, the instance of `IConfidentialClientApplication` must be kept in a member variable. If you re-create the confidential client app each time you request a token, you won't benefit from the token cache.
+If you don't setup token caching, the token issuer will throttle you, resulting in errors. It also takes a lot less to get a token from the cache (10-20ms) than it is from ESTS (500-30000ms).
 
-You'll need to serialize `AppTokenCache` if you don't use the default in-memory app token cache. Similarly, If you want to implement a distributed token cache, serialize `AppTokenCache`. For details, see [Token cache for a web app or web API (confidential client application)](msal-net-token-cache-serialization.md?tabs=aspnet) and the sample [active-directory-dotnet-v1-to-v2/ConfidentialClientTokenCache](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2/tree/master/ConfidentialClientTokenCache).
+If you want to implement a distributed token cache, see [Token cache for a web app or web API (confidential client application)](msal-net-token-cache-serialization.md?tabs=aspnet) and the sample [active-directory-dotnet-v1-to-v2/ConfidentialClientTokenCache](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2/tree/master/ConfidentialClientTokenCache).
 
 [Learn more about the daemon scenario](scenario-daemon-overview.md) and how it's implemented with MSAL.NET or Microsoft.Identity.Web in new applications.
 
@@ -255,14 +264,22 @@ public partial class AuthWrapper
   string resourceId,
   string tokenUsedToCallTheWebApi)
  {
-  if (app == null)
-  {
-   app = ConfidentialClientApplicationBuilder.Create(ClientId)
+ 
+  var app = ConfidentialClientApplicationBuilder.Create(ClientId)
            .WithCertificate(certificate)
            .WithAuthority(authority)
            .Build();
-  }
 
+  // Setup token caching https://learn.microsoft.com/azure/active-directory/develop/msal-net-token-cache-serialization?tabs=aspnet
+  // For example, for an in-memory cache with 1GB limit. For OBO, it is recommended to use a distributed cache like Redis.
+  app.AddInMemoryTokenCache(services =>
+  {
+      // Configure the memory cache options
+      services.Configure<MemoryCacheOptions>(options =>
+      {
+          options.SizeLimit = 1024 * 1024 * 1024; // in bytes (1 GB of memory)
+      });
+  }
 
   var userAssertion = new UserAssertion(tokenUsedToCallTheWebApi);
 

articles/active-directory/external-identities/customers/samples-ciam-all.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.subservice: ciam
 ms.topic: sample
-ms.date: 05/10/2023
+ms.date: 07/17/2023
 ms.author: mimart
 ms.custom: it-pro
 
@@ -73,7 +73,7 @@ These samples and how-to guides demonstrate how to write a desktop application t
 > | Language/<br/>Platform | Code sample guide | Build and integrate guide  |
 > | ------- | -------- | ------------- | 
 > | JavaScript, Electron | &#8226; [Sign in users](how-to-desktop-app-electron-sample-sign-in.md) | ---   |
-> | ASP.NET (MAUI) | &#8226; [Sign in users](how-to-desktop-app-maui-sample-sign-in.md) | ---   |
+> | ASP.NET (MAUI) | &#8226; [Sign in users](how-to-desktop-app-maui-sample-sign-in.md) |&#8226; [Sign in users](tutorial-desktop-app-maui-sign-in-prepare-tenant.md)|
 
 ### Mobile
 
@@ -82,7 +82,7 @@ These samples and how-to guides demonstrate how to write a public client mobile
 > [!div class="mx-tdCol2BreakAll"]
 > | Language/<br/>Platform | Code sample guide | Build and integrate guide |
 > | ----------- | ----------- |----------- |
-> | ASP.NET Core MAUI | &#8226; [Sign in users](how-to-mobile-app-maui-sample-sign-in.md) |  ---  |
+> | ASP.NET Core MAUI | &#8226; [Sign in users](how-to-mobile-app-maui-sample-sign-in.md) | &#8226; [Sign in users](tutorial-mobile-app-maui-sign-in-prepare-tenant.md)|
 
 ### Daemon
 
@@ -92,6 +92,8 @@ These samples and how-to guides demonstrate how to write a daemon application th
 > | Language/<br/>Platform | Code sample guide | Build and integrate guide |
 > | ----------- | ----------- |----------- |
 > | Node.js | &#8226; [Call an API](how-to-daemon-node-sample-call-api.md) |  &#8226; [Call an API](how-to-daemon-node-call-api-overview.md)  |
+> | .NET |  &#8226; [Call an API](sample-daemon-dotnet-call-api.md)  |  &#8226; [Call an API](tutorial-daemon-dotnet-call-api-prepare-tenant.md)  |
+
 
 # [**By language/platform**](#tab/language)
 
@@ -101,6 +103,7 @@ These samples and how-to guides demonstrate how to write a daemon application th
 > | App type | Code sample guide | Build and integrate guide  |
 > | ------- | -------- | ------------- |
 > | Browserless | &#8226; [Sign in users](how-to-browserless-app-dotnet-sample-sign-in.md)  | &#8226; [Sign in users](how-to-browserless-app-dotnet-sign-in-overview.md)   |
+> | Daemon |  &#8226; [Call an API](sample-daemon-dotnet-call-api.md)  | &#8226; [Call an API](tutorial-daemon-dotnet-call-api-prepare-tenant.md)   |
 
 
 ### ASP.NET Core
@@ -116,8 +119,8 @@ These samples and how-to guides demonstrate how to write a daemon application th
 > [!div class="mx-tdCol2BreakAll"]
 > | App type | Code sample guide | Build and integrate guide  |
 > | ------- | -------- | ------------- |
-> | Desktop | &#8226; [Sign in users](how-to-desktop-app-maui-sample-sign-in.md) | ---   |
-> | Mobile |  &#8226; [Sign in users](how-to-mobile-app-maui-sample-sign-in.md) |  ---  |
+> | Desktop | &#8226; [Sign in users](how-to-desktop-app-maui-sample-sign-in.md) | &#8226; [Sign in users](tutorial-desktop-app-maui-sign-in-prepare-tenant.md)   |
+> | Mobile |  &#8226; [Sign in users](how-to-mobile-app-maui-sample-sign-in.md) | &#8226; [Sign in users](tutorial-mobile-app-maui-sign-in-prepare-tenant.md)   |
 
 
 ### JavaScript, Vanilla