Merged main into live

mijacobs · mijacobs · commit 1036a9c65a19 · 2025-04-25T18:02:10.000Z
diff --git a/docs/deployment/walkthrough-manually-deploying-a-clickonce-application.md b/docs/deployment/walkthrough-manually-deploying-a-clickonce-application.md
@@ -31,7 +31,7 @@ If you cannot use Visual Studio to deploy your ClickOnce application, or you nee
 
 - Install `Mage.exe` and *MageUI.exe*.
 
-   `Mage.exe` and `MageUI.exe` are part of the Windows Software Development Kit (SDK). You must either have the Windows SDK installed or the version of the Windows SDK included with Visual Studio. For more information, see [Windows SDK](https://www.microsoft.com/download/details.aspx?id=8279) on MSDN.
+   `Mage.exe` and `MageUI.exe` are part of the Windows Software Development Kit (SDK). You must either have the Windows SDK installed or the version of the Windows SDK included with Visual Studio.
 
 - Provide an application to deploy.
 
diff --git a/docs/extensibility/how-to-diagnose-ui-delays-caused-by-extensions.md b/docs/extensibility/how-to-diagnose-ui-delays-caused-by-extensions.md
@@ -145,7 +145,7 @@ You can also further filter this view by only including stacks that contain modu
 
 PerfView has detailed guidance under the **Help** menu that you can use to identify performance bottlenecks in your code. Additionally, the following links provide more information on how to utilize Visual Studio threading APIs to optimize your code:
 
-* [`https://github.com/Microsoft/vs-threading/blob/main/doc/index.md`](https://github.com/Microsoft/vs-threading/blob/main/doc/index.md)
+* [`https://github.com/microsoft/vs-threading/blob/main/docfx/index.md`](https://github.com/microsoft/vs-threading/blob/main/docfx/index.md)
 * [`https://github.com/microsoft/vs-threading/blob/main/docfx/docs/cookbook_vs.md`](https://github.com/microsoft/vs-threading/blob/main/docfx/docs/cookbook_vs.md)
 
 You can also use the new Visual Studio static analyzers for extensions (NuGet package [here](https://www.nuget.org/packages/microsoft.visualstudio.sdk.analyzers)), that provide guidance on best practices for writing efficient extensions. See a list of [VSSDK analyzers](https://github.com/Microsoft/VSSDK-Analyzers/blob/main/doc/index.md) and [threading analyzers](https://github.com/microsoft/vs-threading/blob/main/docfx/analyzers/index.md).
diff --git a/docs/ide/code-snippets.md b/docs/ide/code-snippets.md
@@ -1,7 +1,7 @@
 ---
 title: Understand and use code snippets
 description: Explore code snippets, which are small blocks of reusable code you can insert into a code file, and learn how to find and use them.
-ms.date: 04/05/2024
+ms.date: 04/25/2025
 ms.topic: conceptual
 f1_keywords:
 - vs.ExpansionManagerImport
diff --git a/docs/ide/not-in-toc/default.md b/docs/ide/not-in-toc/default.md
@@ -131,7 +131,6 @@ Here's a list of forum resources:
 - [Visual Studio on Q&A](/answers/products/vs/)
 - [Visual Studio MSDN Forum](https://social.msdn.microsoft.com/Forums/vstudio)
 - [Stack Overflow](https://stackoverflow.com/search?q=%22visual+studio%22)
-- [Reddit](https://www.reddit.com/r/VisualStudio)
 
 ##  Feedback and additional support
 
diff --git a/subscriptions/vs-m365.md b/subscriptions/vs-m365.md
@@ -3,14 +3,14 @@ title: Activate Microsoft 365 developer subscriptions
 author: joseb-rdc
 ms.author: amast
 manager: shve
-ms.date: 09/11/2024
+ms.date: 04/25/2025
 ms.topic: conceptual
 description: Activate and explore the Microsoft 365 developer subscription available in eligible Visual Studio subscriptions, and find answers to frequently asked questions.
 ---
 
 # Microsoft 365 developer subscription in Visual Studio subscriptions
 
-Starting in September 2019, all **new** members of the Microsoft 365 Developer Program (including Visual Studio Professional and Enterprise subscribers) can sign up for a Microsoft 365 E5 developer subscription (Windows not included). This subscription replaces the Office 365 E3 developer subscription that we made available starting in March 2018. It now includes EMS, something our customers asked us for on User Voice.  Check out the recent [Developer Blog](https://developer.microsoft.com/graph/blogs/new-microsoft-365-e5-subscription-with-ems-now-available-for-developers/) for more information.
+Starting in September 2019, all **new** members of the Microsoft 365 Developer Program (including Visual Studio Professional and Enterprise subscribers) can sign up for a Microsoft 365 E5 (Enterprise 5) developer subscription (Windows not included). This subscription replaces the Office 365 E3 (Enterprise 3) developer subscription that we made available starting in March 2018. It now includes EMS (Enterprise Mobility + Security), something our customers asked us for on User Voice. Check out the recent [Developer Blog](https://developer.microsoft.com/graph/blogs/new-microsoft-365-e5-subscription-with-ems-now-available-for-developers/) for more information.
 
 Selected Visual Studio Professional or Enterprise standard subscriptions have access to the Microsoft 365 developer subscription benefit as long as their subscriptions are active.
 
@@ -32,46 +32,46 @@ To see what the Microsoft 365 E5 developer subscription includes, see the [Micro
 0. Locate the Microsoft 365 developer subscription benefit tile in the "Tools" category, and select **Get Started**.
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer Tile](_img/visualstudio-microsoft365/tile.png "Screenshot of the Microsoft 365 Developer subscription tile.  The activate button is highlighted.")
+    >![Microsoft 365 Developer Tile](_img/visualstudio-microsoft365/tile.png "Screenshot of the Microsoft 365 Developer subscription tile. The activate button is highlighted.")
     
-0. On the welcome screen, choose your region/country, enter your company name, and select the checkbox to accept the terms of use.  Then select **Next**.
+0. On the welcome screen, choose your region/country, enter your company name, and select the checkbox to accept the terms of use. Then select **Next**.
 
     > [!div class="mx-imgBorder"]
     >![Microsoft 365 Developer welcome screen](_img/visualstudio-microsoft365/welcome.png "Screenshot of the account creation dialog. The Next button is highlighted.")
 
 0. Indicate your primary area of interest, and select **Next**.
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer focus choice](_img/visualstudio-microsoft365/focus.png "Screenshot of the primary focus selection dialog.  The Next button is highlighted.")
+    >![Microsoft 365 Developer focus choice](_img/visualstudio-microsoft365/focus.png "Screenshot of the primary focus selection dialog. The Next button is highlighted.")
 
-0. You see a list of development areas based on the primary area of interest you previously selected.  Choose any areas of interest, and select **Save**.
+0. You see a list of development areas based on the primary area of interest you previously selected. Choose any areas of interest, and select **Save**.
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer area choice](_img/visualstudio-microsoft365/areas.png "Screenshot of development area selection dialog.  The Save button is highlighted.")
+    >![Microsoft 365 Developer area choice](_img/visualstudio-microsoft365/areas.png "Screenshot of development area selection dialog. The Save button is highlighted.")
 
-0. Next, you have the opportunity to set up your Microsoft 365 sandbox.  (If you choose to skip this step now, you can complete it later by logging in to the dashboard and choosing the **Set up E5 subscription** button.)  Choose your preferred type of sandbox - instant or configurable - and select **Next**.
+0. Next, you have the opportunity to set up your Microsoft 365 sandbox. (If you choose to skip this step now, you can complete it later by logging in to the dashboard and choosing the **Set up E5 subscription** button.) Choose your preferred type of sandbox - instant or configurable - and select **Next**.
 
     > [!div class="mx-imgBorder"]
     >![Microsoft 365 Developer sandbox choice](_img/visualstudio-microsoft365/sandbox.png "Screenshot of the sandbox setup dialog. The Next button is highlighted.")
 
-0. In the **Set up your Microsoft 365 E5 instant sandbox** screen, provide your region, admin username, and admin password.  You can also choose to provide an alternate password for fictitious users.  Select **Continue**.
+0. In the **Set up your Microsoft 365 E5 instant sandbox** screen, provide your region, admin username, and admin password. You can also choose to provide an alternate password for fictitious users. Select **Continue**.
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer sandbox setup](_img/visualstudio-microsoft365/sandbox-setup.png "Screenshot of personal information dialog.  The Continue button is highlighted.")
+    >![Microsoft 365 Developer sandbox setup](_img/visualstudio-microsoft365/sandbox-setup.png "Screenshot of personal information dialog. The Continue button is highlighted.")
 
 0. In the **Add phone number for security** dialog, provide your country code and phone number, and select **Send Code**.
 
 0. Enter the code you received and select **Setup**.
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer sandbox confirmation code](_img/visualstudio-microsoft365/code.png "Screenshot of phone number entry dialog.  The Set up button is highlighted.")
+    >![Microsoft 365 Developer sandbox confirmation code](_img/visualstudio-microsoft365/code.png "Screenshot of phone number entry dialog. The Set up button is highlighted.")
 
-0. After the automated process of setting up your sandbox is complete, you'll see the dashboard.  To use your subscription, select the **Go to subscription** link.
+0. After the automated process of setting up your sandbox is complete, you'll see the dashboard. To use your subscription, select the **Go to subscription** link.
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer dashboard](_img/visualstudio-microsoft365/go-to-subscription.png "Screenshot of the Microsoft 365 developer subscription dashboard.  The Go to subscription link is highlighted.")
+    >![Microsoft 365 Developer dashboard](_img/visualstudio-microsoft365/go-to-subscription.png "Screenshot of the Microsoft 365 developer subscription dashboard. The Go to subscription link is highlighted.")
 
-0. You have an opportunity to protect your account by enabling more authentication factors.  (For this example, we skip this process and continue to the subscription.  If you skip the process now, you have 14 days to complete it.)
+0. You have an opportunity to protect your account by enabling more authentication factors. (For this example, we skip this process and continue to the subscription. If you skip the process now, you have 14 days to complete it.)
 
     > [!div class="mx-imgBorder"]
     >![Microsoft 365 Developer enable protection](_img/visualstudio-microsoft365/protect.png "Screenshot of account protection dialog with options to skip, change accounts, or continue.")
@@ -83,17 +83,17 @@ To see what the Microsoft 365 E5 developer subscription includes, see the [Micro
 0. At the completion of the slideshow, you see the www.office.com landing page. In the left navigation pane, select the **Admin** button. 
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer admin](_img/visualstudio-microsoft365/office-admin.png "Screenshot of the left nav pane of the Office 365 landing page.  The admin icon is highlighted.")
+    >![Microsoft 365 Developer admin](_img/visualstudio-microsoft365/office-admin.png "Screenshot of the left nav pane of the Office 365 landing page. The admin icon is highlighted.")
 
 0. In the Microsoft 365 admin center, you can perform a range of tasks, including:
   + Manage Teams to support users
   + Install Office apps
-  + Add, edit or remove user accounts
+  + Add, edit, or remove user accounts
 
 16. Select the **Go to guided setup** button to walk through installing Office, adding users, and setting up and connecting domains. 
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Developer guided setup](_img/visualstudio-microsoft365/guided-setup.png "Screenshot of the finish setting up Microsoft 365 dialog.  The Go to guided setup button is highlighted.")
+    >![Microsoft 365 Developer guided setup](_img/visualstudio-microsoft365/guided-setup.png "Screenshot of the finish setting up Microsoft 365 dialog. The Go to guided setup button is highlighted.")
 
 ## Migrate from Office 365 E3 to Microsoft 365 E5
 
@@ -110,7 +110,7 @@ To get your new Microsoft 365 E5 developer subscription, go to your [dashboard](
 1. The setup process for your new Microsoft 365 E5 subscription starts automatically.
 
     > [!div class="mx-imgBorder"]
-    >![Microsoft 365 Migration Process](_img/visualstudio-microsoft365/migration.png "Screenshot of the Delete subscription dialog.  The subscription name and Delete subscription buttons are highlighted.")
+    >![Microsoft 365 Migration Process](_img/visualstudio-microsoft365/migration.png "Screenshot of the Delete subscription dialog. The subscription name and Delete subscription buttons are highlighted.")
 
 After you delete your Office 365 E3 subscription and create your replacement Microsoft 365 E5 subscription, your Office 365 E3 tenant will be available for 60 days to give you time to migrate your data.
 
@@ -133,13 +133,13 @@ Thank you for your membership in the Microsoft 365 Developer Program.
 | Visual Studio Enterprise (monthly cloud), Visual Studio Professional (monthly cloud) | Azure | Not available | NA |
 ||
 
-\* *Includes:  Not for Resale (NFR), Visual Studio Industry Partner (VSIP), FTE, BizSpark,  MCT Software & Services Developer.  
-Excludes: Visual Studio Enterprise (Microsoft for Startups), MCT Software & Services, Microsoft Cloud Partner Program, Imagine, Most Valuable Professional (MVP), Regional Director (RD), NFR Basic, ISV.*
+\* *Includes:  Not for Resale (NFR), Visual Studio Industry Partner (VSIP), Full time Employee (FTE), BizSpark, Microsoft Certified Trainer (MCT) Software & Services Developer.  
+Excludes: Visual Studio Enterprise (Microsoft for Startups), Microsoft Certified Trainer (MCT) Software & Services, Microsoft AI Cloud Partner Program, Imagine, Most Valuable Professional (MVP), Regional Director (RD), Not for Reslare Basic (NFR Basic), Independent Software Vendors (ISV).*
 
 > [!NOTE]
 > Microsoft no longer offers Visual Studio Professional Annual subscriptions and Visual Studio Enterprise Annual subscriptions in Cloud Subscriptions. There will be no change to existing customers experience and ability to renew, increase, decrease, or cancel their subscriptions. New customers are encouraged to go to [https://visualstudio.microsoft.com/vs/pricing/](https://visualstudio.microsoft.com/vs/pricing/) to explore different options to purchase Visual Studio.
 
-Not sure which subscription you're using?  Connect to [https://my.visualstudio.com/subscriptions](https://my.visualstudio.com/subscriptions?wt.mc_id=o~msft~docs) to see all the subscriptions assigned to your email address. If you don't see all your subscriptions, you might have one or more assigned to a different email address.  You need to sign in with that email address to see those subscriptions.
+Not sure which subscription you're using? Connect to [https://my.visualstudio.com/subscriptions](https://my.visualstudio.com/subscriptions?wt.mc_id=o~msft~docs) to see all the subscriptions assigned to your email address. If you don't see all your subscriptions, you might have one or more assigned to a different email address. You need to sign in with that email address to see those subscriptions.
 
 ## Frequently asked questions
 
@@ -149,7 +149,7 @@ A: To activate the Office Developer subscription, a new tenant is required.
 
 ### Q: Can I choose E3 or E5?
 
-As of September 2019, new Developer Program members are only offered E5, which is our flagship version of Office 365.  This version of Office 365 offers even more value than E3, and can normally cost substantially more than our previous E3 subscription.
+As of September 2019, new Developer Program members are only offered E5, which is our flagship version of Office 365. This version of Office 365 offers even more value than E3, and can normally cost substantially more than our previous E3 subscription.
 
 Existing members with E3 who don’t need all the capabilities of E5 can keep their current E3 subscription and continue to renew it. We aren't requiring any existing members to move from E3 to E5. However, each member can only have one subscription at a time.
 
@@ -163,7 +163,7 @@ Look for the E3 or E5 indication in your tile.
 
 ### Q: If Microsoft 365 developer subscription doesn't include Windows, how do I get Windows?
 
-A: The Visual Studio subscriptions that include the Microsoft 365 benefit also include Windows as part of the subscriber downloads.  Visit [downloads](https://my.visualstudio.com/downloads) to download Windows. (If you don't see downloads enabled in your subscription, [contact your admin](contact-my-admin.md).) 
+A: The Visual Studio subscriptions that include the Microsoft 365 benefit also include Windows as part of the subscriber downloads. Visit [downloads](https://my.visualstudio.com/downloads) to download Windows. (If you don't see downloads enabled in your subscription, [contact your admin](contact-my-admin.md).) 
 
 ### Q:  How many Microsoft 365 Developer Program accounts can I create?
 
@@ -174,9 +174,9 @@ You can only have one Microsoft 365 Developer Program account associated with yo
 
 ## Support resources
 
-+ Need help with Microsoft 365 developer subscription?  Check out the online [Microsoft 365 documentation](/office/developer-program/office-365-developer-program-faq).
-+ For assistance with sales, subscriptions, accounts and billing for Visual Studio Subscriptions, contact [Visual Studio subscriptions support](https://my.visualstudio.com/gethelp).
-+ Have a question about Visual Studio IDE, Azure DevOps Services or other Visual Studio products or services?  Visit [Visual Studio Support](https://visualstudio.microsoft.com/support/).
++ Need help with Microsoft 365 developer subscription? Check out the online [Microsoft 365 documentation](/office/developer-program/office-365-developer-program-faq).
++ For assistance with sales, subscriptions, accounts, and billing for Visual Studio Subscriptions, contact [Visual Studio subscriptions support](https://my.visualstudio.com/gethelp).
++ Have a question about Visual Studio IDE, Azure DevOps Services, or other Visual Studio products or services? Visit [Visual Studio Support](https://visualstudio.microsoft.com/support/).
 + Have feedback on the new offer? [Share your feedback on UserVoice](https://feedback.uservoice.com/). The Microsoft 365 team reviews each comment.
 
 ## See also
