diff --git a/docs/ide/color-emojis.md b/docs/ide/color-emojis.md
new file mode 100644
index 00000000000..3264d572a06
--- /dev/null
+++ b/docs/ide/color-emojis.md
@@ -0,0 +1,52 @@
+---
+title: Use color emojis in Visual Studio
+description: Learn where Visual Studio shows emojis in full color, including comments, Markdown, Copilot Chat, Output window text, and Solution Explorer items.
+ms.date: 06/08/2026
+ms.topic: how-to
+author: ghogen
+ms.author: ghogen
+ms.subservice: general-ide
+---
+
+# Use color emojis in Visual Studio
+
+Visual Studio renders emojis in full color across common IDE surfaces. You can use emoji markers in comments, Markdown, and collaboration workflows while keeping the same visual meaning when you move between views.
+
+## What color emoji support includes
+
+Emoji characters now render in full color instead of monochrome outlines in supported Visual Studio surfaces. This behavior can make visual markers easier to scan in large files, logs, and tool windows.
+
+## Where you see color emojis
+
+You can use color emojis in the following places:
+
+- Code comments
+- Markdown files and Markdown preview
+- GitHub Copilot Chat responses and prompts
+- Output window text and logs
+- Solution Explorer item and file names
+
+## Try it quickly
+
+Use this short check to verify rendering behavior in your environment:
+
+1. Open a code file and add a comment that includes emojis, such as `// TODO ✅`.
+1. Open or create a Markdown file and add a line with emojis, such as `Status: 🟢 Ready`.
+1. Open **View** > **GitHub Copilot Chat** and submit a prompt that includes emojis.
+1. Build a project and review text in the **Output** window.
+1. Rename a test file or folder in **Solution Explorer** to include an emoji and confirm color rendering.
+
+To insert emoji characters while you're typing, use the Windows emoji picker by pressing Windows+. (period), and then select an emoji.
+
+## Notes and limitations
+
+- Emoji appearance can vary slightly by Windows configuration, installed fonts, and scaling settings.
+- In Visual Studio, supported emoji characters are rendered with full color in the UI surfaces listed in this article.
+- For more ways to enter emojis and symbols in Windows, see [Emoji, kaomoji, and symbols panel](https://support.microsoft.com/en-us/windows/windows-keyboard-tips-and-tricks-588e0b72-0fff-6d3f-aeee-6e5116097942).
+
+## Related content
+
+- [Markdown preview controls](markdown-preview.md)
+- [About GitHub Copilot Chat in Visual Studio](visual-studio-github-copilot-chat.md)
+- [Learn about Solution Explorer](use-solution-explorer.md)
+- [Output Window](output-window.md)
diff --git a/docs/ide/how-to-customize-menus-and-toolbars-in-visual-studio.md b/docs/ide/how-to-customize-menus-and-toolbars-in-visual-studio.md
index 0a75b03a442..134af450f1b 100644
--- a/docs/ide/how-to-customize-menus-and-toolbars-in-visual-studio.md
+++ b/docs/ide/how-to-customize-menus-and-toolbars-in-visual-studio.md
@@ -1,7 +1,7 @@
---
title: Customize menus and toolbars
description: Learn how to customize Visual Studio menus and toolbars, and also learn how to customize any commands included in the menus and toolbars.
-ms.date: 01/27/2023
+ms.date: 06/10/2026
ms.topic: how-to
f1_keywords:
- vs.renametoolbar
diff --git a/docs/ide/markdown-preview.md b/docs/ide/markdown-preview.md
index 835cd71cec6..ebc7b9c580d 100644
--- a/docs/ide/markdown-preview.md
+++ b/docs/ide/markdown-preview.md
@@ -17,6 +17,8 @@ monikerRange: "visualstudio"
The Visual Studio Markdown editor gives you more control over how you view and edit Markdown files. You can switch between different preview modes to focus on either editing or viewing rendered content, and you can zoom in on Mermaid diagrams to see details in complex visualizations.
+For general behavior and supported surfaces, including emoji rendering in full color, see [Use color emojis in Visual Studio](color-emojis.md).
+
## Preview modes
Visual Studio provides three preview modes for working with Markdown files:
diff --git a/docs/ide/mcp-servers.md b/docs/ide/mcp-servers.md
index 318a561429a..94176c5f30d 100644
--- a/docs/ide/mcp-servers.md
+++ b/docs/ide/mcp-servers.md
@@ -1,7 +1,7 @@
---
-title: Use MCP Servers
-description: Learn how to add MCP servers in Visual Studio to extend GitHub Copilot agent capabilities, set up mcp.json, and manage tool permissions.
-ms.date: 04/29/2026
+title: Use MCP Servers to Extend GitHub Copilot
+description: Learn how to add MCP servers in Visual Studio, configure mcp.json, and manage tool permissions to extend GitHub Copilot agents. Get started.
+ms.date: 05/26/2026
ms.update-cycle: 180-days
ms.topic: get-started
author: RoseHJM
@@ -13,9 +13,9 @@ ai-usage: ai-assisted
---
-# Use MCP servers
+# Use MCP servers in Visual Studio
-Model Context Protocol (MCP) is an open standard that lets GitHub Copilot use tools and services outside the IDE. In Visual Studio, MCP lets GitHub Copilot agents use external tools by connecting MCP clients to MCP servers that expose important functionality like file access, repo management, or PR creation. By standardizing how tools are discovered and invoked, MCP removes the need for custom integrations and makes it easy to extend AI assistants simply by adding new MCP servers.
+MCP servers use the open Model Context Protocol (MCP) to let GitHub Copilot use tools and services outside the IDE. In Visual Studio, you can add MCP servers to extend agent capabilities for tasks such as file access, repo management, and pull request creation.
MCP support enhances GitHub Copilot agent mode by allowing you to connect any MCP-compatible server to your agentic coding workflow. MCP support in Visual Studio works as follows:
@@ -57,29 +57,29 @@ Try out some popular MCP servers in Visual Studio with one-click:
- [](https://vs-open.link/mcp-install?%7B%22name%22%3A%22mongodb%22%2C%22gallery%22%3Atrue%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22mongodb-mcp-server%22%5D%7D) – Database operations and management. Execute queries, manage collections, aggregation pipelines, and document operations.
- [](https://vs-open.link/mcp-install?%7B%22name%22%3A%22huggingface%22%2C%22gallery%22%3Atrue%2C%22url%22%3A%22https%3A%2F%2Fhf.co%2Fmcp%22%7D) – Access models, datasets, and Spaces on the Hugging Face Hub.
-### Add an MCP Server from chat
+### Add an MCP server from chat
To add an MCP server from chat view:
1. Select the green plus (`+`) button in the tool picker in the chat window.
- :::image type="content" source="media/vs-2022/mcp-servers/plus-button-add-mcp.png" alt-text="Screenshot the plus button in tool picker of Visual Studio chat to add MCP server." lightbox="media/vs-2022/mcp-servers/configure-server-visual-studio.png":::
+ :::image type="content" source="media/vs-2022/mcp-servers/plus-button-add-mcp.png" alt-text="Screenshot of the plus button in the Visual Studio chat tool picker for adding an MCP server." lightbox="media/vs-2022/mcp-servers/configure-server-visual-studio.png":::
1. Specify the server name and connection details, such as the URL for HTTP servers or the command and arguments for stdio servers.
- :::image type="content" source="media/vs-2022/mcp-servers/configure-server-visual-studio.png" alt-text="Screenshot that shows adding an MCP server from the chat view." lightbox="media/vs-2022/mcp-servers/configure-server-visual-studio.png":::
+ :::image type="content" source="media/vs-2022/mcp-servers/configure-server-visual-studio.png" alt-text="Screenshot of the chat view for adding an MCP server in Visual Studio." lightbox="media/vs-2022/mcp-servers/configure-server-visual-studio.png":::
### Add an MCP server from the GitHub MCP server registry
-You can install an MCP server directly from the GitHub MCP server registry via Extensions in Visual Studio.
+You can install an MCP server directly from the GitHub MCP server registry via **Extensions** in Visual Studio.
1. From the Visual Studio menu, select **Extensions** > **MCP Registries...** to open the **MCP Server Manager**.
- :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-registry.png" alt-text="Screenshot that shows the Extensions menu for MCP Registries." lightbox="media/vs-2022/mcp-servers/model-context-protocol-registry.png":::
+ :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-registry.png" alt-text="Screenshot of the Extensions menu option for MCP Registries in Visual Studio." lightbox="media/vs-2022/mcp-servers/model-context-protocol-registry.png":::
1. Select the server you want, and then select **Install** for your Visual Studio instance.
- :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-server-manager.png" alt-text="Screenshot that shows adding an MCP server from the MCP Server Manager." lightbox="media/vs-2022/mcp-servers/model-context-protocol-server-manager.png":::
+ :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-server-manager.png" alt-text="Screenshot of the MCP Server Manager for installing an MCP server." lightbox="media/vs-2022/mcp-servers/model-context-protocol-server-manager.png":::
### Add an MCP server to the `.mcp.json` file
@@ -105,23 +105,23 @@ The following steps walk you through a configuration example with the GitHub MCP
1. In the file, select **Authentication Required** from the CodeLens that appears to authenticate to the server through a GitHub account.
Select **Authenticate** on the pop-up dialog to authenticate with your GitHub account.
- :::image type="content" source="media/vs-2022/mcp-servers/codelens-authentication.png" alt-text="Screenshot that shows CodeLens authentication." lightbox="media/vs-2022/mcp-servers/codelens-authentication.png":::
+ :::image type="content" source="media/vs-2022/mcp-servers/codelens-authentication.png" alt-text="Screenshot of the CodeLens prompt for MCP server authentication." lightbox="media/vs-2022/mcp-servers/codelens-authentication.png":::
If you don't see the CodeLens, ensure it's enabled in **Tools** > **Options** > **Text Editor** > **CodeLens**.
1. At the bottom of the chat panel, select **Agent** from the mode dropdown.
- :::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-dropdown.png" alt-text="Screenshot that shows the Copilot agent mode selector." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-dropdown.png":::
+ :::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-dropdown.png" alt-text="Screenshot of the GitHub Copilot agent mode selector in the chat pane." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-dropdown.png":::
1. Select the tools that you want to use, for example, **List issues**.
- :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-github-tools-list.png" alt-text="Screenshot that shows MCP GitHub tools." lightbox="media/vs-2022/mcp-servers/model-context-protocol-github-tools-list.png":::
+ :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-github-tools-list.png" alt-text="Screenshot of GitHub MCP tools available in the Visual Studio chat pane." lightbox="media/vs-2022/mcp-servers/model-context-protocol-github-tools-list.png":::
Try a sample prompt: **List issues assigned to me on GitHub**.
1. Copilot asks for permission to use a tool that the MCP server made available to it. Select **Allow** with the scope that you want to proceed with.
- :::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png" alt-text="Screenshot that shows confirmation options for agent tools." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png":::
+ :::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png" alt-text="Screenshot of confirmation options for GitHub Copilot agent tools." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png":::
## Manage configuration of MCP servers
@@ -157,7 +157,7 @@ It's common to invoke tools through package managers. For example, use `npx -y @
The format must follow the MCP specification. For example, it must include an array of server objects, each with `name`, `command` or `url`, and `transport`.
-### Editing MCP configuration
+### Edit MCP configuration
If you have an existing `mcp.json` file and you check the file into your version control system, add the file location to **Solution Items** in Solution Explorer.
@@ -165,13 +165,13 @@ When you save the file with valid syntax, the GitHub Copilot agent restarts and
:::moniker range="visualstudio"
-:::image type="content" source="media/visualstudio/model-context-protocol-add-solution-item.png" alt-text="Screenshot that shows how to add the MCP configuration file location to Solution Items." lightbox="media/visualstudio/model-context-protocol-add-solution-item.png":::
+:::image type="content" source="media/visualstudio/model-context-protocol-add-solution-item.png" alt-text="Screenshot of adding the MCP configuration file location to Solution Items." lightbox="media/visualstudio/model-context-protocol-add-solution-item.png":::
:::moniker-end
:::moniker range="<=vs-2022"
-:::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-add-solution-item.png" alt-text="Screenshot that shows adding the MCP configuration file location to Solution Items." lightbox="media/vs-2022/mcp-servers/model-context-protocol-add-solution-item.png":::
+:::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-add-solution-item.png" alt-text="Screenshot of the MCP configuration file location added to Solution Items." lightbox="media/vs-2022/mcp-servers/model-context-protocol-add-solution-item.png":::
:::moniker-end
@@ -186,7 +186,50 @@ As soon as Visual Studio discovers or adds a server:
- If you remove a server, Visual Studio immediately stops its process and withdraws all its tools from the UI.
- If you edit a server definition, Visual Studio terminates and restarts it, and then re-queries.
-### Management of tool approvals
+:::moniker range="visualstudio"
+
+## MCP server trust dialog
+
+> [!NOTE]
+> MCP server trust is available in Visual Studio 2026 version 18.7 and later.
+
+Visual Studio asks you to trust an MCP server again when the server has changed since the last time you used it. This prompt helps you decide whether to run the updated server.
+
+### What to do when you're prompted
+
+When the trust dialog appears, review the change and choose the action that matches your intent:
+
+- **Accept** to run this updated version now.
+- **Always Trust** to stop future trust prompts for this server.
+- **Reject** to stop startup because you don't want to run the updated server.
+
+If you choose **Reject**, Visual Studio doesn't start the server and asks again the next time you try to activate it.
+
+### When you'll see the trust dialog
+
+You'll be prompted when Visual Studio detects changes to either of these:
+
+- Server configuration details, such as transport type, URL, command, or arguments.
+- Server capabilities, such as tools, prompts, resources, resource templates, or instructions.
+
+### When you won't see the trust dialog
+
+Visual Studio skips the prompt when:
+
+- The server is built in and shipped with the extension.
+- Organization policy is set to `RegistryOnly`.
+- You already selected **Always Trust** for that server.
+- It's the first time the server is seen. Visual Studio saves an initial trust baseline automatically.
+
+### Turn trust prompts on or off for updated MCP servers
+
+To control whether Visual Studio prompts before running tools from an updated MCP server, go to **Tools** > **Options** > **GitHub** > **Copilot** and in **Copilot Chat** select or clear **Show trust dialog before running tools from an updated MCP server**.
+
+If you don't see this setting, update to Visual Studio 2026 version 18.7 or later.
+
+:::moniker-end
+
+## Management of tool approvals
When you invoke a tool, Copilot requests confirmation to run the tool. The reason is that tools might run locally on your machine and perform actions that modify files or data.
@@ -194,7 +237,7 @@ When you invoke a tool, Copilot requests confirmation to run the tool. The reaso
After a tool invocation, on the chat pane, use the **Confirm** dropdown options. You can automatically confirm the specific tool for the current session, the current solution, or all future invocations.
-:::image type="content" source="media/visualstudio/copilot-agent-tool-approval.png" alt-text="Screenshot that shows how to manage agent tool approvals." lightbox="media/visualstudio/copilot-agent-tool-approval.png":::
+:::image type="content" source="media/visualstudio/copilot-agent-tool-approval.png" alt-text="Screenshot of the chat pane options for managing agent tool approvals." lightbox="media/visualstudio/copilot-agent-tool-approval.png":::
:::moniker-end
@@ -202,7 +245,7 @@ After a tool invocation, on the chat pane, use the **Confirm** dropdown options.
After a tool invocation, on the chat pane, use the **Allow** dropdown options. You can automatically confirm the specific tool for the current session, the current solution, or all future invocations.
-:::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png" alt-text="Screenshot that shows managing agent tool approvals." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png":::
+:::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png" alt-text="Screenshot of agent tool approval options in the Visual Studio chat pane." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png":::
:::moniker-end
@@ -210,7 +253,7 @@ After a tool invocation, on the chat pane, use the **Allow** dropdown options. Y
You can reset tool confirmation selections in the **Tools** > **Options** dialog, in the **All Settings** > **GitHub** > **Copilot** > **Tools** section.
-:::image type="content" source="media/visualstudio/copilot-agent-tool-config.png" alt-text="Screenshot that shows Copilot tool configuration settings." lightbox="media/visualstudio/copilot-agent-tool-config.png":::
+:::image type="content" source="media/visualstudio/copilot-agent-tool-config.png" alt-text="Screenshot of GitHub Copilot tool configuration settings in Visual Studio." lightbox="media/visualstudio/copilot-agent-tool-config.png":::
:::moniker-end
@@ -218,7 +261,7 @@ You can reset tool confirmation selections in the **Tools** > **Options** dialog
You can reset tool confirmation selections in the **Tools** > **Options** dialog, under the **GitHub** > **Copilot** section in the **Tools** group.
-:::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-config.png" alt-text="Screenshot that shows tool configuration settings." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-config.png":::
+:::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-config.png" alt-text="Screenshot of tool configuration settings for GitHub Copilot in Visual Studio." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-config.png":::
:::moniker-end
diff --git a/docs/ide/output-window.md b/docs/ide/output-window.md
index 7203081a5d9..099b9423500 100644
--- a/docs/ide/output-window.md
+++ b/docs/ide/output-window.md
@@ -52,6 +52,8 @@ Turns the Word Wrap feature on and off in the **Output** pane. When Word Wrap is
The **Output** pane selected in the **Show output from** list displays output from the source indicated.
+Emoji characters in Output text render in full color. For more information about emoji behavior across Visual Studio surfaces, see [Use color emojis in Visual Studio](color-emojis.md).
+
## Route messages to the Output window
To display the **Output** window whenever you build a project, in the **Options** dialog box, on the **Projects and Solutions** > **General** page, select **Show Output window when build starts**. Then, with a code file open for editing, choose **Go to Next Message** and **Go To Previous Message** on the **Output** window toolbar to select entries in the **Output** pane. As you do this, the insertion point in the code editor jumps to the line of code where the selected problem occurs.
diff --git a/docs/ide/synchronized-settings-in-visual-studio.md b/docs/ide/synchronized-settings-in-visual-studio.md
index cb9b99f5258..a0023b3b9d0 100644
--- a/docs/ide/synchronized-settings-in-visual-studio.md
+++ b/docs/ide/synchronized-settings-in-visual-studio.md
@@ -1,7 +1,7 @@
---
title: Synchronize settings across multiple computers
description: Learn how to synchronize your Visual Studio settings across multiple computers by signing in to the same personalization account.
-ms.date: 05/20/2022
+ms.date: 06/10/2026
ms.topic: how-to
author: ghogen
ms.author: ghogen
@@ -70,7 +70,7 @@ When you first sign in to Visual Studio 2026, settings from your Visual Studio 2
## Side-by-side synchronized settings
-Certain settings like tool window layout aren't shared between different side-by-side installations of Visual Studio. For example, the *CurrentSettings.vssettings* file in *%userprofile%\Documents\Visual Studio 2019\Settings* is in an installation-specific folder that is similar to *%localappdata%\Microsoft\VisualStudio\16.0_xxxxxxxx\Settings*.
+Settings aren't shared between different side-by-side installations of Visual Studio. The *CurrentSettings.vssettings* file is in an installation-specific folder that is similar to *%localappdata%\Microsoft\VisualStudio\version_xxxxxxxx\Settings*.
## Reset synchronized settings
diff --git a/docs/ide/use-solution-explorer.md b/docs/ide/use-solution-explorer.md
index 7fd71ab8b76..0bb515c3d08 100644
--- a/docs/ide/use-solution-explorer.md
+++ b/docs/ide/use-solution-explorer.md
@@ -15,6 +15,8 @@ ms.subservice: general-ide
You can use Solution Explorer to manage the projects and files within a solution. This article describes the Solution Explorer user interface (UI) in detail, and how to open Solution Explorer if you inadvertently close it. The article also describes how you can use right-click context menu in Solution Explorer to quickly add new files, folders, and code elements to a project.
+Solution and item names that include emoji characters render in full color. For more information, see [Use color emojis in Visual Studio](color-emojis.md).
+
## Open Solution Explorer
By default, the Solution Explorer tool window appears as a pane in the upper-right side of the Visual Studio [integrated development environment](../get-started/visual-studio-ide.md) (IDE). If you don't see the Solution Explorer tool window, you can open it from the Visual Studio menu bar by using **View** > **Solution Explorer**, or by selecting Ctrl+Alt+L.
diff --git a/docs/ide/visual-studio-github-copilot-chat.md b/docs/ide/visual-studio-github-copilot-chat.md
index 83cc6ad83b8..12a06178abc 100644
--- a/docs/ide/visual-studio-github-copilot-chat.md
+++ b/docs/ide/visual-studio-github-copilot-chat.md
@@ -199,6 +199,8 @@ Use any of the following image formats: PNG, JPEG, and GIF (single-frame only).
You can preview any Markdown content generated by Copilot Chat directly in the Visual Studio Markdown editor.
+Emoji characters in chat and previewed Markdown content render in full color. For more information, see [Use color emojis in Visual Studio](color-emojis.md).
+
:::image type="content" source="media/visualstudio/visual-studio-github-copilot-chat/preview-markdown.png" alt-text="Screenshot of the Preview button in the Copilot Chat window for Markdown content." lightbox="media/visualstudio/visual-studio-github-copilot-chat/preview-markdown.png" :::
When Copilot Chat generates Markdown content, select the **Preview** button at the upper-right corner of the chat window to see a rendered preview. From there, you can edit and save the Markdown content as needed. This feature is helpful when you want to quickly visualize and work on Markdown files without manually copying and pasting.
diff --git a/docs/install/workload-and-component-ids.md b/docs/install/workload-and-component-ids.md
index 2f632dc12f8..cfbe45bb645 100644
--- a/docs/install/workload-and-component-ids.md
+++ b/docs/install/workload-and-component-ids.md
@@ -34,6 +34,7 @@ Click the edition names in the following table to see the available workload and
| [Visual Studio Build Tools 2022](workload-component-id-vs-build-tools.md?view=vs-2022&preserve-view=true) | Microsoft.VisualStudio.Product.BuildTools | The Visual Studio Build Tools allows you to build native and managed MSBuild-based applications without requiring the Visual Studio IDE. There are options to install the Visual C++ compilers and libraries, MFC, ATL, and C++/CLI support. |
| [Visual Studio Test Agent 2022](workload-component-id-vs-test-agent.md?view=vs-2022&preserve-view=true) | Microsoft.VisualStudio.Product.TestAgent | Supports running automated tests and load tests remotely |
| [Visual Studio Load Test Controller 2022](workload-component-id-vs-test-controller.md?view=vs-2022&preserve-view=true) | Microsoft.VisualStudio.Product.TestController | Distribute automated tests to multiple machines |
+| [SQL Server Management Studio (SSMS)](/ssms/install/workload-component-ids) | Microsoft.VisualStudio.Product.Ssms | An integrated environment for managing SQL infrastructure. |
For more information about how to use these lists, see the [Use command-line parameters to install Visual Studio](use-command-line-parameters-to-install-visual-studio.md?view=vs-2022&preserve-view=true) page and the [Update a Visual Studio extension for Visual Studio 2026](../extensibility/migration/update-visual-studio-extension.md) page.
@@ -51,6 +52,7 @@ For more information about how to use these lists, see the [Use command-line par
| [Visual Studio Community 2026](workload-component-id-vs-community.md?view=vs-2026&preserve-view=true) | Microsoft.VisualStudio.Product.Community | Free, fully featured IDE for students, open-source, and individual developers |
| [Visual Studio Team Explorer 2026](workload-component-id-vs-team-explorer.md?view=vs-2026&preserve-view=true) | Microsoft.VisualStudio.Product.TeamExplorer | Interact with Team Foundation Server and Azure DevOps Services without a Visual Studio developer toolset |
| [Visual Studio Build Tools 2026](workload-component-id-vs-build-tools.md?view=vs-2026&preserve-view=true) | Microsoft.VisualStudio.Product.BuildTools | The Visual Studio Build Tools allows you to build native and managed MSBuild-based applications without requiring the Visual Studio IDE. There are options to install the Visual C++ compilers and libraries, MFC, ATL, and C++/CLI support. |
+| [SQL Server Management Studio (SSMS)](/ssms/install/workload-component-ids) | Microsoft.VisualStudio.Product.Ssms | An integrated environment for managing SQL infrastructure. |
For more information about how to use these lists, see the [Use command-line parameters to install Visual Studio](use-command-line-parameters-to-install-visual-studio.md) page and the [Update a Visual Studio extension for Visual Studio](../extensibility/migration/update-extension.md) page.
diff --git a/docs/javascript/media/visualstudio/npm-packages-install-esproj.png b/docs/javascript/media/visualstudio/npm-packages-install-esproj.png
new file mode 100644
index 00000000000..486ef33ccdc
Binary files /dev/null and b/docs/javascript/media/visualstudio/npm-packages-install-esproj.png differ
diff --git a/docs/javascript/media/visualstudio/npm-packages-open-manager-esproj.png b/docs/javascript/media/visualstudio/npm-packages-open-manager-esproj.png
new file mode 100644
index 00000000000..7174b25e25f
Binary files /dev/null and b/docs/javascript/media/visualstudio/npm-packages-open-manager-esproj.png differ
diff --git a/docs/javascript/npm-package-management.md b/docs/javascript/npm-package-management.md
index fd865393e54..747608ee724 100644
--- a/docs/javascript/npm-package-management.md
+++ b/docs/javascript/npm-package-management.md
@@ -1,7 +1,7 @@
---
title: Manage npm packages for Node.js and ASP.NET Core projects
description: Manage packages in Visual Studio by using the Node.js package manager (npm) for both Node.js and ASP.NET Core applications.
-ms.date: "2/11/2025"
+ms.date: "6/15/2026"
ms.topic: "how-to"
ms.devlang: javascript
author: "mikejo5000"
@@ -16,30 +16,37 @@ dev_langs:
npm allows you to install and manage packages for use in both Node.js and ASP.NET Core applications. Visual Studio makes it easy to interact with npm and issue npm commands through the UI or directly. If you're unfamiliar with npm and want to learn more, go to the [npm documentation](https://docs.npmjs.com/).
Visual Studio integration with npm is different depending on your project type.
+
::: moniker range=">=vs-2022"
* [CLI-based projects (.esproj)](#cli-based-project-esproj)
* [ASP.NET Core](#aspnet-core-projects)
* [Open folder (Node.js)](../javascript/develop-javascript-code-without-solutions-projects.md)
::: moniker-end
-
> [!IMPORTANT]
> npm expects the *node_modules* folder and *package.json* in the project root. If your app's folder structure is different, you should modify your folder structure if you want to manage npm packages using Visual Studio.
-::: moniker range=">=vs-2022"
## CLI-based project (.esproj)
Starting in Visual Studio 2022, the npm package manager is available for [CLI-based projects](../javascript/javascript-in-vs-2022.md#project-templates), so you can now download npm modules similarly to the way you download NuGet packages for ASP.NET Core projects. Then you can use *package.json* to modify and delete packages.
To open the package manager, from Solution Explorer, right-click the **npm** node in your project and choose **Add npm package**.
-:::image type="content" source="../javascript/media/vs-2022/npm-packages-open-manager-esproj.png" alt-text="Open package manager from Solution Explorer" border="true":::
+::: moniker range="visualstudio"
+:::image type="content" source="../javascript/media/visualstudio/npm-packages-open-manager-esproj.png" alt-text="Screenshot of opening package manager from Solution Explorer." border="true":::
+::: moniker-end
+::: moniker range="vs-2022"
+:::image type="content" source="../javascript/media/vs-2022/npm-packages-open-manager-esproj.png" alt-text="Screenshot of opening package manager from Solution Explorer." border="true":::
+::: moniker-end
Next, you can search for npm packages, select one, and install by selecting **Install Package**.
-:::image type="content" source="../javascript/media/vs-2022/npm-packages-install-esproj.png" alt-text="Install new npm package for esproj" border="true":::
+::: moniker range="visualstudio"
+:::image type="content" source="../javascript/media/visualstudio/npm-packages-install-esproj.png" alt-text="Screenshot of installing new npm package for esproj." border="true":::
+::: moniker-end
+::: moniker range="vs-2022"
+:::image type="content" source="../javascript/media/vs-2022/npm-packages-install-esproj.png" alt-text="Screenshot of installing new npm package for esproj." border="true":::
::: moniker-end
-
## ASP.NET Core projects
@@ -56,8 +63,8 @@ If your project does not already include a *package.json* file, you can add one
```json
"devDependencies": {
- "gulp": "4.0.2",
- "@types/jquery": "3.5.29"
+ "gulp": "5.0.1",
+ "@types/jquery": "4.0.1"
}
```
diff --git a/docs/modeling/install-architecture-tools.md b/docs/modeling/install-architecture-tools.md
index a75e2a4ffca..0218b6dd698 100644
--- a/docs/modeling/install-architecture-tools.md
+++ b/docs/modeling/install-architecture-tools.md
@@ -21,7 +21,12 @@ To create a code map in Visual Studio Enterprise, first install the **Code Map**
1. Scroll down to the **Code tools** section and select **Code Map** and **Live Dependency Validation**.
+ :::moniker range="vs-2022"

+ :::moniker-end
+ :::moniker range="visualstudio"
+ 
+ :::moniker-end
1. Select **Modify**.
diff --git a/docs/modeling/media/visualstudio/modeling-components.png b/docs/modeling/media/visualstudio/modeling-components.png
new file mode 100644
index 00000000000..1575a7c75ea
Binary files /dev/null and b/docs/modeling/media/visualstudio/modeling-components.png differ
diff --git a/docs/msbuild/errors/msb3821.md b/docs/msbuild/errors/msb3821.md
index 1e24bfa5361..5060625a678 100644
--- a/docs/msbuild/errors/msb3821.md
+++ b/docs/msbuild/errors/msb3821.md
@@ -26,20 +26,20 @@ This article describes the MSB3821 error code.
## Message text
-`MSB3821: Couldn't process file 'value' due to its being in the Internet or Restricted zone or having the mark of the web on the file. Remove the mark of the web if you want to process these files.`
+`MSB3821: Couldn't process file 'value' due to its being in the Internet or Restricted zone or having the mark of the web on the file. Remove the mark of the web if you trust these files and want to process them. Please follow MSBuild secure usage best practices - https://aka.ms/msbuild-security-documentation`
-
+
## Description
-This error occurs when MSBuild attempts to process a file downloaded from the web (or a cloud drive) that has security restrictions.
+This error occurs when MSBuild attempts to process a file that has the *mark of the web*, such as a file downloaded from the web or a cloud drive.
-When you download web assets like HTML pages to a Windows device by using a browser, the browser inserts a marker called the *mark of the web*, which records the security zone of the site from which the page originated. The mark is intended to help protect from potentially malicious pages and enforce the security level on the original site, even after a page from the site is downloaded. This security check is required due to a specific security issue: [Visual Studio remote code execution vulnerability CVE-2018-8172](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2018-8172).
+When you download web assets like HTML pages to a Windows device by using a browser, the browser inserts a marker called the *mark of the web*, which records the security zone of the site from which the page originated. MSBuild requires trusted inputs: you're responsible for trusting the files you build, either by reviewing them fully or by trusting their source. By default, MSBuild doesn't process files that carry the *mark of the web*, because their content hasn't been established as trusted. Removing the mark indicates that you've decided to trust the file. For more information, see [MSBuild secure usage best practices](https://aka.ms/msbuild-security-documentation).
## Resolution
-If you decide to trust the content in question, you can override the restriction by unblocking a single file from File Explorer. Open the **Properties** window on the file, and select **Unblock**. You can also unblock multiple files with a PowerShell script and the [Unblock-File](/powershell/module/microsoft.powershell.utility/unblock-file) cmdlet.
+If you decide to trust the content in question, you can remove the *mark of the web* by unblocking a single file from File Explorer. Open the **Properties** window on the file, and select **Unblock**. You can also unblock multiple files with a PowerShell script and the [Unblock-File](/powershell/module/microsoft.powershell.utility/unblock-file) cmdlet.
:::moniker range="visualstudio"
diff --git a/docs/toc.yml b/docs/toc.yml
index 0c59ad5a996..dd3c97ad76f 100644
--- a/docs/toc.yml
+++ b/docs/toc.yml
@@ -315,6 +315,8 @@
href: ide/writing-code-in-the-code-and-text-editor.md
- name: Markdown preview
href: ide/markdown-preview.md
+ - name: Use color emojis
+ href: ide/color-emojis.md
- name: Use the Spell Checker
href: ide/text-spell-checker.md
- name: Use Sticky Scroll
diff --git a/docs/version-control/git-browse-repository.md b/docs/version-control/git-browse-repository.md
index a50c50aa5f3..249c653c185 100644
--- a/docs/version-control/git-browse-repository.md
+++ b/docs/version-control/git-browse-repository.md
@@ -1,13 +1,12 @@
---
title: "Browse repos, compare branches & commits"
-description: Browse any Git repository in Visual Studio by using the Git Repository window to view local and remote branches and multiple branches at the same time.
-ms.date: 05/13/2026
+description: Browse Git repositories in Visual Studio, compare branches and commits, view line-by-line change history with Git Blame annotations, and track who made specific code changes.
+ms.date: 06/11/2026
ms.topic: how-to
author: ghogen
ms.author: ghogen
ms.custom: doc-kit-assisted, awp-ai
-
ms.subservice: general-ide
---
# Browse Git repositories and compare branches in Visual Studio
@@ -22,31 +21,59 @@ To get started, open the **Git Repository** window by selecting **Git Repository
:::moniker range="visualstudio"
-:::image type="content" source="media/visualstudio/git-repository-browse-ui.png" alt-text="Screenshot that shows the anatomy of the Git Repository window." lightbox="media/visualstudio/git-repository-browse-ui.png":::
+:::image type="content" source="media/visualstudio/view-pull-requests.png" alt-text="Screenshot of the Git Repository window in Visual Studio with Branches or Tags and Pull Requests in the left pane, and pull request details in the main pane." lightbox="media/visualstudio/view-pull-requests.png":::
:::moniker-end
:::moniker range="vs-2022"
:::image type="content" source="media/vs-2022/git-repository-browse-ui.png" alt-text="Screenshot that shows the anatomy of the Git Repository window." lightbox="media/vs-2022/git-repository-browse-ui.png":::
+:::moniker-end
+
+The **Git Repository** window contains a left pane. What you select there drives the content on the right side.
+
+:::moniker range="visualstudio"
+
+In Visual Studio, the left pane includes **Branches / Tags** and **Pull Requests**.
:::moniker-end
+:::moniker range="<=vs-2022"
+
The **Git Repository** window contains three main sections, as numbered in the preceding screenshot:
-1. **Branches / Tags**: Git empowers users to multitask and experiment with their code through branches. Branching in Git is helpful in several scenarios, especially when working on complex projects with multiple features or when collaborating with a team. With Visual Studio 17.13 and later, you can see tags in the repo, and navigate to any tag. Your team can use git tags (for example, `v1.0`), to mark points in the history of your repo and view the state of the repo at that point in history. See [Git - Tagging](https://git-scm.com/book/en/v2/Git-Basics-Tagging).
+**Branches / Tags**: Git empowers users to multitask and experiment with their code through branches. Branching in Git is helpful in several scenarios, especially when working on complex projects with multiple features or when collaborating with a team. With Visual Studio 17.13 and later, you can see tags in the repo, and navigate to any tag. Your team can use git tags (for example, `v1.0`), to mark points in the history of your repo and view the state of the repo at that point in history. See [Git - Tagging](https://git-scm.com/book/en/v2/Git-Basics-Tagging).
+
+:::image type="content" alt-text="Screenshot that shows git tags in the Git Repository window." source="./media/vs-2022/git-tags.png" lightbox="./media/vs-2022/git-tags.png" :::
+
+**Graph**: This section visualizes the state of your branch. It has three subsections:
+
+- **Incoming** shows incoming commits that your team has been contributing.
+- **Outgoing** shows your local commits that you still haven't pushed.
+- **Local History** shows the rest of commits tracked by your local repository.
+
+**Commit**: To open this section, select any commit in the **Graph** section. You can check the changes that a commit has introduced by selecting them, which shows a difference. For example, the previous screenshot shows the changes that one commit introduced to the *Resize.cs* file.
+:::moniker-end
+:::moniker range="visualstudio"
+
+**Branches / Tags**: Git empowers users to multitask and experiment with their code through branches. Branching in Git is helpful in several scenarios, especially when working on complex projects with multiple features or when collaborating with a team. You can see tags in the repo, and navigate to any tag. Your team can use git tags (for example, `v1.0`), to mark points in the history of your repo and view the state of the repo at that point in history. See [Git - Tagging](https://git-scm.com/book/en/v2/Git-Basics-Tagging).
:::image type="content" alt-text="Screenshot that shows git tags in the Git Repository window." source="./media/vs-2022/git-tags.png" lightbox="./media/vs-2022/git-tags.png" :::
-1. **Graph**: This section visualizes the state of your branch. It has three subsections:
+ With **Branches / Tags** selected, you see **Graph** and **Commit** sections on the right side.
- - **Incoming** shows incoming commits that your team has been contributing.
- - **Outgoing** shows your local commits that you still haven't pushed.
- - **Local History** shows the rest of commits tracked by your local repository.
+**Graph**: This section visualizes the state of your branch. It has three subsections:
-1. **Commit**: To open this section, select any commit in the **Graph** section. You can check the changes that a commit has introduced by selecting them, which shows a difference. For example, the previous screenshot shows the changes that one commit introduced to the *Resize.cs* file.
+- **Incoming** shows incoming commits that your team has been contributing.
+- **Outgoing** shows your local commits that you still haven't pushed.
+- **Local History** shows the rest of commits tracked by your local repository.
-The **Alt**+**Up arrow** or **Alt**+**Down arrow** keyboard shortcuts allow you to jump between these sections.
+**Commit**: To open this section, select any commit in the **Graph** section. You can check the changes that a commit has introduced by selecting them, which shows a difference. For example, the previous screenshot shows the changes that one commit introduced to the *Resize.cs* file.
+:::moniker-end
+
+### Browse commits in detail
+
+The **Alt**+**Up arrow** or **Alt**+**Down arrow** keyboard shortcuts allow you to jump between the sections in the left panel.
You can browse through any local or remote branch without having to switch your branch. When you find a commit that you want to focus on, select the **Open in New Tab** button to open the commit on a different tab.
@@ -82,6 +109,51 @@ You can browse through any local or remote branch without having to switch your
:::moniker-end
+:::moniker range="visualstudio"
+
+### Pull requests
+
+If you are reviewing branches and commits, switch to **Pull Requests** in the left panel.
+
+The **Pull Requests** section shows a list of active pull requests.
+
+#### Browse and open pull requests
+
+Select any pull request to open an embedded review view without checking out the branch. Find pull requests from the **Git Repository** window (**View** > **Git Repository**), **Git Changes**, or **Git** > **GitHub** (or **Azure DevOps**) > **View Pull Requests**.
+
+:::image type="content" alt-text="Screenshot of the pull request list on the left and the selected pull request overview on the right with description and changed files." source="./media/visualstudio/pr-review-overview.png" lightbox="./media/visualstudio/pr-review-overview.png":::
+
+- Pull request description, changed files, commits, related items, and reviewers in one view.
+- Switch between active pull requests without disrupting your working branch.
+- View commit details and changes for individual commits in the pull request.
+
+#### Comment and discuss
+
+Leave feedback directly in the diff view, and continue the conversation without switching to a browser.
+
+:::image type="content" alt-text="Screenshot of a file diff with an inline pull request comment thread that includes a reply and a resolve action." source="./media/visualstudio/pr-review-comments.png" lightbox="./media/visualstudio/pr-review-comments.png":::
+
+- Add inline comments on specific lines, reply to comments, and resolve threads.
+- View comment indicators per file in the **Changes** list.
+- Render inline images and formatted text in comments, similar to the web experience.
+
+#### Approve, complete, and merge
+
+When you're ready, approve and complete the pull request in Visual Studio. Vote and completion actions are available from multiple views so you can approve while reviewing changes.
+
+- Approve the pull request. More vote options are available from the dropdown for Azure DevOps.
+- View status checks, merge conflicts, and required approvals on the overview tab.
+- Complete or merge the pull request, with options to convert to draft and abandon or close.
+
+You can manage this experience in **Tools** > **Options** > **Preview Features**:
+
+- **Pull Request Comments**
+- **View pull requests for a Git repository**
+
+For detailed workflows to comment on pull requests in files and in diff views, see [Create a pull request in Visual Studio](git-create-pull-request.md#view-or-add-pull-request-comments-in-the-editor).
+
+:::moniker-end
+
### Multi-branch history view
**[New with version 17.7](/visualstudio/releases/2022/release-notes)**: When you open the Git Repo window, you start in the single branch view. You can then select any branch to add both the branch and its commits to a multi-branch history view, which adds visual cues that make it more efficient to interact with multiple branches.
@@ -229,6 +301,53 @@ Checking out the tip of a remote branch can be helpful if you would like to quic
:::moniker-end
+## View line-by-line change history with Git Blame
+
+Git Blame shows you who last modified each line of code in a file, along with when and why the change was made. This feature is useful when you need to understand the history and context behind specific code changes, track down the origin of a bug, or identify the author of a particular implementation.
+
+### Access Git Blame annotations
+
+You can view Git Blame annotations directly from the code editor or from Solution Explorer.
+
+**From the code editor:**
+
+1. Open a file in the editor.
+1. Right-click anywhere in the code editor.
+1. Select **Git** > **Blame (Annotate)**.
+
+**From Solution Explorer:**
+
+1. Right-click a file in Solution Explorer.
+1. Select **Git** > **Blame (Annotate)**.
+
+Blame annotations appear in the left margin of the editor, showing the author name, commit date, and the commit link.
+The file opens in the editor with Blame annotations visible.
+
+
+### Explore commit details from Blame annotations
+
+Once Blame annotations are visible in the editor, you can interact with them to get more information:
+
+- **Click** on the commit to **View details**: you can view the complete commit, where you can see all files changed in that commit and access additional options, such as comparing the current version with the previous version.
+
+> [!TIP]
+> Git Blame is most useful for understanding unexpected behavior or tracking down why a particular change was made.
+
+### When Git Blame is unavailable
+
+Git Blame is only available for tracked files that have been committed to your Git repository. If the **Git** > **Blame** option doesn't appear, check the table below for common causes and solutions.
+
+| **Scenario** | **Solution** |
+|----------|----------|
+| **File is not tracked** | Check the **Git Changes** window. If the file appears under **Untracked Files**, stage and commit it first. |
+| **File is in .gitignore** | Remove the file from `.gitignore`, add it to the repository, and commit. |
+| **Binary file** | Blame only works with text files like source code (`.cs`, `.js`, `.py`), configuration files (`.json`, `.xml`), and documentation (`.md`, `.txt`). For binary files (`.dll`, `.exe`, images), use **Git** > **View History** instead. |
+| **No commit history** | Make at least one commit that includes the file. |
+| **Detached HEAD state** | Check the status bar. If detached, check out a branch from the **Git Repository** window. See [Checkout commits](#checkout-commits). |
+| **Very large file** | For performance, Blame may be disabled on extremely large files. Use **Git** > **View History** instead. |
+
+**Alternative for all scenarios:** Right-click the file and select **Git** > **View History** to see all commits that modified the file.
+
## Related content
- [Manage Git repositories in Visual Studio](git-manage-repository.md)
diff --git a/docs/version-control/git-push-remote.md b/docs/version-control/git-push-remote.md
index 842233280b5..d3c05625ef9 100644
--- a/docs/version-control/git-push-remote.md
+++ b/docs/version-control/git-push-remote.md
@@ -2,7 +2,7 @@
title: Push to a remote branch in Visual Studio
titleSuffix: ""
description: Push your local project directory to a remote in Visual Studio by using GitHub or Azure DevOps for a safe place to store your code in the cloud.
-ms.date: 4/1/2025
+ms.date: 06/10/2026
ms.topic: how-to
author: ghogen
ms.author: ghogen
diff --git a/docs/version-control/media/visualstudio/pr-review-comments.png b/docs/version-control/media/visualstudio/pr-review-comments.png
new file mode 100644
index 00000000000..066202f8458
Binary files /dev/null and b/docs/version-control/media/visualstudio/pr-review-comments.png differ
diff --git a/docs/version-control/media/visualstudio/pr-review-overview.png b/docs/version-control/media/visualstudio/pr-review-overview.png
new file mode 100644
index 00000000000..4278ec24003
Binary files /dev/null and b/docs/version-control/media/visualstudio/pr-review-overview.png differ
diff --git a/docs/version-control/media/visualstudio/view-pull-requests.png b/docs/version-control/media/visualstudio/view-pull-requests.png
new file mode 100644
index 00000000000..f8293e00448
Binary files /dev/null and b/docs/version-control/media/visualstudio/view-pull-requests.png differ
diff --git a/gamedev/unity/change-log-visual-studio-tools-for-unity.md b/gamedev/unity/change-log-visual-studio-tools-for-unity.md
index 8860291da5c..18ff6e3da08 100644
--- a/gamedev/unity/change-log-visual-studio-tools-for-unity.md
+++ b/gamedev/unity/change-log-visual-studio-tools-for-unity.md
@@ -1,7 +1,7 @@
---
title: "Change Log (Visual Studio Tools for Unity, Windows)"
description: View the change log for Visual Studio Tools for Unity, Windows. See changes from version 1.0.0.0 through 4.7.0.0 and beyond.
-ms.date: "3/17/2026"
+ms.date: "5/27/2026"
ms.subservice: unity-tools
ms.service: visual-studio
ms.topic: release-notes
@@ -13,6 +13,29 @@ ms.manager: crdun
Visual Studio Tools for Unity change log.
+## 18.7.0.0
+Released May 27, 2026
+
+### New features
+
+- **Integration:**
+
+ - Added a search bar to the Unity Project Explorer.
+
+ - Modernized the Unity Project Explorer with proper styling, and preview-on-click navigation.
+
+ - Added `ScriptedImporter` support.
+
+ - CodeLens now displays the values of serialized fields.
+
+### Bug fixes
+
+- **Integration:**
+
+ - Improved keyboard accessibility in the MonoBehaviour Wizard and Attach Unity Debugger dialogs.
+
+ - Stability fixes.
+
## 18.5.1.0
Released March 17, 2026
diff --git a/subscriptions/datacamp.md b/subscriptions/datacamp.md
new file mode 100644
index 00000000000..d6537df11b0
--- /dev/null
+++ b/subscriptions/datacamp.md
@@ -0,0 +1,65 @@
+---
+title: DataCamp benefit in Visual Studio Subscriptions
+author: joseb-rdc
+ms.author: amast
+ms.manager: shve
+ms.date: 6/12/2026
+ms.topic: how-to
+description: Learn how to access and activate the DataCamp benefit available with eligible Visual Studio Subscriptions and Visual Studio Dev Essentials.
+---
+
+# DataCamp benefit in Visual Studio Subscriptions
+
+DataCamp is available with eligible Visual Studio Subscriptions and Visual Studio Dev Essentials memberships as a professional development benefit. It provides access to interactive courses that help you build data science and analytics skills using technologies such as Python, SQL, and machine learning.
+
+This benefit provides two- or three-month access to DataCamp’s online learning platform, depending on your subscription type. The level of access is comparable to a DataCamp Premium individual subscription, with all learning tracks. AI Native courses are available with limited usage based on available credits, which are tracked in your DataCamp account.
+
+If your subscription is eligible, you can activate it from the [Visual Studio Subscriptions benefits portal](https://my.visualstudio.com/benefits) and begin learning.
+
+## Eligibility
+Before you activate the DataCamp benefit, confirm that your subscription is eligible.
+
+| Subscription level | Channels | Benefit | Renewable? |
+| ------------------- | ---------- | --------- | ------------|
+| Visual Studio Enterprise | VL, Retail | 3 months | No. Available to new subscribers only |
+| Visual Studio Enterprise with GitHub Enterprise | VL | 3 months | No. Available to new subscribers only |
+| Visual Studio Professional | VL, Retail | 3 months | No. Available to new subscribers only |
+| Visual Studio Professional with GitHub Enterprise | VL | 3 months | No. Available to new subscribers only |
+| Visual Studio Test Professional | VL, Retail | 3 months | No. Available to new subscribers only |
+| MSDN Platforms | VL, Retail | 3 months | No. Available to new subscribers only |
+| Visual Studio Dev Essentials | N/A | 2 months | N/A |
+| Visual Studio Enterprise | NFR* | Not available | N/A |
+| Visual Studio Enterprise, Visual Studio Professional (monthly cloud) | Azure | Not available | N/A |
+| | | | |
+
+\*NFR (Not for Resale) refers to subscriptions provided through programs such as FTE, Most Valuable Professional (MVP), Regional Director (RD), Microsoft AI Cloud Partner Program (MAICPP), Microsoft Partner Program (MPN), Visual Studio Industry Partner (VSIP), Microsoft Certified Trainer (MCT), Azure Dev Tools for Teaching (ADTfT), Open Source Heroes, Student Ambassadors, Microsoft Bug Bounty, Independent Software Vendor (ISV), NFR Basic programs such as Xbox and Alumni, and Microsoft for Startups.
+
+## Not sure what subscription you're using?
+Go to the [Visual Studio Subscriptions portal](https://my.visualstudio.com/benefits) to view the subscriptions assigned to your account. If you have access to multiple subscriptions, make sure you're signed in with the correct account.
+
+## Activate your benefit
+Activate the DataCamp benefit from the Visual Studio Subscriptions benefits portal.
+
+1. Go to the [Visual Studio Subscriptions benefits portal](https://my.visualstudio.com/benefits).
+1. Locate the DataCamp tile in the **Professional Development** category.
+1. Select **Activate**.
+ > [!div class="mx-imgBorder"]
+ [](media/datacamp/datacamp-benefit-tile.png#lightbox)
+1. Follow the prompts to create your account and select **Start Learning**.
+ > [!div class="mx-imgBorder"]
+ [](media/datacamp/datacamp-activation-landing-page.png#lightbox)
+
+## Support
+For help with DataCamp or your Visual Studio Subscription, use the following resources:
+
++ **DataCamp**
+ + [DataCamp Help Center](https://support.datacamp.com/hc)
+ + [DataCamp Community](https://www.datacamp.com/community/tutorials)
++ [**Get help with Visual Studio Subscriptions**](https://my.visualstudio.com/gethelp)
++ [**Visual Studio Support**](https://visualstudio.microsoft.com/support/)
+
+### Next steps
+Explore other professional development benefits available with Visual Studio Subscriptions:
++ [**Pluralsight**](https://learn.microsoft.com/visualstudio/subscriptions/vs-pluralsight)
++ [**Cloud Academy**](https://learn.microsoft.com/visualstudio/subscriptions/vs-cloud-academy)
++ [**CODE Magazine**](https://learn.microsoft.com/visualstudio/subscriptions/vs-code-magazine)
diff --git a/subscriptions/media/datacamp/datacamp-activation-landing-page.png b/subscriptions/media/datacamp/datacamp-activation-landing-page.png
new file mode 100644
index 00000000000..4234c1d9e2f
Binary files /dev/null and b/subscriptions/media/datacamp/datacamp-activation-landing-page.png differ
diff --git a/subscriptions/media/datacamp/datacamp-benefit-tile.png b/subscriptions/media/datacamp/datacamp-benefit-tile.png
new file mode 100644
index 00000000000..5d05f826cd2
Binary files /dev/null and b/subscriptions/media/datacamp/datacamp-benefit-tile.png differ
diff --git a/subscriptions/microsoft-365-apps-for-enterprise.md b/subscriptions/microsoft-365-apps-for-enterprise.md
index 8191878eb4d..2cdab5d9b03 100644
--- a/subscriptions/microsoft-365-apps-for-enterprise.md
+++ b/subscriptions/microsoft-365-apps-for-enterprise.md
@@ -11,6 +11,8 @@ ms.custom: sfi-image-nochange
# Microsoft 365 apps for enterprise in Visual Studio subscriptions
+**Activation for this benefit is temporarily unavailable due to technical issues.**
+
Microsoft 365 apps for enterprise (formerly Office 365 Pro Plus) is available in selected Visual Studio subscriptions.
Create your best work. Work anywhere with apps that are always updated. Microsoft 365 apps for enterprise is a subscription that comes with premium apps like Word, Excel, PowerPoint, OneNote, Outlook, Publisher, and Access. (Publisher and Access available on PC only). The apps can be installed on multiple devices, including PCs, Macs, iPads, iPhones, Android tablets, and Android phones. With a subscription, you get the latest versions of the apps and automatically receive updates when they happen.
diff --git a/subscriptions/solutions/admin-index.md b/subscriptions/solutions/admin-index.md
index e56cd185c6b..7e6b1790b8b 100644
--- a/subscriptions/solutions/admin-index.md
+++ b/subscriptions/solutions/admin-index.md
@@ -5,11 +5,12 @@ ms.topic: faq
robots: noindex, nofollow
author: joseb-rdc
ms.author: amast
-ms.date: 05/19/2026
+ms.date: 06/12/2026
ms.assetid: a3312f1d-c92c-4c45-8b9e-4c20a5911bb8
sap.id: 190f557e-7edb-47a3-9846-410267ead91f
user.type: admin
subscription.type: vl, retail, partner, cloud
+tags: admin, solutions, support
---
# Visual Studio subscriptions admin support
diff --git a/subscriptions/solutions/index.md b/subscriptions/solutions/index.md
index f78d7f96bfa..3fc4fe1d137 100644
--- a/subscriptions/solutions/index.md
+++ b/subscriptions/solutions/index.md
@@ -5,11 +5,12 @@ ms.topic: troubleshooting-general
robots: noindex, nofollow
author: joseb-rdc
ms.author: amast
-ms.date: 05/19/2026
+ms.date: 06/12/2026
ms.assetid: 4d355da2-0447-4675-8bc6-1c0406256920
sap.id: 2fd08cf9-47b0-4ce8-95d9-2cd5f1cf5bd9
use.type: subscriber
subscription.type: vl, cloud, retail, partner
+tags: subscriber, solutions, support
---
# Visual Studio subscriptions support
diff --git a/subscriptions/toc.yml b/subscriptions/toc.yml
index ffe162fc2b5..7cef8d91ae2 100644
--- a/subscriptions/toc.yml
+++ b/subscriptions/toc.yml
@@ -94,6 +94,8 @@
href: vs-code-magazine.md
- name: Cloud Academy
href: vs-cloud-academy.md
+ - name: DataCamp
+ href: datacamp.md
- name: Pluralsight
href: vs-pluralsight.md
- name: Support