Merge pull request #10316 from MicrosoftDocs/main638572070868459895sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

docs/debugger/remote-debugging.md

@@ -25,13 +25,15 @@ You can debug a Visual Studio application that has been deployed on a different
 For in-depth instructions on remote debugging, see these topics.
 
 |Scenario|Link|
-|-|-|-|
+|-|-|
 |Azure App Service|[Remote debug ASP.NET Core on Azure](../debugger/remote-debugging-azure-app-service.md) or, for Visual Studio Enterprise, the [Snapshot Debugger](../debugger/debug-live-azure-applications.md)|
 |Azure VM|[Remote debug ASP.NET on an Azure VM](../debugger/remote-debugging-azure.md)|
 |Azure Service Fabric|[Debug an Azure Service Fabric application](/azure/service-fabric/service-fabric-debugging-your-application#debug-a-remote-service-fabric-application)|
 |ASP.NET|[Remote debug ASP.NET Core](../debugger/remote-debugging-aspnet-on-a-remote-iis-computer.md) or [Remote Debug ASP.NET](../debugger/remote-debugging-aspnet-on-a-remote-iis-7-5-computer.md)|
 |C# or Visual Basic|[Remote debug a C# or Visual Basic project](../debugger/remote-debugging-csharp.md)|
 |C++|[Remote debug a C++ project](../debugger/remote-debugging-cpp.md)|
+|Docker|[Attach to a process running in a Docker container](../debugger/attach-to-process-running-in-docker-container.md)|
+|Linux|[Debug .NET Core on Linux using SSH by attaching to a process](../debugger/remote-debugging-dotnet-core-linux-with-ssh.md)|
 |Universal Windows Apps (UWP)|[Run UWP apps on a remote machine](../debugger/run-windows-store-apps-on-a-remote-machine.md) or [Debug an installed app package](../debugger/debug-installed-app-package.md)|
 
 If you just want to download and install the remote debugger and don't need any additional instructions for your scenario, follow the steps in this article.

docs/ide/code-styles-and-code-cleanup.md

@@ -1,7 +1,7 @@
 ---
 title: Code style options and code cleanup
 description: Learn how to configure Visual Studio to apply code style preferences using the Code Cleanup (Visual Studio 2019) and Format Document (Visual Studio 2017) commands.
-ms.date: 05/23/2024
+ms.date: 07/19/2024
 ms.topic: conceptual
 author: mikejo5000
 ms.author: mikejo
@@ -121,6 +121,7 @@ Most of the code cleanup settings map to one or more .NET code styles supported
 |Setting|Rule ID or style option|
 |-|-|
 |Remove unnecessary Imports or usings|[IDE0005](/dotnet/fundamentals/code-analysis/style-rules/ide0005)|
+|Sort imports or usings|[dotnet_sort_system_directives_first](/dotnet/fundamentals/code-analysis/style-rules/dotnet-formatting-options#dotnet_sort_system_directives_first)</br>[dotnet_separate_import_directive_groups](/dotnet/fundamentals/code-analysis/style-rules/dotnet-formatting-options#dotnet_separate_import_directive_groups)|
 |Apply file header preferences|[file_header_template](/dotnet/fundamentals/code-analysis/style-rules/ide0073#file_header_template)|
 |Remove unused variables|[IDE0051](/dotnet/fundamentals/code-analysis/style-rules/ide0051)|
 |Apply object creation preferences|[visual_basic_style_prefer_simplified_object_creation](/dotnet/fundamentals/code-analysis/style-rules/ide0140#visual_basic_style_prefer_simplified_object_creation)|

docs/ide/how-to-unlock-visual-studio.md

@@ -58,7 +58,15 @@ Note that CA policies enabled on an account might impact the account state or li
 
 ## Update an expired license
 
-If your subscription has expired and you no longer have access rights to Visual Studio, you must renew your subscription or add another account that has a subscription. To see more information about the license you are using, go to **File** > **Account Settings...** and look at the license information on the right side of the dialog. If you have another subscription associated with a different account, [add that account](signing-in-to-visual-studio.md#add-and-switch-user-accounts-in-visual-studio) to the **All Accounts** list on the left side of the dialog box by selecting the **Add an account** link.
+If your extended trial or subscription has expired and you no longer have access rights to Visual Studio, you must renew your subscription, add another account that has a subscription, or enter a Product key. To see more information about the license you are using, go to **File** > **Account Settings...** and look at the license information on the right side of the dialog. 
+
+:::image type="content" source="media/vs-2022/expired-license-account-settings-dialog.png" alt-text="Screenshot of an expired license in Visual Studio." border="false":::
+
+If you have another subscription associated with a different account, [add that account](signing-in-to-visual-studio.md#add-and-switch-user-accounts-in-visual-studio) to the **All Accounts** list on the left side of the dialog box by selecting the **+ Add** dropdown.
+
+You can also enter the [product key for your Visual Studio subscription](/visualstudio/subscriptions/product-keys) in the **Account Settings** dialog. To do this, select the **Unlock with a Product Key** link and enter the product key in the **Enter a product key** dialog.
+
+:::image type="content" source="media/vs-2022/expired-license-enter-product-key.png" alt-text="Screenshot of the Enter a product key dialog when user has an expired license." border="false":::
 
 ## Get support
 

docs/ide/media/vs-2022/expired-license-account-settings-dialog.png

@@ -1,7 +1,7 @@
 ---
 title: Create an offline installation
 description: Create an offline installation package to install Visual Studio offline when you have an unreliable internet connection or low bandwidth.
-ms.date: 6/6/2023
+ms.date: 7/19/2024
 ms.topic: conceptual
 f1_keywords:
 - offline installation [Visual Studio]
@@ -15,34 +15,41 @@ ms.subservice: installation
 ---
 # Create an offline installation package of Visual Studio for local installation
 
-We designed Visual Studio to work well in various computer configurations. The information on this page discusses how to create an offline installation package of files for installation on the **local machine**.
+Visual Studio is designed to work well in various computer configurations. In this article, you learn how to create an offline installation package of files for installation on the **local machine**.
 
 > [!IMPORTANT]
 > If you are an enterprise IT administrator who wants to perform a deployment of Visual Studio throughout a network of client workstations, or if you need to create an installation package of files to transfer to or install onto *another* machine, refer to our [Visual Studio Administrators Guide](https://aka.ms/vs/admin/guide), the [create a network-based installation of Visual Studio](create-a-network-installation-of-visual-studio.md) page, and the [deploy a layout onto a client machine](deploy-a-layout-onto-a-client-machine.md) documentation.
 
 ## Use the "Download all, then install" feature
-Sometimes online access is problematic. For example, you might have an unreliable internet connection or your internet connection might have low bandwidth. For situations like these, we've made additional methods available for acquiring Visual Studio. You can use the **Download all, then install** feature from the Visual Studio Installer to download an installation package on the local machine *before* you install it locally, or you can use the command line to create a local installation package to install locally later.
 
-To download a local installation package, select the **Download all, then install** option in the dropdown at the bottom of the **Workloads** tab of the Visual Studio Installer. The purpose of this feature is to frontload the downloading of the Visual Studio packages onto the same computer that you plan on eventually installing Visual Studio on. By downloading the packages locally first, you can then safely disconnect from the internet before you install Visual Studio.
+Sometimes online access is problematic. For example, you might have an unreliable internet connection or your internet connection might have low bandwidth. For situations like these, you have other methods available for acquiring Visual Studio. You can use the **Download all, then install** feature from the Visual Studio Installer to download an installation package on the local machine *before* you install it locally, or you can use the command line to create a local installation package to install locally later.
+
+To download a local installation package, select the **Download all, then install** option in the dropdown at the bottom of the **Workloads** tab of the Visual Studio Installer. The purpose of this feature is to download the Visual Studio packages in advance on the computer where Visual Studio will eventually be installed. By downloading the packages locally first, you can then safely disconnect from the internet before you install Visual Studio.
 
    ![The "Download all, then install" option](media/vs-2019/download-all-then-install-from-installer.png)
 
 > [!NOTE]
-> The **Download all, then install** functionality downloads a Visual Studio installation package that is customized to the local machine. Do not try to transfer this downloaded installation package to another computer, as it's not designed to work that way. Instead, if you want to download an installation package, host it on a network share or an intranet website, and transfer it to or install it on another machine, then you'll need to create a network layout as described in the [create a network-based installation of Visual Studio](create-a-network-installation-of-visual-studio.md) documentation.
+> The **Download all, then install** functionality downloads a Visual Studio installation package that is customized to the local machine. Don't transfer this downloaded installation package to another computer, as it's not designed to work that way.
+>
+> If you want to download an installation package, host it on a network share or an intranet website, and transfer it to or install it on another machine, then you'll need to create a network layout as described in the [create a network-based installation of Visual Studio](create-a-network-installation-of-visual-studio.md) documentation.
 
-You can also configure future updates of Visual Studio to respect the **Download all, then install** behavior. For more information, refer to the [installation and download behavior](/visualstudio/install/update-visual-studio?#installation-and-download-behaviors-1) documentation.
+You can also configure future updates of Visual Studio to respect the **Download all, then install** behavior. For more information, see the [installation and download behavior](/visualstudio/install/update-visual-studio?#installation-and-download-behaviors-1) documentation.
 
 ## Use the command line to create a local layout
 
 ### Step 1 - Download the Visual Studio bootstrapper
 
-[Download the correct bootstrapper for the version and edition of Visual Studio you want](create-a-network-installation-of-visual-studio.md#download-the-visual-studio-bootstrapper-to-create-the-layout) and copy it into the directory that you want to serve as the source location of your local layout. The bootstrapper is the executable that you use to create, update, or modify your local layout. You must have an internet connection to complete this step. 
+[Download the correct bootstrapper for the version and edition of Visual Studio you want](create-a-network-installation-of-visual-studio.md#download-the-visual-studio-bootstrapper-to-create-the-layout) and copy it into the directory you want to use as the source location for your local layout. The bootstrapper is the executable you use to create, update, or modify your local layout. You must have an internet connection to complete this step. 
 
 ### Step 2 - Create a local layout
 
-Open a command prompt with administrator privileges, navigate to the directory where you downloaded the bootstrapper, and use the [bootstrapper's parameters](use-command-line-parameters-to-install-visual-studio.md#layout-command-and-command-line-parameters) to create your local layout. Note that you must have an internet connection to complete this step. Common local layout creation examples are illustrated below. Additional examples can be found on the [create a network layout of Visual Studio](create-a-network-installation-of-visual-studio.md#configure-the-contents-of-a-layout) page and on the [command-line parameter examples](command-line-parameter-examples.md#using---layout-to-create-a-network-layout-or-a-local-cache) page. You can install a language other than English by changing `en-US` to a locale from the [list of language locales](use-command-line-parameters-to-install-visual-studio.md#list-of-language-locales), and you can use the [list of components and workloads](workload-and-component-ids.md) to further customize your local layout.
+Open a command prompt with administrator privileges, navigate to the directory where you downloaded the bootstrapper, and use the [bootstrapper's parameters](use-command-line-parameters-to-install-visual-studio.md#layout-command-and-command-line-parameters) to create your local layout. You must have an internet connection to complete this step.
+
+You can install a language other than English by changing `en-US` to a locale from the [list of language locales](use-command-line-parameters-to-install-visual-studio.md#list-of-language-locales), and you can use the [list of components and workloads](workload-and-component-ids.md) to further customize your local layout.
 
-- To create a complete local layout with all features and all languages (this will take a long time—we have *lots* of features!), run:
+Here are some common local layout creation examples. More examples can be found on the [create a network layout of Visual Studio](create-a-network-installation-of-visual-studio.md#configure-the-contents-of-a-layout) page and on the [command-line parameter examples](command-line-parameter-examples.md#using---layout-to-create-a-network-layout-or-a-local-cache) page.
+
+- To create a complete local layout with all features and all languages (this'll take a long time—we have *lots* of features!), run:
 
    ```shell
     vs_enterprise.exe --layout c:\localVSlayout
@@ -73,10 +80,11 @@ Open a command prompt with administrator privileges, navigate to the directory w
     vs_enterprise.exe --layout c:\localVSlayout --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --includeOptional --lang en-US 
     ```
 
-- You can also [use an exported vsconfig file](create-a-network-installation-of-visual-studio.md#configure-the-contents-of-a-layout) to customize the layout content, [verify](create-a-network-installation-of-visual-studio.md?#verify-a-layout) a layout or [fix](create-a-network-installation-of-visual-studio.md?#fix-a-layout) a layout.
+- You can also [use an exported vsconfig file](create-a-network-installation-of-visual-studio.md#configure-the-contents-of-a-layout) to customize the layout content, [verify](create-a-network-installation-of-visual-studio.md?#verify-a-layout) a layout, or [fix](create-a-network-installation-of-visual-studio.md?#fix-a-layout) a layout.
 
 ### Step 3 - Install Visual Studio from the local layout
-When you install Visual Studio from a local layout, the Visual Studio installer uses the local versions of the files. But, if you select components during installation that aren't in the layout, then the Visual Studio installer will attempt to download them from the internet. To make sure that you install only the files that you've previously downloaded, use the same [command-line options](use-command-line-parameters-to-install-visual-studio.md) that you used to create the local layout. To make sure your installer doesn't try to access the internet when it's installing the product, use the `--noweb` switch.
+
+When you install Visual Studio from a local layout, the Visual Studio Installer uses the local versions of the files. But if you select components during installation that aren't in the layout, then the Visual Studio Installer attempts to download them from the internet. To make sure you install only the files you previously downloaded, use the same [command-line options](use-command-line-parameters-to-install-visual-studio.md) you used to create the local layout. To make sure your installer doesn't try to access the internet when it's installing the product, use the `--noweb` switch.
 
 For example, if you created a local installation layout with the following command:
 
@@ -86,7 +94,7 @@ For example, if you created a local installation layout with the following comma
 vs_enterprise.exe --layout c:\localVSlayout --add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.NetWeb --add Component.GitHub.VisualStudio --includeOptional --lang en-US
 ```
 
-Then use this command to run the installation and prevent the client machine from accessing the internet:
+Then use the following command to run the installation and prevent the client machine from accessing the internet:
 
 ```shell
 c:\localVSlayout\vs_enterprise.exe --noWeb --add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.NetWeb --add Component.GitHub.VisualStudio --includeOptional
@@ -100,7 +108,7 @@ c:\localVSlayout\vs_enterprise.exe --noWeb --add Microsoft.VisualStudio.Workload
 vs_enterprise.exe --layout c:\localVSlayout --add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.NetWeb --includeOptional --lang en-US
 ```
 
-Then use this command to run the installation and prevent the client machine from accessing the internet:
+Then use the following command to run the installation and prevent the client machine from accessing the internet:
 
 ```shell
 c:\localVSlayout\vs_enterprise.exe --noWeb --add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.NetWeb --includeOptional