Merge pull request #206359 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: ttorble

.openpublishing.publish.config.json

@@ -813,8 +813,8 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "azure-spring-cloud-reference-architecture",
-      "url": "https://github.com/Azure/azure-spring-cloud-reference-architecture",
+      "path_to_root": "azure-spring-apps-reference-architecture",
+      "url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
       "branch": "main",
       "branch_mapping": {}
     },
@@ -1016,6 +1016,7 @@
     "articles/mysql/.openpublishing.redirection.mysql.json",
     "articles/container-apps/.openpublishing.redirection.container-apps.json",
     "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
+    "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
     "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
     "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
     "articles/machine-learning/.openpublishing.redirection.machine-learning.json",

.openpublishing.redirection.active-directory.json

@@ -10825,7 +10825,13 @@
       "source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
       "redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
+      "redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
+      "redirect_document_id": false
     }
 
+
   ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -430,6 +430,11 @@
             "source_path_from_root": "/articles/azure-monitor/insights/key-vault-insights-overview.md" ,
             "redirect_url": "/azure/key-vault/key-vault-insights-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/cloudservices.md" ,
+            "redirect_url": "/azure/azure-monitor/app/azure-web-apps-net-core",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory/develop/howto-remove-app.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: develop
 ms.topic: how-to
 ms.workload: identity
-ms.date: 11/15/2020
+ms.date: 07/28/2022
 ms.author: ryanwi
 ms.custom: aaddev
 ms.reviewer: marsma, aragra, lenalepa, sureshja
@@ -48,9 +48,9 @@ To delete an application, be listed as an owner of the application or have admin
 
 ## Remove an application authored by another organization
 
-If you are viewing **App registrations** in the context of a tenant, a subset of the applications that appear under the **All apps** tab are from another tenant and were registered into your tenant during the consent process. More specifically, they are represented by only a service principal object in your tenant, with no corresponding application object. For more information on the differences between application and service principal objects, see [Application and service principal objects in Azure AD](./app-objects-and-service-principals.md).
+If you're viewing **App registrations** in the context of a tenant, a subset of the applications that appear under the **All apps** tab are from another tenant and were registered into your tenant during the consent process. More specifically, they're represented by only a service principal object in your tenant, with no corresponding application object. For more information on the differences between application and service principal objects, see [Application and service principal objects in Azure AD](./app-objects-and-service-principals.md).
 
-In order to remove an application’s access to your directory (after having granted consent), the company administrator must remove its service principal. The administrator must have Global Administrator access, and can remove the application through the Azure portal or use the [Azure AD PowerShell Cmdlets](/previous-versions/azure/jj151815(v=azure.100)) to remove access.
+In order to remove an application’s access to your directory (after having granted consent), the company administrator must remove its service principal. The administrator must have Global Administrator access. To learn how to delete a service principal, see [Delete an enterprise application](../manage-apps/delete-application-portal.md).
 
 ## Next steps
 

articles/active-directory/develop/howto-restore-app.md

@@ -9,21 +9,19 @@ ms.service: active-directory
 ms.subservice: develop
 ms.topic: how-to
 ms.workload: identity
-ms.date: 3/22/2021
+ms.date: 07/28/2022
 ms.author: arcrowe
 ms.custom: aaddev
 #Customer intent: As an application developer, I want to know how to restore or permanently delete my recently deleted application from the Microsoft identity platform.
 ---
 
 # Restore or remove a recently deleted application with the Microsoft identity platform
-After you delete an app registration, the app remains in a suspended state for 30 days. During that 30-day window, the app registration can be restored, along with all its properties. After that 30-day window passes, app registrations cannot be restored and the permanent deletion process may be automatically started.  This functionality only applies to applications associated to a directory.  It is not available for applications from a personal Microsoft account, which cannot be restored.
 
-You can view your deleted applications, restore a deleted application, or permanently delete an application using the App registrations experience under Azure Active Directory (Azure AD) in the Azure portal.
+After you delete an app registration, the app remains in a suspended state for 30 days. During that 30-day window, the app registration can be restored, along with all its properties. After that 30-day window passes, app registrations can't be restored, and the permanent deletion process may be automatically started. This functionality only applies to applications associated to a directory. It isn't available for applications from a personal Microsoft account, which can't be restored.
 
-Note that neither you nor Microsoft customer support can restore a permanently deleted application or an application deleted more than 30 days ago.
+You can view your deleted applications, restore a deleted application, or permanently delete an application using the **App registrations** experience under Azure Active Directory (Azure AD) in the Azure portal.
 
-> [!IMPORTANT]
-> The deleted applications portal UI feature [!INCLUDE [PREVIEW BOILERPLATE](../../../includes/active-directory-develop-preview.md)]
+Neither you nor Microsoft customer support can restore a permanently deleted application or an application deleted more than 30 days ago.
 
 ## Required permissions
 You must have one of the following roles to permanently delete applications.
@@ -50,9 +48,9 @@ Review the list of applications. Only applications that have been deleted in the
 
 ## Restore a recently deleted application
 
-When an app registration is deleted from the organization, the app is in a suspended state and its configurations are preserved. When you restore an app registration, its configurations are also restored.  However, if there were any organization-specific settings in **Enterprise applications** for the application's home tenant, those will not be restored.  
+When an app registration is deleted from the organization, the app is in a suspended state, and its configurations are preserved. When you restore an app registration, its configurations are also restored. However, if there were any organization-specific settings in **Enterprise applications** for the application's home tenant, those won't be restored.  
 
-This is because organization-specific settings are stored on a separate object, called the service principal.  Settings held on the service principal include permission consents and user and group assignments for a certain organization; these configurations will not be restored when the app is restored. For more information, see [Application and service principal objects](app-objects-and-service-principals.md). 
+This is because organization-specific settings are stored on a separate object, called the service principal.  Settings held on the service principal include permission consents and user and group assignments for a certain organization; these configurations won't be restored when the app is restored. To learn how to restore the service principal with its previous configurations, see [Restore a recently deleted enterprise application](../manage-apps/restore-application.md).
 
 
 ### To restore an application

articles/active-directory/manage-apps/delete-application-portal.md

@@ -1,51 +1,117 @@
 ---
-title: 'Quickstart: Delete an enterprise application'
+title: 'Delete an enterprise application'
 description: Delete an enterprise application in Azure Active Directory.
 services: active-directory
 author: omondiatieno
 manager: CelesteDG
 ms.service: active-directory
 ms.subservice: app-mgmt
-ms.topic: quickstart
+ms.topic: how-to
 ms.workload: identity
-ms.date: 03/24/2022
+ms.date: 07/28/2022
 ms.author: jomondi
 ms.reviewer: sureshja
-ms.custom: mode-other
+zone_pivot_groups: enterprise-apps-all
+
 #Customer intent: As an administrator of an Azure AD tenant, I want to delete an enterprise application.
 ---
 
-# Quickstart: Delete an enterprise application
+# Delete an enterprise application
+
+In this article, you learn how to delete an enterprise application that was added to your Azure Active Directory (Azure AD) tenant. 
 
-In this quickstart, you use the Azure Active Directory Admin Center to delete an application that was added to your Azure Active Directory (Azure AD) tenant.
+When you delete and enterprise application, it will be held in a suspended state in the recycle bin for 30 days. During the 30 days, you can [Restore the application](restore-application.md). Deleted items are automatically hard deleted after the 30-day period. For more information on frequently asked questions about deletion and recovery of applications, see [Deleting and recovering applications FAQs](delete-recover-faq.yml).
 
-It is recommended that you use a non-production environment to test the steps in this quickstart.
 
 ## Prerequisites
 
 To delete an enterprise application, you need:
 
 - An Azure AD user account. If you don't already have one, you can [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 - One of the following roles: Global Administrator, Cloud Application Administrator, Application Administrator, or owner of the service principal.
-- Completion of the steps in [Quickstart: Add an enterprise application](add-application-portal.md).
+- An [enterprise application added to your tenant](add-application-portal.md)
 
 ## Delete an enterprise application
 
-To delete an enterprise application:
+:::zone pivot="portal"
 
-1. Go to the [Azure Active Directory Admin Center](https://aad.portal.azure.com) and sign in using one of the roles listed in the prerequisites.
+1. Sign in to the [Azure AD portal](https://portal.azure.com) and sign in using one of the roles listed in the prerequisites.
 1. In the left menu, select **Enterprise applications**. The **All applications** pane opens and displays a list of the applications in your Azure AD tenant. Search for and select the application that you want to delete. For example, **Azure AD SAML Toolkit 1**.
 1. In the **Manage** section of the left menu, select **Properties**.
 1. At the top of the **Properties** pane, select **Delete**, and then select **Yes** to confirm you want to delete the application from your Azure AD tenant.
 
     :::image type="content" source="media/delete-application-portal/delete-application.png" alt-text="Delete an enterprise application.":::
 
-## Clean up resources
+:::zone-end
+
+:::zone pivot="aad-powershell"
+
+> [!IMPORTANT]
+> Make sure you're using the AzureAD module. This is important if you've installed both the [AzureAD](/powershell/module/azuread/?preserve-view=true&view=azureadps-2.0) module and the AzureADPreview module.
+1. Run the following commands:
+
+    ```powershell
+    Remove-Module AzureADPreview
+    Import-Module AzureAD
+    ```
+
+1. Connect to Azure AD PowerShell:
+
+   ```powershell
+   Connect-AzureAD
+   ```
+1. Get the list of enterprise applications in your tenant.
+   
+   ```powershell
+   Get-AzureADServicePrincipal
+   ```
+1. Record the object ID of the enterprise app you want to delete.
+1. Delete the enterprise application.
+   
+   ```powershell
+   Remove-AzureADServicePrincipal $ObjectId 'd4142c52-179b-4d31-b5b9-08940873507b'
+   ```
+:::zone-end
+
+:::zone pivot="ms-powershell"
+
+1. Connect to Microsoft Graph PowerShell:
+
+   ```powershell
+   Connect-MgGraph -Scopes 'Application.Read.All'
+   ```
+
+1. Get the list of enterprise applications in your tenant.
+   
+   ```powershell
+   Get-MgServicePrincipal   
+   ```
+1. Record the object ID of the enterprise app you want to delete.
+1. Delete the enterprise application.
+   
+   ```powershell
+   Remove-MgServicePrincipal -ServicePrincipalId 'd4142c52-179b-4d31-b5b9-08940873507b'
+
+:::zone-end
+
+
+:::zone pivot="ms-graph"
+
+Delete an enterprise application using [Graph Explorer](https://developer.microsoft.com/graph/graph-explorer).
+1. To get the list of applications in your tenant, run the following query.
+   
+   ```http
+   GET /servicePrincipals
+   ```
+1. Record the ID of the enterprise app you want to delete.
+1. Delete the enterprise application.
+   
+   ```http
+   DELETE /servicePrincipals/{id}
+   ```
 
-When you are done with this quickstart series, consider deleting the application to clean up your test tenant. Deleting the application was covered in this quickstart.
+:::zone-end
 
 ## Next steps
 
-Learn more about planning a single sign-on deployment.
-> [!div class="nextstepaction"]
-> [Plan single sign-on deployment](plan-sso-deployment.md)
+- [Restore a deleted enterprise application](restore-application.md)