Merge pull request #49946 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

docs/azure/includes/dotnet-all.md

@@ -30,19 +30,25 @@ The GitHub Copilot app modernization for .NET containerization feature helps you
 
 1. Open your project in Visual Studio.
 
-1. Enable **appModernizationDeploy** in the GitHub Copilot toolbox.
+1. Run App Assessment and open the Assessment Report.
+
+1. Fix the cloud readiness issues before running the **Docker Containerization** task.
+
+1. Make sure you enable **appModernizationDeploy** in the GitHub Copilot toolbox.
 
     :::image type="content" source="../../media/appmod-dotnet-containerization-tool-selection.png" alt-text="Screenshot that shows containerization tool selection.":::
 
-1. Start containerization by using one of these approaches:
+1. Start containerization by using one of the following approaches:
 
-    - **Containerize from Assessment Report**: In the assessment report, select **Run Task** for the Docker Containerization issue.
+    - **Containerize from Assessment Report**: In the assessment report, select **Run Task** for the Docker Containerization task.
 
         :::image type="content" source="media/containerize-assessment-report.png" alt-text="Screenshot that shows containerization task in assessment report.":::
 
     - **Use a containerization prompt**: You can input the following prompt in Copilot chat to containerize your project:
 
-        *Scan my project and help me plan how to containerize my application using the #appmod-get-containerization-plan tool. Execute the plan. The end goal is to have Dockerfiles that are able to be built.*
+        *Inspect my project and help me plan how to containerize my application using the #appmod-get-containerization-plan tool.
+        Execute the plan.
+        The end goal is to have Dockerfiles that are able to be built.*
 
         :::image type="content" source="media/containerization-prompt.png" alt-text="Screenshot that shows how to start the containerization process in GitHub Copilot using a prompt.":::
 
@@ -58,3 +64,7 @@ The GitHub Copilot app modernization for .NET containerization feature helps you
 
 - Use Claude Sonnet 4 or later models for the best results.
 - Copilot might take a few iterations to fix containerization errors.
+
+## Additional resources
+
+- We leverage certain tools in Containerization Assist. [Learn more](https://aka.ms/aks/containerization-assist)

docs/azure/includes/dotnet-new.md

@@ -28,12 +28,18 @@ The App Modernization for .NET deployment feature helps you deploy your migrated
 
         :::image type="content" source="media/start-deploy.png" alt-text="Screenshot that shows how to start the deployment process in GitHub Copilot.":::
 
-    - **Use a deployment prompt**: You can enter the following prompt in Copilot chat to deploy your project to Azure:
+    - **Use a deployment prompt to provision new Azure infrastructure and deploy your project**: You can enter the following prompt in Copilot chat to deploy your project to Azure:
 
-        *Scan my project to identify all Azure-relevant resources, programming languages, frameworks, dependencies, and configuration files needed for deployment, and develop an architecture diagram for me using #appmod-generate-architecture-diagram. Based on that diagram, help me develop and execute a plan using #appmod-get-plan to deploy my project to Azure. deployTool: azcli, hosting service: non-aks.*
+        *Scan my project carefully to identify all Azure-relevant resources, programming languages, frameworks, dependencies, and configuration files needed for deployment. Develop an architecture diagram for me using #appmod-generate-architecture-diagram. Based on that diagram along with all info you get from project scan, help me develop a deploy-and-provision plan WITH TOOL #appmod-get-plan and execute it to deploy my project to Azure. deployTool: azd, IacType: Bicep, hosting service: non-aks.*
 
         :::image type="content" source="media/start-deploy-prompt.png" alt-text="Screenshot that shows how to start the deployment process in GitHub Copilot by using a prompt.":::
 
+    - **Use a deployment prompt to deploy your project to existing Azure resources**: You can enter the following prompt in Copilot chat to deploy your project to existing Azure resources:
+
+        *Deploy my project to my existing Azure resource group [resource group ID] in subscription [subscription ID]. Use the #appmod-get-plan tool to develop and execute a plan.*
+
+        :::image type="content" source="media/start-deploy-existing-prompt.png" alt-text="Screenshot that shows how to start the deploy to existing Azure resource process in GitHub Copilot by using a prompt.":::
+
 1. After you start the deployment, GitHub Copilot might ask for your approval to use tools or run commands. Grant permission when prompted.
 
 1. GitHub Copilot creates a plan. The plan explains the deployment strategy, including deployment goals, project information, Azure resource architecture, Azure resources, and execution steps.