Merge branch 'master' into live

Author: jansenbe

docs/apis/migration-api-overview.md

@@ -1,7 +1,7 @@
 ---
 title: "SharePoint Online Import Migration API"
 ms.prod: sharepoint
-ms.date: 04/19/2022
+ms.date: 05/19/2022
 ms.author: jhendr
 author: JoanneHendrickson
 manager: serdars
@@ -17,12 +17,12 @@ The following API description is based upon use of the SharePoint Client Side Ob
 
 You can find latest version of the SharePoint Online Client Side Object Model (CSOM) package from the [NuGet gallery](https://www.nuget.org/packages/Microsoft.SharePointOnline.CSOM/). Use the ID `Microsoft.SharePointOnline.CSOM`.
 
->[!Important]
+> [!Important]
 > Files larger than 15 GB must now create the required checksum using [QuickXorHash](/onedrive/developer/code-snippets/quickxorhash). We have provided an example [here](#what-is-stored-in-those-azure-blob-containers).
 > 
->The QuickXorHash/Checksum has to be computed for the original file **before** encryption (if the file is being encrypted). This is different from the MD5hash requirement.
+> The QuickXorHash/Checksum has to be computed for the original file **before** encryption (if the file is being encrypted). This is different from the MD5hash requirement.
 >
->The previous method of MD5Hash is still required for files smaller than 2 GB; however this requirement will be removed at some point in the future.
+> The previous method of MD5Hash is still required for files smaller than 2 GB; however this requirement will be removed at some point in the future.
 
 
 ## Methods
@@ -452,8 +452,8 @@ Even if the API support 15GB files, we recommend package sizes of up to 250 MB O
 
 ### File size
 
->[!Note]
->The Migration API supports individual files over **15 GB**. The maximum size is current to that set by SharePoint Online.
+> [!Note]
+> The Migration API supports individual files over **15 GB**. The maximum size is current to that set by SharePoint Online.
 
 ### Only un-compressed packages are supported
 
@@ -492,6 +492,51 @@ The import pipeline is using Azure Blob Storage security model as is. This means
 ### Events and event handlers
 
 The import pipeline allows event handlers to be referenced on list items but doesn’t allow defining event handlers at the list level at this time. The import pipeline does not fire events as items are imported, so existing event handlers will not fire due to the import event.
+### Entering user identifiers in UserGroup.XML
+
+Follow these guidelines when generating the **UserGroup.XML** in the submitted package:
+
+- A person can be identified only once in a single package
+- The 'login' attribute of the user identifier requires a UPN. **Do not** enter a non-UPN email address.
+
+
+> [!Important]
+> As of March 2, 2022, the Migration API now validates and enforces a maximum of one identifier per user in a single package. 
+>
+> While using a non-UPN email won't result in a failed job, it may bring unexpected results in SharePoint Online.
+
+**Examples**
+
+The following examples show the correct and incorrect ways of entering the user identifier in UserGroup.XML.
+
+In this case, the user has the following identifiers:
+
+- **UPN**: [email protected]
+- **Email**: [email protected]. 
+
+
+**Correct**
+
+- In this example, the user is entered only once, using a UPN email address.
+
+    ```xml
+    <User Id="1" Login="i:0#.f|membership|[email protected]" …/>
+    ```
+
+**Incorrect**
+
+- **Example 1:** This example uses a non-UPN email address and incorrectly includes more than identifier for a single user.
+
+    ```xml
+    <User Id="1" Login="i:0#.f|membership|[email protected]" …/>
+    <User Id="2" Login="i:0#.f|membership|[email protected]" …/>
+    ```
+
+- **Example 2:** This example incorrectly uses a non-UPN email address.
+
+    ```xml
+    <User Id="2" Login="i:0#.f|membership|[email protected]" …/>
+    ```
 
 ### Resolving Users
 
@@ -500,7 +545,7 @@ If the Migration API was unable to resolve a user using the login provided in th
 1. This user will be replaced by “System Account” in the associated metadata within the package ( author, editor etc.).
 1. A warning will be reported in the ImportLogs –  “Failed to ensure user '[email protected]'”
 
-If the migration API was unable to resolve a user using the login provided in the UserGroup.xml and the System ID is provided (which is the SID for the user in the on-premises AD), then:
+    If the migration API was unable to resolve a user using the login provided in the UserGroup.xml and the System ID is provided (which is the SID for the user in the on-premises AD), then:
 
 1. A new deleted user with the provided login and SystemId is created and is used in the associated metadata within the package.
 1. A warning will be reported in the ImportLogs- “Failed to retrieve user '[email protected]' attributes from the SiteUsers; falling back to passed in values”

docs/transform/modernize-scanner-reports-workflow.md

@@ -8,6 +8,9 @@ ms.localizationpriority: high
 
 # SharePoint Modernization scanner reports: Workflow reports
 
+> [!Note]
+> Assessing your workflow 2013 usage should be done using the [Microsoft 365 Assessment tool](https://aka.ms/microsoft365assessmenttool)
+
 ## Excel dashboard
 
 ![Workflow dashboard](media/modernize/excel_workflowusage.png)

docs/transform/modernize-scanner-reports.md

@@ -10,6 +10,9 @@ ms.localizationpriority: high
 
 The output of a SharePoint Modernization Scanner run is a series of reports (CSV files and Excel dashboards). Using these outputs you can better understand what classic usage there is in your tenant, assess whether it's still relevant for you and get informed on potential remediation's needed before you can modernize. You would typically use the Microsoft Excel based dashboards to inspect the data and build up an understanding of the scan results. If you later on want to modernize sites, lists, etc you can use the CSV files as input for (PowerShell based) automation.
 
+> [!Note]
+> Assessing your workflow 2013 usage should be done using the [Microsoft 365 Assessment tool](https://aka.ms/microsoft365assessmenttool)
+
 ## Overview of the scanner output
 
 The output you'll depends on the chosen scan mode. Below table lists the available scan modes:

docs/transform/modernize-scanner.md

@@ -1,7 +1,7 @@
 ---
 title: The SharePoint modernization scanner
 description: Gets you started with the SharePoint modernization scanner
-ms.date: 07/21/2020
+ms.date: 05/20/2022
 ms.prod: sharepoint
 ms.localizationpriority: high
 ---
@@ -14,14 +14,14 @@ Using the SharePoint Modernization scanner you can prepare your classic sites fo
 - Connecting these sites to a Microsoft 365 group
 - Modernizing the wiki and web part pages by creating modern site pages
 - Rebuilding classic publishing portals as modern publishing portals
-- Understanding where classic workflow is used
 - Understanding where InfoPath is being used
 - Understanding the usage of classic blog pages
 
 This scanner is a key tool to use if you want to prepare for modernizing your classic sites as it will give you factual data about how easy it is to modernize your sites. Using the dashboards generated by the scanner you'll be able to drill down on the "modernization readiness" of your sites and plan the needed remediation work where needed.
 
 > [!NOTE]
-> The SharePoint modernization scanner only is supported for running against SharePoint Online. For scanning on-premises SharePoint you can consider using the [SharePoint Migration Assessment Tool](https://docs.microsoft.com/sharepointmigration/overview-of-the-sharepoint-migration-assessment-tool) (SMAT) or the [Microsoft Consulting Services open source version of the on-premises workflow scanner](https://github.com/microsoft/SP-Server-Workflow-Scanner).
+> - Assessing your workflow 2013 usage should be done using the [Microsoft 365 Assessment tool](https://aka.ms/microsoft365assessmenttool), this tool will step by step replace the still relevant features from the modernization scanner
+> - The SharePoint modernization scanner only is supported for running against SharePoint Online. For scanning on-premises SharePoint you can consider using the [SharePoint Migration Assessment Tool](https://docs.microsoft.com/sharepointmigration/overview-of-the-sharepoint-migration-assessment-tool) (SMAT) or the [Microsoft Consulting Services open source version of the on-premises workflow scanner](https://github.com/microsoft/SP-Server-Workflow-Scanner).
 >
 > [!IMPORTANT]
 > Modernization tooling and all other PnP components are open-source tools backed by an active community providing support for them. There is no SLA for open-source tool support from official Microsoft support channels.
@@ -214,12 +214,13 @@ Mode                      | Description
 `PageOnly`                | Includes a scan from wiki and web part pages + includes the Microsoft 365 group connection readiness component
 `PublishingOnly`          | Includes a classic publishing portal scan at site and web level + includes the Microsoft 365 group connection readiness component
 `PublishingWithPagesOnly` | Includes a classic publishing portal scan at site, web and page level + includes the Microsoft 365 group connection readiness component
-`WorkflowOnly`            | Includes the classic workflow scan + includes the Microsoft 365 group connection readiness component
-`WorkflowWithDetailsOnly` | Includes the classic workflow scan with workflow migration readiness analysis + includes the Microsoft 365 group connection readiness component
 `InfoPathOnly`            | Includes the InfoPath scan + includes the Microsoft 365 group connection readiness component
 `BlogOnly`                | Includes the Blog scan + includes the Microsoft 365 group connection readiness component
 `CustomizedFormsOnly`     | Includes the Customized Forms scan + includes the Microsoft 365 group connection readiness component
 
+> [!Note]
+> Assessing your workflow 2013 usage should be done using the [Microsoft 365 Assessment tool](https://aka.ms/microsoft365assessmenttool)
+
 ### Command-line parameter overview
 
 ```text