Merge branch 'main' into release-defender-flip

Author: v-alje

articles/active-directory-b2c/faq.yml

@@ -14,23 +14,20 @@ metadata:
   ms.custom: b2c-support, has-azure-ad-ps-ref,azure-ad-ref-level-one-done
 title: 'Azure AD B2C: Frequently asked questions (FAQ)'
 summary: | 
-  [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
   This page answers frequently asked questions about the Azure Active Directory B2C (Azure AD B2C). Keep checking back for updates.
   
 sections:
-  - name: Azure AD B2C End of Sale
+  - name: General
     questions:
       - question: |
-          Is Azure AD B2C still available to purchase?
+          Azure AD B2C end of sale
         answer: |
           Effective May 1, 2025 Azure AD B2C will no longer be available to purchase for new customers, but current Azure AD B2C customers can continue using the product. The product experience, including creating new tenants or user flows, will remain unchanged. The operational commitments, including service level agreements (SLAs), security updates, and compliance, will also remain unchanged. We'll continue supporting Azure AD B2C until at least May 2030. More information, including migration plans will be made available. Contact your account representative for more information and to learn more about Microsoft Entra External ID.
       - question: |
           What is Microsoft Entra External ID?
         answer: |
           We have released our next generation Microsoft Entra External ID product which combines powerful solutions for working with people outside of your organization. With External ID capabilities, you can allow external identities to securely access your apps and resources. Whether you’re working with external partners, consumers, or business customers, users can bring their own identities. These identities can range from corporate or government-issued accounts to social identity providers like Google or Facebook. For more information, see [Introduction to Microsoft Entra External ID](/entra/external-id/external-identities-overview)
 
-  - name: General
-    questions:
       - question: |
           Why can't I access the Azure AD B2C extension in the Azure portal?
         answer: |

articles/app-service/app-service-asp-net-migration.md

@@ -1,63 +1,53 @@
 ---
-title: Migrate .NET apps to Azure App Service
-description: A collection of .NET migration resources available to Azure App Service.
+title: Migrate .NET Apps to Azure App Service
+description: Learn about .NET migration resources available to help you assess and migrate web apps to Azure App Service.
 author: msangapu-msft
 
 ms.topic: article
-ms.date: 06/29/2023
+ms.date: 04/23/2025
 ms.author: msangapu
 ms.devlang: csharp
 ms.custom: devx-track-dotnet
 ---
 # .NET migration cases for Azure App Service
 
-Azure App Service provides easy-to-use tools to quickly discover on-premises .NET web apps, assess for readiness, and migrate both the content & supported configurations to App Service.
+Azure App Service provides easy-to-use tools to quickly discover on-premises .NET web apps, assess them for readiness, and migrate both the content and supported configurations to App Service.
 
 These tools are developed to support different kinds of scenarios, focused on discovery, assessment, and migration. Following is list of .NET migration tools and use cases.
 
 ## Migrate from multiple servers at-scale
 
 > [!NOTE]
-> [Learn how to migrate .NET apps to App Service using the .NET migration tutorial.](../migrate/tutorial-modernize-asp-net-appservice-code.md)
+> To learn how to migrate .NET apps to App Service using the .NET migration tutorial, see [Modernize ASP.NET web apps to Azure App Service code](../migrate/tutorial-modernize-asp-net-appservice-code.md)
 >
 
-Azure Migrate recently announced at-scale, agentless discovery, and assessment of ASP.NET web apps. You can now easily discover ASP.NET web apps running on Internet Information Services (IIS) servers in a VMware environment and assess them for migration to Azure App Service. Assessments will help you determine the web app migration readiness, migration blockers, remediation guidance, recommended SKU, and hosting costs. At-scale migration resources for  are found below.
+[Azure Migrate](../migrate/migrate-services-overview.md) recently announced at-scale, agentless discovery, and assessment of ASP.NET web apps. You can now easily discover ASP.NET web apps running on Internet Information Services (IIS) servers in a VMware environment, and assess them for migration to Azure App Service. Assessments help you determine the web app migration readiness, migration blockers, remediation guidance, recommended products, and hosting costs.
 
-Once you have successfully assessed readiness, you should proceed with migration of ASP.NET web apps to Azure App Services.  
+After you finish assessing readiness, you should proceed with migration of ASP.NET web apps to Azure App Services.  
 
-There are existing tools which enable migration of a standalone ASP.NET web app or multiple ASP.NET web apps hosted on a single IIS server as explained in [Migrate .NET apps to Azure App Service](../migrate/tutorial-modernize-asp-net-appservice-code.md). With introduction of At-Scale or bulk migration feature integrated with Azure Migrate we are now opening up the possibilities to migrate multiple ASP.NET application hosted on multiple on-premises IIS servers.  
+There are existing tools that enable migration of a standalone ASP.NET web app or multiple ASP.NET web apps hosted on a single IIS server. To learn more, see [Modernize ASP.NET web apps to Azure App Service code](../migrate/tutorial-modernize-asp-net-appservice-code.md). With the introduction of at-scale or bulk migration integrated with Azure Migrate, you can migrate multiple ASP.NET applications hosted on multiple on-premises IIS servers.  
 
-Azure Migrate provides at-scale, agentless discovery, and assessment of ASP.NET web apps. You can discover ASP.NET web apps running on Internet Information Services (IIS) servers in a VMware environment and assess them for migration to Azure App Service. Assessments will help you determine the web app migration readiness, migration blockers, remediation guidance, recommended SKU, and hosting costs. At-scale migration resources for  are found below.
+Bulk migration provides the following key capabilities:
 
-Bulk migration provides the following key capabilities: 
-
-- Bulk Migration of ASP.NET web apps to Azure App Services multitenant or App services environment 
-- Migrate ASP.NET web apps assessed as "Ready" & "Ready with Conditions"
-- Migrate up to five App Service Plans (and associated web apps) as part of a single E2E migration flow 
-- Ability to change suggested SKU for the target App Service Plan (Ex: Change suggested Pv3 SKU to Standard PV2 SKU) 
-- Ability to change web apps suggested web apps packing density for target app service plan (Add or Remove web apps associated with an App Service Plan) 
-- Change target name for app service plans and\or web apps 
-- Bulk edit migration settings\attributes 
+- Bulk migration of ASP.NET web apps to Azure App Services multitenant or App services environment 
+- Migrate ASP.NET web apps assessed as *Ready* & *Ready with conditions*
+- Migrate up to five App Service plans (and associated web apps) as part of a single E2E migration flow 
+- Ability to change suggested SKU for the target App Service plan (for example, change suggested Pv3 to Standard PV2) 
+- Ability to change suggested web apps packing density for target app service plan (add or remove web apps associated with an App Service plan) 
+- Change target name for App Service plans or web apps 
+- Bulk edit migration settings or attributes 
 - Download CSV with details of target web app and app service plan name 
 - Track progress of migration using ARM template deployment experience 
 
-### Move .NET apps to Azure App Service
-
-Azure App Service is a cloud platform that offers a fast, easy, and cost-effective way to migrate your .NET web apps from on-premises to the cloud. Start learning today about how Azure empowers you to modernize your .NET apps with the following resources.
-
-Select one of the following options to get started with a migration assessment:
-- [Self-service assessment](https://azure.microsoft.com/products/app-service/migration-tools/)
-- [Partner assessment](https://aka.ms/app-service-migration-dotnet)
-
 ## App Service migration tools and resources
 
 __App Service Migration Assistant tool and App Service migration assistant for PowerShell scripts are governed by the terms and conditions in the EULA.pdf packaged with the respective tools.__
 
-|Migration Tools| Description | Documentation |
+|Migration tools| Description | Documentation |
 |-----------|-------------|---------------|
-|[App Service Migration Assistant](https://appmigration.microsoft.com/api/download/windowspreview/AppServiceMigrationAssistant.msi)|Migrate .NET web apps from Windows OS to App Service.|[App Service Migration Assistant Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
-|[App Service migration assistant for Java on Apache Tomcat (Windows—preview)](https://appmigration.microsoft.com/api/download/windowspreview/AppServiceMigrationAssistant.msi)|Download prerelease software for migrating Java web applications on Tomcat web server running on Windows servers.|[App Service Migration Assistant Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
-|[App Service Migration Assistant PowerShell scripts](https://appmigration.microsoft.com/api/download/psscripts/AppServiceMigrationScripts.zip)|Download PowerShell scripts for discovering and assessing all Microsoft Internet Information Services (IIS) web apps on a single server in bulk and migrating .NET web apps from Windows OS to App Service.|[App Service Migration Assistant PowerShell Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki/PowerShell-Scripts)<br>[SHA256 Identifier](https://github.com/Azure/App-Service-Migration-Assistant/wiki/Release-Notes)|
+|[App Service Migration Assistant](https://appmigration.microsoft.com/api/download/windowspreview/AppServiceMigrationAssistant.msi)|Migrate .NET web apps from Windows OS to App Service.|[App Service Migration Assistant documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
+|[App Service migration assistant for Java on Apache Tomcat (Windows—preview)](https://appmigration.microsoft.com/api/download/windowspreview/AppServiceMigrationAssistant.msi)|Download prerelease software for migrating Java web applications on Tomcat web server running on Windows servers.|[App Service Migration Assistant documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
+|[App Service Migration Assistant PowerShell scripts](https://appmigration.microsoft.com/api/download/psscripts/AppServiceMigrationScripts.zip)|Download PowerShell scripts for discovering and assessing all Microsoft Internet Information Services (IIS) web apps on a single server in bulk and migrating .NET web apps from Windows OS to App Service.|[App Service Migration Assistant PowerShell documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki/PowerShell-Scripts)<br>[SHA256 Identifier](https://github.com/Azure/App-Service-Migration-Assistant/wiki/Release-Notes)|
 
 | More resources to migrate .NET apps to the cloud |
 |----------------|
@@ -66,11 +56,9 @@ __App Service Migration Assistant tool and App Service migration assistant for P
 | [Start Your Cloud Journey with Azure App Service](https://aka.ms/cloudjourney/start/video) |
 | **Blog** |
 | [Reliable web app pattern for .NET](https://techcommunity.microsoft.com/t5/apps-on-azure-blog/announcing-the-reliable-web-app-pattern-for-net/ba-p/3745270) |
-| [Start your cloud journey with Azure App Service](https://aka.ms/cloudjourney/start/part1) |
-| [Start your cloud journey with Azure App Service - Move your code](https://aka.ms/cloudjourney/start/part2) |
+| [Start your cloud journey with Azure App Service - Part 1](https://aka.ms/cloudjourney/start/part1) |
+| [Start your cloud journey with Azure App Service - Part 2](https://aka.ms/cloudjourney/start/part2) |
 | [Learn how to modernize your .NET apps from the pros](https://devblogs.microsoft.com/dotnet/learn-how-to-modernize-your-dotnet-apps/) |
-| **On-demand event** |
-| [Azure Developers - .NET Day](/events/learn-events/azuredeveloper-dotnetday/)
 | **Learning path** |
 | [Migrate ASP.NET Apps to Azure](/training/paths/migrate-dotnet-apps-azure/) |
 | [Host a web application with Azure App Service](/training/modules/host-a-web-app-with-azure-app-service/) |
@@ -97,18 +85,18 @@ __App Service Migration Assistant tool and App Service migration assistant for P
 
 ## Migrate from an IIS server
 
-You can migrate ASP.NET web apps from single IIS server discovered through Azure Migrate's at-scale discovery experience using [PowerShell scripts](https://github.com/Azure/App-Service-Migration-Assistant/wiki/PowerShell-Scripts) [(download)](https://appmigration.microsoft.com/api/download/psscriptpreview/AppServiceMigrationScripts.zip). Watch the video for [updates on migrating to Azure App Service](/Shows/The-Launch-Space/Updates-on-Migrating-to-Azure-App-Service).
+You can migrate ASP.NET web apps from a single IIS server discovered through Azure Migrate's at-scale discovery experience using [PowerShell scripts](https://github.com/Azure/App-Service-Migration-Assistant/wiki/PowerShell-Scripts). You can [download the scripts](https://appmigration.microsoft.com/api/download/psscriptpreview/AppServiceMigrationScripts.zip). Watch the video for [updates on migrating to Azure App Service](/Shows/The-Launch-Space/Updates-on-Migrating-to-Azure-App-Service).
 
 ## ASP.NET web app migration
 
-Using App Service Migration Assistant, you can [migrate your standalone on-premises ASP.NET web app onto Azure App Service](https://www.youtube.com/watch?v=9LBUmkUhmXU). App Service Migration Assistant is designed to simplify your journey to the cloud through a free, simple, and fast solution to migrate applications from on-premises to the cloud. For more information about the migration assistant tool, see the [FAQ](https://github.com/Azure/App-Service-Migration-Assistant/wiki).
+Using App Service Migration Assistant, you can [migrate your standalone on-premises ASP.NET web app onto Azure App Service](https://www.youtube.com/watch?v=9LBUmkUhmXU). App Service Migration Assistant is designed to simplify your journey to the cloud through a free, simple, and fast solution to migrate applications from on-premises to the cloud. For more information about the migration assistant tool, see the [FAQ](https://github.com/Azure/App-Service-Migration-Assistant/wiki#faqs).
 
 ## Containerize an ASP.NET web app
 
-Some .NET Framework web applications may have dependencies to libraries and other capabilities not available in Azure App Service. These apps may rely on other components in the Global Assembly Cache. Previously, you could only run these applications on virtual machines. However, now you can run them in Azure App Service Windows Containers.
+Some .NET Framework web applications might have dependencies to libraries and other capabilities not available in Azure App Service. These apps might rely on other components in the Global Assembly Cache. Previously, you could only run these applications on virtual machines. However, now you can run them in Azure App Service Windows Containers.
 
-The [app containerization tool](https://azure.microsoft.com/blog/accelerate-application-modernization-with-azure-migrate-app-containerization/) can repackage applications as containers with minimal changes. The tool currently supports containerizing ASP.NET applications and Apache Tomcat Java applications. For more information about containerization and migration, see the [how-to](../migrate/tutorial-app-containerization-aspnet-app-service.md).
+The [app containerization tool](https://azure.microsoft.com/blog/accelerate-application-modernization-with-azure-migrate-app-containerization/) can repackage applications as containers with minimal changes. The tool currently supports containerizing ASP.NET applications and Apache Tomcat Java applications. For more information about containerization and migration, see [ASP.NET app containerization and migration to Azure App Service](../migrate/tutorial-app-containerization-aspnet-app-service.md).
 
-## Next steps
+## Related content
 
-[Migrate an on-premises web application to Azure App Service](/training/modules/migrate-app-service-migration-assistant/)
+- [Migrate an on-premises web application to Azure App Service](/training/modules/migrate-app-service-migration-assistant/)