Merge pull request #193536 from Blackmist/cli-v2-refresh-conflict-fix

DIRTY PR

Author: ShannonLeavitt

.openpublishing.redirection.active-directory.json

@@ -10775,11 +10775,6 @@
       "redirect_url": "/azure/active-directory/managed-identities-azure-resources/managed-identities-status",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md",
-      "redirect_url": "/azure/active-directory/reports-monitoring/overview-monitoring",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/active-directory/manage-apps/get-it-now-azure-marketplace.md",
       "redirect_url": "/azure/active-directory/manage-apps/add-application-portal",

.openpublishing.redirection.json

@@ -19838,6 +19838,36 @@
       "redirect_url": "/azure/machine-learning/concept-event-grid-integration",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/event-grid/cli-samples.md",
+      "redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-azure-subscription.md",
+      "redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-create-custom-topic.md",
+      "redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-resource-group-filter.md",
+      "redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-blob.md",
+      "redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-resource-group.md",
+      "redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/machine-learning/service/concept-ml-pipelines.md",
       "redirect_url": "/azure/machine-learning/concept-ml-pipelines",
@@ -21193,11 +21223,6 @@
       "redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
       "redirect_document_id": true
     },
-    {
-      "source_path_from_root": "/articles/machine-learning/service/reference-pipeline-yaml.md",
-      "redirect_url": "/azure/machine-learning/reference-yaml-job-pipeline",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/machine-learning/tutorial-pipeline-batch-scoring-classification.md",
       "redirect_url": "/azure/machine-learning/tutorial-pipeline-python-sdk",

CODEOWNERS

@@ -5,9 +5,9 @@
 # NOTE: The people you choose as code owners must have _write_ permissions for the repository. When the code owner is a team, that team must be _visible_ and it must have _write_ permissions, even if all the individual members of the team already have write permissions directly, through organization membership, or through another team membership.
 
 # Azure Policy: Samples and Compliance Controls
-/articles/**/policy-reference.md @timwarner
-/articles/**/security-controls-policy.md @timwarner
-/includes/policy/ @timwarner
+/articles/**/policy-reference.md @timwarner-msft
+/articles/**/security-controls-policy.md @timwarner-msft
+/includes/policy/ @timwarner-msft
 
 # Azure Monitor
 articles/azure-monitor/* @bwren
@@ -57,7 +57,7 @@ articles/service-health @rboucher
 /articles/container-registry/ @dlepow @mimckitt
 
 # Governance
-/articles/governance/ @timwarner
+/articles/governance/ @timwarner-msft
 
 # Security
 /articles/security/fundamentals/feature-availability.md @msmbaldwin @terrylanfear

articles/active-directory-b2c/identity-verification-proofing.md

@@ -27,6 +27,7 @@ Microsoft partners with the following ISV partners.
 
 | ISV partner | Description and integration walkthroughs |
 |:-------------------------|:--------------|
+| ![Screenshot of a eid-me logo](./media/partner-gallery/eid-me-logo.png) | [eID-Me](./partner-eid-me.md) is an identity verification and decentralized digital identity solution for Canadian citizens. It enables organizations to meet Identity Assurance Level (IAL) 2 and Know Your Customer (KYC) requirements. |
 |![Screenshot of an Experian logo.](./media/partner-gallery/experian-logo.png) | [Experian](./partner-experian.md) is an Identity verification and proofing provider that performs risk assessments based on user attributes to prevent fraud. |
 |![Screenshot of an IDology logo.](./media/partner-gallery/idology-logo.png) | [IDology](./partner-idology.md) is an Identity verification and proofing provider with ID verification solutions, fraud prevention solutions, compliance solutions, and others.|
 |![Screenshot of a Jumio logo.](./media/partner-gallery/jumio-logo.png) | [Jumio](./partner-jumio.md) is an ID verification service, which enables real-time automated ID verification, safeguarding customer data. |
@@ -41,4 +42,4 @@ Microsoft partners with the following ISV partners.
 
 ## Next steps
 
-Select a partner in the tables mentioned to learn how to integrate their solution with Azure AD B2C.
+Select a partner in the tables mentioned to learn how to integrate their solution with Azure AD B2C.

articles/active-directory-b2c/media/partner-gallery/eid-me-logo.png

@@ -219,7 +219,7 @@ Preconditions can check multiple preconditions. The following example checks whe
 Identity provider selection lets users select an action from a list of options. The identity provider selection consists of a pair of two orchestration  steps: 
 
 1. **Buttons** - It starts with type of `ClaimsProviderSelection`, or `CombinedSignInAndSignUp` that contains a list of options a user can choose from. The order of the options inside the `ClaimsProviderSelections` element controls the order of the buttons presented to the user.
-2. **Actions** - Followed by type of `ClaimsExchange`. The ClaimsExchange contains list of actions. The action is a reference to a technical profile, such as [OAuth2](oauth2-technical-profile.md), [OpenID Connect](openid-connect-technical-profile.md), [claims transformation](claims-transformation-technical-profile.md), or [self-asserted](self-asserted-technical-profile.md). The When a user clicks on one of the buttons, the corresponding action is executed.
+2. **Actions** - Followed by type of `ClaimsExchange`. The ClaimsExchange contains list of actions. The action is a reference to a technical profile, such as [OAuth2](oauth2-technical-profile.md), [OpenID Connect](openid-connect-technical-profile.md), [claims transformation](claims-transformation-technical-profile.md), or [self-asserted](self-asserted-technical-profile.md). When a user clicks on one of the buttons, the corresponding action is executed.
 
 The **ClaimsProviderSelections** element contains the following element:
 

articles/active-directory-b2c/userjourneys.md

@@ -17,6 +17,19 @@ ms.collection: M365-identity-device-management
 ---
 # Azure AD Password Protection agent version history
 
+## 1.2.177.1
+
+Release date: March 28, 2022
+
+* Fixed software version being incorrect
+
+## 1.2.177.0
+
+Release date: March 14, 2022
+
+* Minor bugfixes
+* Fixed issue with Azure AD Connect Agent Updater not being updated
+
 ## 1.2.176.0
 
 Release date: June 4, 2021

articles/active-directory/authentication/howto-password-ban-bad-on-premises-agent-versions.md

@@ -10,17 +10,17 @@ ms.service: active-directory
 ms.subservice: develop
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/23/2022
+ms.date: 03/31/2022
 ms.author: ludwignick
 ms.reviewer: marsma
 ms.custom: aaddev
 ---
 
-# OAuth 2.0 and OpenID Connect in the Microsoft identity platform
+# OAuth 2.0 and OpenID Connect (OIDC) in the Microsoft identity platform
 
-The Microsoft identity platform offers authentication and authorization services using standards-compliant implementations of OAuth 2.0 and OpenID Connect (OIDC) 1.0.
+You don't need to learn OAuth or OpenID Connect (OIDC) at the protocol level to use the Microsoft identity platform. You will, however, encounter these and other protocol terms and concepts as you use the identity platform to add auth functionality to your apps.
 
-You don't need to learn OAuth and OIDC at the protocol level to use the Microsoft identity platform. However, debugging your apps can be made easier by learning a few basics of the protocols and their implementation on the identity platform.
+As you work with the Azure portal, our documentation, and our authentication libraries, knowing a few basics like these can make your integration and debugging tasks easier.
 
 ## Roles in OAuth 2.0
 
@@ -63,7 +63,7 @@ Your app's registration also holds information about the authentication and auth
 
 ## Endpoints
 
-Authorization servers like the Microsoft identity platform provide a set of HTTP endpoints for use by the parties in an auth flow to execute the flow.
+The Microsoft identity platform offers authentication and authorization services using standards-compliant implementations of OAuth 2.0 and OpenID Connect (OIDC) 1.0. Standards-compliant authorization servers like the Microsoft identity platform provide a set of HTTP endpoints for use by the parties in an auth flow to execute the flow.
 
 The endpoint URIs for your app are generated for you when you register or configure your app in Azure AD. The endpoints you use in your app's code depend on the application's type and the identities (account types) it should support.
 
@@ -81,18 +81,18 @@ https://login.microsoftonline.com/<issuer>/oauth2/v2.0/token
 
 To find the endpoints for an application you've registered, in the [Azure portal](https://portal.azure.com) navigate to:
 
-**Azure Active Directory** > **App registrations** > *{YOUR-APPLICATION}* > **Endpoints**
+**Azure Active Directory** > **App registrations** > \<YOUR-APPLICATION\> > **Endpoints**
 
 ## Next steps
 
 Next, learn about the OAuth 2.0 authentication flows used by each application type and the libraries you can use in your apps to perform them:
 
 * [Authentication flows and application scenarios](authentication-flows-app-scenarios.md)
-* [Microsoft authentication libraries](reference-v2-libraries.md)
+* [Microsoft Authentication Library (MSAL)](msal-overview.md)
 
-Always prefer using an authentication library over making raw HTTP calls to execute auth flows. However, if you have an app that requires it or you'd like to learn more about the identity platform's implementation of OAuth and OIDC, see:
+**We strongly advise against crafting your own library or raw HTTP calls to execute authentication flows.** A [Microsoft authentication library](reference-v2-libraries.md) is safer and much easier. However, if your scenario prevents you from using our libraries or you'd just like to learn more about the identity platform's implementation, we have protocol reference:
 
-* [OpenID Connect](v2-protocols-oidc.md) - User sign-in, sign-out, and single sign-on (SSO)
 * [Authorization code grant flow](v2-oauth2-auth-code-flow.md) - Single-page apps (SPA), mobile apps, native (desktop) applications
 * [Client credentials flow](v2-oauth2-client-creds-grant-flow.md) - Server-side processes, scripts, daemons
-* [On-behalf-of (OBO) flow](v2-oauth2-on-behalf-of-flow.md) - Web APIs that call another web API on a user's behalf
+* [On-behalf-of (OBO) flow](v2-oauth2-on-behalf-of-flow.md) - Web APIs that call another web API on a user's behalf
+* [OpenID Connect](v2-protocols-oidc.md) - User sign-in, sign-out, and single sign-on (SSO)

articles/active-directory/develop/active-directory-v2-protocols.md

@@ -1,7 +1,7 @@
 ---
-title: Azure AD consent framework
+title: Microsoft identity platform consent framework
 titleSuffix: Microsoft identity platform
-description: Learn about the consent framework in Azure Active Directory and how it makes it easy to develop multi-tenant web and native client applications.
+description: Learn about the consent framework in the Microsoft identity platform and how it applies to multi-tenant applications.
 services: active-directory
 author: rwike77
 manager: CelesteDG
@@ -10,21 +10,17 @@ ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual
 ms.workload: identity
-ms.date: 03/14/2022
+ms.date: 03/29/2022
 ms.author: ryanwi
 ms.reviewer: phsignor, jesakowi
 ms.custom: 
 ---
 
-# Azure Active Directory consent framework
+# Microsoft identity platform consent framework
 
-The Azure Active Directory (Azure AD) consent framework makes it easy to develop multi-tenant web and native client applications. These applications allow sign-in by user accounts from an Azure AD tenant that's different from the one where the application is registered. They may also need to access web APIs such as the Microsoft Graph API (to access Azure AD, Intune, and services in Microsoft 365) and other Microsoft services' APIs, in addition to your own web APIs.
+Multi-tenant applications allow sign-ins by user accounts from Azure AD tenants other than the tenant in which the app was initially registered. The Microsoft identity platform consent framework enables a tenant administrator or user in these other tenants to consent to (or deny) an application's request for permission to access their resources.
 
-The framework is based on a user or an administrator giving consent to an application that asks to be registered in their directory, which may involve accessing directory data. For example, if a web client application needs to read calendar information about the user from Microsoft 365, that user is required to consent to the client application first. After consent is given, the client application will be able to call the Microsoft Graph API on behalf of the user, and use the calendar information as needed. The [Microsoft Graph API](https://developer.microsoft.com/graph) provides access to data in Microsoft 365 (like calendars and messages from Exchange, sites and lists from SharePoint, documents from OneDrive, notebooks from OneNote, tasks from Planner, and workbooks from Excel), as well as users and groups from Azure AD and other data objects from more Microsoft cloud services.
-
-The consent framework is built on OAuth 2.0 and its various flows, such as authorization code grant and client credentials grant, using public or confidential clients. By using OAuth 2.0, Azure AD makes it possible to build many different types of client applications--such as on a phone, tablet, server, or a web application--and gain access to the required resources.
-
-For more info about using the consent framework with OAuth2.0 authorization grants, see [Authorize access to web applications using OAuth 2.0 and Azure AD](v2-oauth2-auth-code-flow.md) and [Authentication scenarios for Azure AD](./authentication-vs-authorization.md). For info about getting authorized access to Microsoft 365 through Microsoft Graph, see [App authentication with Microsoft Graph](/graph/).
+For example, perhaps a web application requires read-only access to a user's calendar in Microsoft 365. It's the identity platform's consent framework that enables the prompt asking the user to consent to the app's request for permission to read their calendar. If the user consents, the application is able to call the Microsoft Graph API on their behalf and get their calendar data.
 
 ## Consent experience - an example
 
@@ -60,4 +56,4 @@ The following steps show you how the consent experience works for both the appli
 
 ## Next steps
 
-See [how to convert an app to be multi-tenant](howto-convert-app-to-be-multi-tenant.md)
+See [how to convert an app to multi-tenant](howto-convert-app-to-be-multi-tenant.md)