diff --git a/.github/workflows/AutoLabelMsftContributor.yml b/.github/workflows/AutoLabelMsftContributor.yml index c41825acc8..6fcfb6e43e 100644 --- a/.github/workflows/AutoLabelMsftContributor.yml +++ b/.github/workflows/AutoLabelMsftContributor.yml @@ -13,7 +13,7 @@ on: jobs: download-payload: - if: github.repository_visibility == 'public' + if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public' name: Download and extract payload artifact uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod with: @@ -24,7 +24,7 @@ jobs: label-msft: name: Label Microsoft contributors - if: github.repository_visibility == 'public' + if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public' needs: [download-payload] uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod with: @@ -32,4 +32,4 @@ jobs: secrets: AccessToken: ${{ secrets.GITHUB_TOKEN }} ClientId: ${{ secrets.M365_APP_CLIENT_ID }} - PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }} + PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }} \ No newline at end of file diff --git a/windows/client-management/mdm/policy-csp-windowsai.md b/windows/client-management/mdm/policy-csp-windowsai.md index caf72cbace..4708cd0e55 100644 --- a/windows/client-management/mdm/policy-csp-windowsai.md +++ b/windows/client-management/mdm/policy-csp-windowsai.md @@ -1,7 +1,7 @@ --- title: WindowsAI Policy CSP description: Learn more about the WindowsAI Area in Policy CSP. -ms.date: 03/12/2025 +ms.date: 03/26/2025 ms.topic: generated-reference --- @@ -370,6 +370,8 @@ This policy setting determines which app opens when the user presses the Copilot +The property value is the Application User Model ID (AUMID) for the target application. For example: the Microsoft 365 Copilot app is `Microsoft.MicrosoftOfficeHub_8wekyb3d8bbwe!Microsoft.MicrosoftOfficeHub`. For more information, see [Find the application user model ID of an installed app](/windows/configuration/store/find-aumid?tabs=ps%2Cexplorer&pivots=windows-11). + diff --git a/windows/configuration/images/icons/csp.svg b/windows/configuration/images/icons/csp.svg new file mode 100644 index 0000000000..6baa611d0f --- /dev/null +++ b/windows/configuration/images/icons/csp.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md b/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md index 59c2b07132..314755f244 100644 --- a/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md +++ b/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md @@ -11,5 +11,5 @@ If you enable this policy setting, the system deletes tile notifications when th | | Path | |--|--| -| **CSP** | ./Device/Vendor/MSFT/[Setting]() | +| **CSP** | Not available. | | **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** | diff --git a/windows/configuration/start/includes/configure-start-layout.md b/windows/configuration/start/includes/configure-start-layout.md index fca0c5315d..cff404744d 100644 --- a/windows/configuration/start/includes/configure-start-layout.md +++ b/windows/configuration/start/includes/configure-start-layout.md @@ -11,7 +11,7 @@ This policy setting lets you specify the Start layout for users, preventing them | | Path | |--|--| -| **CSP** | [Configure start layout](/windows/client-management/mdm/policy-csp-start#startlayout) | +| **CSP** | `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-start#configurestartpins)

`./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-start#configurestartpins)| | **GPO** | **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar**

**User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** | For more information, see [Customize the Start layout](../layout.md). diff --git a/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md b/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md index 55a74cc190..079c195b45 100644 --- a/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md +++ b/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md @@ -11,5 +11,5 @@ This policy setting prevents the system from conducting a comprehensive search o | | Path | |--|--| -| **CSP** | ./Device/Vendor/MSFT/[Setting]() | +| **CSP** | Not available. | | **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Do not use the search-based method when resolving shell shortcuts** | diff --git a/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md b/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md index a877effc15..33fbcdea70 100644 --- a/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md +++ b/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md @@ -11,5 +11,5 @@ This policy setting prevents the system from using NTFS tracking features to res | | Path | |--|--| -| **CSP** | ./Device/Vendor/MSFT/[Setting]() | +| **CSP** | Not available. | | **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Do not use the tracking-based method when resolving shell shortcuts** | diff --git a/windows/configuration/start/layout.md b/windows/configuration/start/layout.md index 2bd6d4e1aa..42002f195e 100644 --- a/windows/configuration/start/layout.md +++ b/windows/configuration/start/layout.md @@ -446,7 +446,7 @@ Learn how to [Find the Application User Model ID of an installed app](../store/f ::: zone pivot="windows-10" -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune-10) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune-10) To configure devices with Microsoft Intune, [create a Settings catalog policy](/mem/intune/configuration/settings-catalog) and use one of the following settings: @@ -457,14 +457,14 @@ To configure devices with Microsoft Intune, [create a Settings catalog policy](/ [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][MEM-1] with the [Start CSP][WIN-1]. Use one of the following settings: +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-10) + +You can configure devices using the [Start CSP][WIN-1]. Use one of the following settings: | Setting | |--| -| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **String:**
- **Value:** content of the XML file | -| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:**
- **Value:** content of the XML file | - -[!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] +| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | +| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg-10) @@ -572,7 +572,7 @@ The GPO applies the Start and taskbar layout at the next user sign-in. Each time > [!IMPORTANT] > The JSON file can be applied to devices using the [Start policy CSP][WIN-1] only. It's not possible to apply the JSON file using group policy. -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune-11) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune-11) To configure devices with Microsoft Intune, [create a Settings catalog policy](/mem/intune/configuration/settings-catalog) and use one of the following settings: @@ -583,14 +583,14 @@ To configure devices with Microsoft Intune, [create a Settings catalog policy](/ [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][MEM-1] with the [Start CSP][WIN-1]. Use one of the following settings: +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-11) + +You can configure devices using the [Start CSP][WIN-1]. Use one of the following settings: | Setting | |--| -| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **String:**
- **Value:** content of the JSON file | -| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:**
- **Value:** content of the JSON file | - -[!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] +| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:** String
- **Value:** content of the JSON file | +| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:** String
- **Value:** content of the JSON file | #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg-11) diff --git a/windows/configuration/start/policy-settings.md b/windows/configuration/start/policy-settings.md index 08a7751472..7b70363330 100644 --- a/windows/configuration/start/policy-settings.md +++ b/windows/configuration/start/policy-settings.md @@ -191,7 +191,6 @@ Select one of the tabs to see the list of available settings: #### [:::image type="icon" source="../images/icons/power.svg"::: **Power options**](#tab/power) - ::: zone pivot="windows-11" |Policy name| CSP | GPO | |-|-|-| diff --git a/windows/configuration/taskbar/pinned-apps.md b/windows/configuration/taskbar/pinned-apps.md index 6f93e76b25..55c18953c5 100644 --- a/windows/configuration/taskbar/pinned-apps.md +++ b/windows/configuration/taskbar/pinned-apps.md @@ -165,7 +165,7 @@ In the following XML example, two regions are added: `US|UK` and `DE|FR|IT`: [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)] -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune) To configure devices with Microsoft Intune, [create a Settings catalog policy](/mem/intune/configuration/settings-catalog) and use one of the following settings: @@ -176,14 +176,14 @@ To configure devices with Microsoft Intune, [create a Settings catalog policy](/ [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][MEM-1] with the [Start CSP][WIN-1]. Use one of the following settings: +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp) + +You can configure devices using the [Start CSP][WIN-1]. Use one of the following settings: | Setting | |--| -| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **String:**
- **Value:** content of the XML file | -| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:**
- **Value:** content of the XML file | - -[!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] +| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | +| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg) @@ -214,7 +214,9 @@ The GPO applies the Start and taskbar layout at the next user sign-in. Each time ## User experience -After the taskbar layout is applied, the users must sign out and sign in again to see the new layout. Unless prohibited via policy settings, users can pin more apps, change the order, and unpin apps from the taskbar. +After the taskbar layout is applied, users must sign out and sign in again to see the new layout. Unless prohibited via policy settings, users can pin more apps, change the order, and unpin apps from the taskbar. + +Any pins provisioned via policy settings are restored upon the next policy refresh, even when users unpin them. ### OS install and upgrade experience diff --git a/windows/deployment/update/release-cycle.md b/windows/deployment/update/release-cycle.md index 5e08f00c11..5e509e0177 100644 --- a/windows/deployment/update/release-cycle.md +++ b/windows/deployment/update/release-cycle.md @@ -11,7 +11,7 @@ ms.localizationpriority: medium appliesto: - ✅ Windows 11 - ✅ Windows 10 -ms.date: 01/31/2025 +ms.date: 03/27/2025 --- # Update release cycle for Windows clients @@ -21,6 +21,8 @@ Windows updates help you to stay productive and protected. They provide your use This article provides details on the types of updates that Microsoft provides, and how they help make the overall user experience simple and consistent. +[!INCLUDE [Windows roadmap](../../whats-new/includes/windows-roadmap.md)] + ## Types of update releases |Release type | Description | Release cycle | diff --git a/windows/deployment/upgrade/setupdiag.md b/windows/deployment/upgrade/setupdiag.md index c66b48114b..140ffb27b7 100644 --- a/windows/deployment/upgrade/setupdiag.md +++ b/windows/deployment/upgrade/setupdiag.md @@ -12,7 +12,7 @@ ms.topic: troubleshooting ms.collection: - highpri - tier2 -ms.date: 01/29/2025 +ms.date: 03/27/2025 appliesto: - ✅ Windows 11 - ✅ Windows 10 @@ -77,6 +77,8 @@ If the upgrade process proceeds normally, the **Sources** directory including ** As long as at least the required version of .NET is installed, no additional action is required, including if a newer version is installed. +1. **Setupdiag.exe** should be run from an elevated command prompt for it to work properly. + ## Using SetupDiag To quickly use SetupDiag on the current computer: @@ -126,7 +128,11 @@ For instructions on how to run the tool in offline mode and with more advanced o ### Examples -- In the following example, SetupDiag is run with default parameters in online mode. The results file is **SetupDiagResults.log** in the same folder where SetupDiag is run. +> [!IMPORTANT] +> +> **SetupDiage.exe** should be run from an elevated command prompt for it to work properly. + +- In the following example, SetupDiag is run without parameters and it displays interactive help. ```cmd SetupDiag.exe diff --git a/windows/deployment/usmt/getting-started-with-the-user-state-migration-tool.md b/windows/deployment/usmt/getting-started-with-the-user-state-migration-tool.md index d1313e2a39..103b3e14b9 100644 --- a/windows/deployment/usmt/getting-started-with-the-user-state-migration-tool.md +++ b/windows/deployment/usmt/getting-started-with-the-user-state-migration-tool.md @@ -8,7 +8,7 @@ ms.service: windows-client author: frankroj ms.topic: get-started ms.subservice: itpro-deploy -ms.date: 01/29/2025 +ms.date: 03/27/2025 appliesto: - ✅ Windows 11 - ✅ Windows 10 @@ -18,7 +18,15 @@ appliesto: This article outlines the general process to follow to migrate files and settings. -## Step 1: Plan the migration +## Step 1: Download and install USMT + +USMT is part of the Windows Assessment and Deployment Kit (Windows ADK) and can be downloaded from the following link: + +[Download and install the Windows ADK](/windows-hardware/get-started/adk-install) + +Once the Windows ADK installer is downloaded, run the installer, and then in the **Select the features you want to install** page, make sure **User State Migration Tool (USMT)** is selected. + +## Step 2: Plan the migration 1. [Plan The Migration](usmt-plan-your-migration.md). Depending on whether the migration scenario is refreshing or replacing computers, an online migration or an offline migration can be chosen. Offline migrations can use either Windows Preinstallation Environment (WinPE) or the files in the **Windows.old** directory. For more information, see [Common Migration Scenarios](usmt-common-migration-scenarios.md). @@ -55,7 +63,7 @@ This article outlines the general process to follow to migrate files and setting 1. Open the `Config.xml` that was generated in the previous step. Review the migration state of each of the components listed in the `Config.xml` file. If necessary, edit the `Config.xml` file and specify `migrate=no` for any components that don't need to be migrated. -## Step 2: Collect files and settings from the source computer +## Step 3: Collect files and settings from the source computer 1. Back up the source computer. @@ -77,7 +85,7 @@ This article outlines the general process to follow to migrate files and setting 1. To ensure that the created store isn't corrupted, run the `UsmtUtils.exe` command with the `/Verify` option. -## Step 3: Prepare the destination computer and restore files and settings +## Step 4: Prepare the destination computer and restore files and settings 1. Install the operating system on the destination computer. diff --git a/windows/deployment/usmt/usmt-overview.md b/windows/deployment/usmt/usmt-overview.md index 0e8726cf9a..0eaa678d6e 100644 --- a/windows/deployment/usmt/usmt-overview.md +++ b/windows/deployment/usmt/usmt-overview.md @@ -7,7 +7,7 @@ author: frankroj ms.reviewer: kevinmi,warrenw manager: aaroncz ms.author: frankroj -ms.date: 01/29/2025 +ms.date: 03/27/2025 ms.topic: overview ms.collection: - highpri @@ -49,6 +49,14 @@ There are some scenarios in which the use of USMT isn't recommended. These scena - Migrations that require end-user interaction. - Migrations that require customization on a machine-by-machine basis. +## Download and install USMT + +USMT is part of the Windows Assessment and Deployment Kit (Windows ADK) and can be downloaded from the following link: + +[Download and install the Windows ADK](/windows-hardware/get-started/adk-install) + +Once the Windows ADK installer is downloaded, run the installer, and then in the **Select the features you want to install** page, make sure **User State Migration Tool (USMT)** is selected. + ## Related articles - [User State Migration Tool (USMT) technical reference](usmt-technical-reference.md). diff --git a/windows/whats-new/includes/windows-roadmap.md b/windows/whats-new/includes/windows-roadmap.md new file mode 100644 index 0000000000..a5d9b2189c --- /dev/null +++ b/windows/whats-new/includes/windows-roadmap.md @@ -0,0 +1,11 @@ +--- +author: mestew +ms.author: mstewart +ms.topic: include +ms.date: 03/27/2025 +--- + +> [!Tip] +> If you'd like to know what's coming to Windows, check out the [Windows Roadmap](https://www.microsoft.com/windows/business/roadmap). The roadmap is a high-level overview of the features and functionality that are planned for future releases of Windows. + + \ No newline at end of file diff --git a/windows/whats-new/temporary-enterprise-feature-control.md b/windows/whats-new/temporary-enterprise-feature-control.md index cfc161dd97..e7887b1088 100644 --- a/windows/whats-new/temporary-enterprise-feature-control.md +++ b/windows/whats-new/temporary-enterprise-feature-control.md @@ -8,7 +8,7 @@ author: mestew manager: aaroncz ms.localizationpriority: medium ms.topic: reference -ms.date: 11/01/2023 +ms.date: 03/27/2025 ms.collection: - highpri - tier2 @@ -25,6 +25,9 @@ New features and enhancements are introduced through the monthly cumulative upda Features that are turned off by default are listed in the KB article for the monthly cumulative update. Typically, a feature is selected to be off by default because it either impacts the user experience or IT administrators significantly. For example, a feature might be turned off by default if it requires a change in user behavior or if it requires IT administrators to take action before the feature can be used. + +[!INCLUDE [Windows roadmap](./includes/windows-roadmap.md)] + ## Temporary enterprise feature control Features behind temporary enterprise control are automatically disabled for devices that have their Windows updates managed by policies. diff --git a/windows/whats-new/windows-11-overview.md b/windows/whats-new/windows-11-overview.md index bceae6230c..88e4b929b7 100644 --- a/windows/whats-new/windows-11-overview.md +++ b/windows/whats-new/windows-11-overview.md @@ -5,7 +5,7 @@ manager: aaroncz author: mestew ms.author: mstewart ms.service: windows-client -ms.date: 01/31/2024 +ms.date: 03/27/2025 ms.subservice: itpro-fundamentals ms.localizationpriority: medium ms.topic: overview @@ -27,6 +27,8 @@ Your investments in updates and device management are carried forward. For examp This article lists what's new, and some of the features & improvements. For more information on what's new for OEMs, see [What's new in manufacturing, customization, and design](/windows-hardware/get-started/what-s-new-in-windows). +[!INCLUDE [Windows roadmap](./includes/windows-roadmap.md)] + ## Security and scanning The security and privacy features in Windows 11 are similar to Windows 10. Security for your devices starts with the hardware, and includes OS security, application security, and user & identity security. There are features available in the Windows OS to help in these areas. This section describes some of these features. For a more comprehensive view, including zero trust, see [Windows security](/windows/security/). diff --git a/windows/whats-new/windows-11-plan.md b/windows/whats-new/windows-11-plan.md index c3887cd926..b12e6744d3 100644 --- a/windows/whats-new/windows-11-plan.md +++ b/windows/whats-new/windows-11-plan.md @@ -12,7 +12,7 @@ ms.collection: - tier1 - essentials-get-started ms.subservice: itpro-fundamentals -ms.date: 07/12/2024 +ms.date: 03/27/2025 appliesto: - ✅ Windows 11 --- @@ -104,6 +104,8 @@ A consolidated [Windows 11 update history](https://support.microsoft.com/topic/5 It's important that organizations have adequate time to plan for Windows 11. Microsoft also recognizes that many organizations have a mix of Windows 11 and Windows 10 devices across their ecosystem. Devices on in-service versions of Windows 10 continue to receive monthly Windows 10 security updates, and incremental improvements to Windows 10 to support ongoing Microsoft 365 deployments. For more information, see the [Windows 10 release information](/windows/release-health/release-information) page. +[!INCLUDE [Windows roadmap](./includes/windows-roadmap.md)] + ## Application compatibility Microsoft's compatibility promise for Windows 10 is maintained for Windows 11. Data from the App Assure program shows that Windows 10 compatibility rates are over 99.7% for enterprise organizations, including line of business (LOB) apps. Microsoft remains committed to ensuring that the apps you rely upon continue to work as expected when you upgrade. Windows 11 is subject to the same app compatibility validation requirements that are in place for Windows 10 today, for both feature and quality updates.