Merge pull request #11281 from MicrosoftDocs/main639098785808396918sync_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/ide/reference/proxy-firewall-troubleshoot.md

@@ -15,7 +15,22 @@ ai-usage: ai-assisted
 When you use Visual Studio behind a corporate proxy or firewall, you might encounter connectivity issues that affect features requiring network access, such as NuGet package restore, extension installation, and AI-powered features. Proxy issues generally fall into two categories:
 
 - **Configuration issues**: Problems with your proxy server setup, certificates, or network configuration. These issues are resolved by your IT administrator.
-- **Settings required**: Visual Studio requires additional information about your network configuration. You can find more information about how to supply required settings to Visual Studio in this article. In the latest Insiders version of Visual Studio, you can configure the proxy within Visual Studio settings. You may enable the preview feature in **Tools** > **Options** > **All Settings** > **Preview Features** > **Proxy Configuration**.
+
+::: moniker range="visualstudio"
+
+- **Settings required**: Visual Studio requires additional information about your network configuration. You can configure proxy settings directly in the IDE. See [Configure proxy settings in Visual Studio](proxy-settings.md) for setup instructions.
+
+  > [!NOTE]
+  > The proxy configuration experience is not yet available in all Visual Studio 2026 installations. If you don't see this in your installation, you can install [Visual Studio Insiders](https://visualstudio.microsoft.com/insiders/) to try it. Or, view the [Visual Studio 2022 version of this page](/visualstudio/ide/reference/proxy-firewall-troubleshoot?view=vs-2022&preserve-view=true) for guidance.
+
+::: moniker-end
+
+::: moniker range="vs-2022"
+
+- **Settings required**: Visual Studio requires additional information about your network configuration. You can find more information about how to supply required settings to Visual Studio in this article.
+
+::: moniker-end
+
 - **Product issues**: If you have determined that your issue is not a configuration issue or supplied settings do not address the issue you're seeing, then this could be a product issue. Follow the steps at [Collect diagnostic information](#product-issues-collect-diagnostic-information-for-support) before submitting a ticket.
 
 This article helps you identify which category your issue falls into and provides solutions for common problems.
@@ -93,22 +108,19 @@ The following sections describe common proxy-related issues and their solutions.
 
 **Solution**: Visual Studio supports signing into GitHub and Microsoft Entra accounts behind an authenticating proxy with basic authentication, but most versions of Visual Studio don't have support for Copilot behind an authenticating proxy with basic authentication.
 
-On startup, a prompt appears to capture credentials, and this is used for Entra authentication. The credentials persist in the Windows **Credential Manager** under **Windows Credentials** as `VSCredentials_<proxyAddress>` as the internet or network address, then the username and password that the proxy requires.
-
-<!--
-::: moniker range="<=visualstudio"
+::: moniker range="vs-2022"
 
-**Solution**: Basic authentication for proxies isn't supported in Visual Studio 2022. Upgrade to a later version of Visual Studio and configure proxy settings as described in [Configure proxy settings in Visual Studio](#configure-proxy-settings-in-visual-studio).
+On startup, a prompt appears to capture credentials. The credentials persist in the Windows **Credential Manager** under **Windows Credentials** as `VSCredentials_<proxyAddress>` as the internet or network address, then the username and password that the proxy requires.
 
 ::: moniker-end
 
+::: moniker range="visualstudio"
 
-::: moniker range=">visualstudio"
+On startup, a prompt appears to capture credentials. The credentials persist in the Windows **Credential Manager** under **Windows Credentials** as `VSCredentials_<proxyAddress>` as the internet or network address, then the username and password that the proxy requires.
 
-**Solution**: Basic authentication for proxies isn't supported. Configure proxy settings as described in [Configure proxy settings in Visual Studio](#configure-proxy-settings-in-visual-studio).
+You can also configure proxy credentials directly in Visual Studio. See [Configure proxy settings in Visual Studio](proxy-settings.md).
 
 ::: moniker-end
--->
 ### Proxy authentication required (NTLM or Kerberos)
 
 **Symptom**: Network-dependent features don't work when using a proxy server with NTLM or Kerberos authentication.
@@ -117,16 +129,17 @@ On startup, a prompt appears to capture credentials, and this is used for Entra
 
 **Solution**: Configure Visual Studio to use default proxy credentials:
 
-<!--
-::: moniker range=">visualstudio"
+::: moniker range="visualstudio"
 
-1. Go to **Tools** > **Options** > **Environment** > **Network & Proxy**.
-1. Enable **Use system default proxy credentials**.
+1. Go to **Tools** > **Options** > **Proxy Settings**.
+1. Select **Use the logged-in Windows account** to use your current Windows credentials.
+1. Restart Visual Studio for the changes to take effect.
+
+For more information, see [Configure proxy settings in Visual Studio](proxy-settings.md).
 
 ::: moniker-end
--->
 
-::: moniker range=">=vs-2022"
+::: moniker range="vs-2022"
 
 Set the environment variable `VS_USE_DEFAULTPROXY` to `true`. For Copilot, also set `COPILOT_USE_DEFAULTPROXY` to `true`.
 
@@ -143,56 +156,28 @@ Set the environment variable `VS_USE_DEFAULTPROXY` to `true`. For Copilot, also
 
 **Solution**: Configure the proxy server address explicitly:
 
-<!--
-::: moniker range=">visualstudio"
+::: moniker range="visualstudio"
+
+1. Go to **Tools** > **Options** > **Proxy Settings**.
+1. Select **Use custom proxy settings**.
+1. Enter the proxy server URL and port.
+1. Restart Visual Studio for the changes to take effect.
 
-1. Go to **Tools** > **Options** > **Environment** > **Network & Proxy**.
-1. Enter your proxy server address.
+For more information, see [Configure proxy settings in Visual Studio](proxy-settings.md).
 
 ::: moniker-end
--->
 
-::: moniker range=">=vs-2022"
+::: moniker range="vs-2022"
 
 Set the `HTTPS_PROXY` and `HTTP_PROXY` environment variables to your proxy server address. Copilot needs these set up for Visual Studio.
 
 ::: moniker-end
 
-<!--
-## Configure proxy settings in Visual Studio
-
 ::: moniker range="visualstudio"
 
-Visual Studio provides built-in proxy configuration options that work with most enterprise proxy setups. You can configure these settings through the Options dialog.
-
-### Access proxy settings
-
-To configure proxy settings in Visual Studio:
-
-1. Go to **Tools** > **Options**.
-1. Under **All Settings**, select **Proxy Configuration**.
-1. Configure the appropriate settings for your environment.
-
-### Use system default proxy credentials
-
-For proxies that use Windows authentication (NTLM or Kerberos):
-
-1. In the **Proxy Configuration** settings, enable **Use Windows proxy configuration**.
-1. Restart Visual Studio for the changes to take effect.
-
-This setting allows Visual Studio to use your Windows login credentials for proxy authentication.
-
-### Specify a proxy server address
-
-For proxies that require an explicit address:
-
-1. In the **Proxy Configuration** settings, select **Use custom proxy settings**, and enter your proxy server address in the **Proxy server** field.
-1. If your proxy uses a specific port, specify it in the **Proxy port** field.
-1. If your proxy requires it, enable **Proxy authentication required**, and enter your credentials.
-1. Restart Visual Studio for the changes to take effect.
+For detailed proxy configuration steps, see [Configure proxy settings in Visual Studio](proxy-settings.md).
 
 ::: moniker-end
--->
 
 ## Troubleshoot SSL certificate issues
 
@@ -277,5 +262,11 @@ Collect the following information:
 
 ## Related content
 
+::: moniker range="visualstudio"
+
+- [Configure proxy settings in Visual Studio](proxy-settings.md)
+
+::: moniker-end
+
 - [Install and use Visual Studio behind a firewall or proxy server](../../install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md)
 - [Visual Studio connectivity troubleshooting](../../install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md#troubleshoot-network-related-errors)

docs/ide/reference/proxy-settings.md

@@ -0,0 +1,58 @@
+---
+title: Configure proxy settings in Visual Studio
+description: Set a custom proxy server, port, and authentication for Visual Studio to connect through enterprise networks.
+ms.date: 03/12/2026
+ms.topic: how-to
+f1_keywords:
+- VS.ToolsOptionsPages.Environment.ProxySettings
+monikerRange: 'visualstudio'
+author: ghogen
+ms.author: ghogen
+ms.subservice: general-ide
+ms.custom: awp-ai
+---
+
+# Configure proxy settings in Visual Studio
+
+By default, Visual Studio uses your Windows proxy configuration, but if your organization's network requires a different proxy configuration for Visual Studio, you can set one directly in the IDE through the **Proxy Settings** options page.
+
+> [!NOTE]
+> In this first release, the custom proxy settings apply to **GitHub Copilot experiences** and **sign-in flows for Entra ID and GitHub** within Visual Studio. A restart may be required for some features to pick up new proxy settings.
+
+## Prerequisites
+
+The proxy configuration experience is not yet available in all Visual Studio 2026 installations. If you don't see this in your installation, you can install [Visual Studio Insiders](https://visualstudio.microsoft.com/insiders/) to try it. Or, view the [Visual Studio 2022 proxy troubleshooting page](/visualstudio/ide/reference/proxy-firewall-troubleshoot?view=vs-2022&preserve-view=true) for guidance.
+
+## Open the Proxy Configuration page
+
+1. Select **Tools** > **Options** from the menu bar.
+1. Select **Proxy Configuration** to open the proxy configuration page.
+
+<!-- TODO: Screenshot of the Proxy Settings page
+![Screenshot of the Proxy Settings page under Tools > Options.](../../media/proxy-settings.png)
+-->
+
+## Default behavior
+
+By default, Visual Studio uses your Windows proxy configuration. You don't need to change any settings unless you require a proxy configuration that differs from the default for your user account. If the Windows settings are set to No Proxy, Visual Studio respects this and sets no proxy.
+
+## Configure proxy settings
+
+To supply Visual Studio with proxy settings:
+
+1. Open the **Proxy Configuration** page (**Tools** > **Options** > **Proxy Configuration**).
+1. Select **Use custom proxy settings**.
+1. Enter the **proxy server URL** and **port**.
+1. Choose an authentication method:
+   - **Use the logged-in Windows account** — uses your current Windows credentials for integrated authentication (NTLM or Kerberos).
+   - **Use alternate credentials** — provide a **username** and **password** for the proxy.
+1. Select **OK**.
+1. Restart Visual Studio.
+
+> [!TIP]
+> If your proxy requires Basic authentication, choose **Use alternate credentials** and enter the credentials your proxy expects.
+
+## Related content
+
+- [Troubleshoot proxy and firewall issues in Visual Studio](proxy-firewall-troubleshoot.md)
+- [Install and use Visual Studio behind a firewall or proxy server](../../install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md)

docs/ide/sign-in-access-multiple-accounts.md

@@ -48,3 +48,10 @@ Proxy credentials are stored in the Windows Credential Manager and are used as n
 > If the proxy server starts or changes after opening Visual Studio, the **Account Settings** dialog will show a warning, but you'll need to restart Visual Studio to get the proxy credentials prompt.
 
 ::: moniker-end
+
+::: moniker range="visualstudio"
+
+> [!TIP]
+> You can also configure proxy settings directly in Visual Studio through **Tools** > **Options** > **Proxy Settings**. For more information, see [Configure proxy settings in Visual Studio](reference/proxy-settings.md).
+
+::: moniker-end

docs/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md

@@ -154,6 +154,8 @@ Here are a few more support options:
 
 ## Related content
 
+* [Configure proxy settings in Visual Studio](../ide/reference/proxy-settings.md)
+* [Troubleshoot proxy and firewall issues in Visual Studio](../ide/reference/proxy-firewall-troubleshoot.md)
 * [Connectivity requirements for Live Share](/visualstudio/liveshare/reference/connectivity/)
 * [Create and maintain a network installation of Visual Studio](create-a-network-installation-of-visual-studio.md)
 * [Troubleshoot network-related errors in Visual Studio](/troubleshoot/developer/visualstudio/installation/troubleshoot-network-related-errors)

docs/toc.yml

@@ -971,6 +971,8 @@
       href: ide/visual-studio-performance-tips-and-tricks.md
 - name: Reference
   items:
+  - name: Configure proxy settings
+    href: ide/reference/proxy-settings.md
   - name: Troubleshoot proxy and firewall issues
     href: ide/reference/proxy-firewall-troubleshoot.md
   - name: Keyboard shortcuts & commands

subscriptions/docfx.json

@@ -10,7 +10,7 @@
         ],
         "exclude": [
           "**/obj/**",
-          "**/includes/**",
+          "includes/**",
           "README.md",
           "LICENSE",
           "LICENSE-CODE",