Merged main into live

Author: mijacobs

docs/ide/ai-assisted-development-visual-studio.md

@@ -95,7 +95,7 @@ The following table compares the capabilities of GitHub Copilot (and GitHub Copi
 
 | **AI-assistance feature** | **GitHub Copilot** | **IntelliCode** |
 |---------------------------|:--------------------:|:-----------------:|
-| Available as | - [Built-in by default in all workloads](visual-studio-github-copilot-install-and-states.md#get-github-copilot-for-visual-studio-2022-version-1710-or-later) & available through the Visual Studio Installer in Visual Studio version 17.10 and later <br/> - [Downloadable extensions](visual-studio-github-copilot-install-and-states.md#get-github-copilot-for-visual-studio-2022-versions-178-to-179) in Visual Studio versions 17.8 & 17.9| Built-in by default in most [workloads](../install/modify-visual-studio.md#change-workloads-or-individual-components) & available through the Visual Studio Installer |
+| Available as |[Built-in by default in all workloads](visual-studio-github-copilot-install-and-states.md#install-using-the-visual-studio-installer) & available through the Visual Studio Installer in Visual Studio version 17.10 and later <br/>| Built-in by default in most [workloads](../install/modify-visual-studio.md#change-workloads-or-individual-components) & available through the Visual Studio Installer |
 | Subscription-based | **Yes** <br/>[Learn more](https://docs.github.com/en/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot)| No |
 | User interface   | Inline <br/>Chat window | Inline |
 | Context-aware AI-assisted [IntelliSense](using-intellisense.md) | **Yes** <br/>[Learn more](visual-studio-github-copilot-extension.md#exploring-github-copilot) | **Yes** <br/>[Learn more](#intellicode-in-visual-studio) |

docs/ide/visual-studio-github-copilot-chat.md

@@ -39,11 +39,9 @@ To get started, you need:
 
 ## Get GitHub Copilot Chat for Visual Studio
 
-- If you're using Visual Studio version 17.10 or later, GitHub Copilot Chat is included in the [new unified GitHub Copilot experience](visual-studio-github-copilot-install-and-states.md#get-github-copilot-for-visual-studio-2022-version-1710-or-later) available as a recommended component in the Visual Studio Installer. It is installed by default with all workloads, unless you choose to exclude it during installation.
-- If you're using Visual Studio versions 17.9 or earlier, [install the GitHub Copilot Chat extension](visual-studio-github-copilot-install-and-states.md#install-github-copilot-chat).
+If you're using Visual Studio version 17.10 or later, GitHub Copilot Chat is included in the [new unified GitHub Copilot experience](visual-studio-github-copilot-install-and-states.md) available as a recommended component in the Visual Studio Installer. It is installed by default with all workloads, unless you choose to exclude it during installation.
 
    > [!NOTE]
-   > * The GitHub Copilot and GitHub Copilot Chat *extension* should only be used in Visual Studio versions 17.9 or earlier. For Visual Studio versions 17.10+, GitHub Copilot experience is available as a recommended component in the Visual Studio Installer, and includes both GitHub Copilot Chat and Completions experiences.
    > * If you experience authentication issues after installing the extension, see [Troubleshooting authentication issues with GitHub Copilot Chat](https://docs.github.com/en/copilot/troubleshooting-github-copilot/troubleshooting-authentication-issues-with-github-copilot-chat).
    > * GitHub Copilot is not included in Visual Studio Subscriptions and is a separate subscription managed by GitHub. For questions regarding GitHub Copilot subscriptions and Support, see [Individual Subscriptions](https://docs.github.com/en/billing/managing-billing-for-github-copilot/managing-your-github-copilot-business-subscription) or [Business subscriptions](https://docs.github.com/en/billing/managing-billing-for-github-copilot/managing-your-github-copilot-individual-subscription).
 

docs/ide/visual-studio-github-copilot-extension.md

@@ -40,8 +40,7 @@ GitHub Copilot supports several programming languages and frameworks, including
 
 ## Get GitHub Copilot for Visual Studio
 
-- If you're using Visual Studio version 17.10 or later, the [unified GitHub Copilot extension](visual-studio-github-copilot-install-and-states.md#get-github-copilot-for-visual-studio-2022-version-1710-or-later) is available as a recommended component in the Visual Studio Installer. It is installed by default with all workloads, unless you choose to exclude it during installation.
-- If you're using Visual Studio versions 17.9 or earlier, [install the GitHub Copilot extension](visual-studio-github-copilot-install-and-states.md#install-github-copilot-chat).
+With Visual Studio version 17.10 or later, the [unified GitHub Copilot extension](visual-studio-github-copilot-install-and-states.md) is available as a recommended component in the Visual Studio Installer. It is installed by default with all workloads, unless you choose to exclude it during installation.
 
 ## Using GitHub Copilot for code completions and suggestions
 

docs/ide/visual-studio-github-copilot-install-and-states.md

@@ -15,44 +15,10 @@ ms.custom: [copilot-learning-hub]
 
 **GitHub Copilot Completions** and **GitHub Copilot Chat** in Visual Studio enable enhanced [AI-assisted development in Visual Studio](ai-assisted-development-visual-studio.md), helping you be more productive and efficient when writing code.
 
-In this article, you learn how to install GitHub Copilot in Visual Studio. If you're using [Visual Studio 2022 version 17.10 or later](/visualstudio/releases/2022/release-notes), you learn to use the Copilot badge in the IDE to manage your Copilot state.
+In this article, you learn how to install and manage GitHub Copilot in [Visual Studio 2022 version 17.10 or later](/visualstudio/releases/2022/release-notes).
 
-## Get GitHub Copilot for Visual Studio 2022 version 17.10 or later
-
-With [Visual Studio 2022 version 17.10](/visualstudio/releases/2022/release-notes), GitHub Copilot and GitHub Copilot Chat are available to install as a single experience that combines both Copilot and Copilot Chat into one package. The unified GitHub Copilot experience is included as a built-in, recommended component by default in all workloads and is available through the Visual Studio Installer.
-
-To get the new unified GitHub Copilot experience:
-- Install [Visual Studio 2022 version 17.10 or later](/visualstudio/releases/2022/release-notes). 
-- Select at least one workload in the installer. Make sure to leave the preselected component **GitHub Copilot** selected.
-  OR
-  If no workload is selected, install **GitHub Copilot** by selecting it from **Individual components** in the installer.
-
-GitHub Copilot is installed by default with all workloads. If you choose to exclude it, you can install it later by using the Visual Studio Installer to **modify** your installation, and selecting the **GitHub Copilot** component. 
-
-## Get GitHub Copilot for Visual Studio 2022 versions 17.8 to 17.9 
-
-In Visual Studio 2022 versions 17.8 to 17.9, GitHub Copilot and GitHub Copilot Chat are available to install as two separate extensions. 
-> [!NOTE]
-> Installing GitHub Copilot extension is a prerequisite to installing GitHub Copilot Chat.
-
-### Install GitHub Copilot
-
-You can get the **GitHub Copilot extension** in one of the following ways:
-
-- Install the GitHub Copilot extension using the [Visual Studio Installer](#install-using-the-visual-studio-installer) (**recommended**)
-- Install using the [Extension Manager](#install-using-the-manage-extensions-dialog-box)
-- Install directly from [Visual Studio Marketplace](#install-from-visual-studio-marketplace): [**GitHub Copilot on Marketplace**](https://marketplace.visualstudio.com/items?itemName=GitHub.copilotvs)
-
-### Install GitHub Copilot Chat
-
-You can get the **GitHub Copilot Chat extension** in one of the following ways:
-
-- Install using the [Extension Manager](#install-using-the-manage-extensions-dialog-box)
-- Install directly from [Visual Studio Marketplace](#install-from-visual-studio-marketplace): [**GitHub Copilot Chat on Marketplace**](https://aka.ms/VSXGHCopilot)
-
-Support for GitHub Copilot Chat will be provided by GitHub and can be reached at https://support.github.com.
 
-#### Install using the Visual Studio Installer
+## Install using the Visual Studio Installer
 
 1. Launch the Visual Studio Installer.
 1. Select the installation of Visual Studio you want to modify, and then select **Modify**.
@@ -64,26 +30,9 @@ Support for GitHub Copilot Chat will be provided by GitHub and can be reached at
     > [!NOTE]
     > In versions 17.9 or earlier, you'll use the **Manage Extensions** dialog to manage updates to the GitHub Copilot extension.
 
-#### Install using the Manage Extensions dialog box
-
-1. Open Visual Studio.
-1. On the menu bar, select **Extensions** > **Manage Extensions**.
-1. In the Search box, enter "GitHub Copilot" or "GitHub Copilot Chat".
-1. Select the extension, and then select the **Download** button.
-1. Restart Visual Studio to complete the installation process.
-
-> [!NOTE]
-> For more information about activation & authorization, see the [Installing the Visual Studio extension](https://docs.github.com/en/copilot/getting-started-with-github-copilot?tool=visualstudio#installing-the-visual-studio-extension) section in GitHub Docs.
-
-#### Install from Visual Studio Marketplace
-
-Download and install the extensions directly from [Visual Studio Marketplace](https://marketplace.visualstudio.com/).
-- [GitHub Copilot extension for Visual Studio 2022 version 17.9 or earlier][**GitHub Copilot on Marketplace**](https://marketplace.visualstudio.com/items?itemName=GitHub.copilotvs)
-- [GitHub Copilot Chat extension for Visual Studio 2022 version 17.9 or earlier](https://aka.ms/VSXGHCopilot)
-
 ## Manage your Copilot state 
 
-With Visual Studio 2022 version 17.10, you see a Copilot status icon in the upper-right corner of the Visual Studio environment that indicates if Copilot is active, inactive, unavailable, or not installed. Using the dropdown menu from the status icon, you can easily access options that help manage or [troubleshoot](visual-studio-github-copilot-troubleshoot.md) your Copilot state. Some options are available or greyed out depending on your Copilot state.
+With Visual Studio 2022 version 17.10 or later, there's a Copilot status icon in the upper-right corner of the Visual Studio environment that indicates if Copilot is active, inactive, unavailable, or not installed. Using the dropdown menu from the status icon, you can easily access options that help manage or [troubleshoot](visual-studio-github-copilot-troubleshoot.md) your Copilot state. Some options are available or greyed out depending on your Copilot state.
 
 > [!NOTE]
 > Note that the status icon is moving from the bottom panel of the Visual Studio editor. 
@@ -144,6 +93,10 @@ You can remove the GitHub Copilot component from your Visual Studio instance by
 1. Uncheck **GitHub Copilot** and select **Modify**.
 1. Restart Visual Studio, and select **Hide Copilot** from the Copilot status icon dropdown to hide the badge.
 
+## Support
+
+Support for GitHub Copilot Chat will be provided by GitHub and can be reached at https://support.github.com.
+
 ## Next steps
 
 To learn more, consider exploring the following resources:

docs/msbuild/build-process-overview.md

@@ -24,7 +24,7 @@ The next sections are about the input files, such as solution files or project f
 
 ### Solutions and projects
 
-MSBuild instances may consist of one project, or many projects as part of a solution. The solution file isn't an MSBuild XML file, but MSBuild interprets it to know all the projects that are required to be built for the given configuration and platform settings. When MSBuild processes this XML input, it's referred to as the solution build. It has some extensible points that allow you to run something at every solution build, but since this build is a separate run from the individual project builds, no settings of properties or target definitions from the solution build are relevant to each project build.
+MSBuild instances may consist of one project, or many projects as part of a solution. Solution files in the `.slnx` format or the `.sln` format are both supported (in MSBuild 17.12 and later). The solution file (`.sln`) isn't an MSBuild XML file, but MSBuild interprets it to know all the projects that are required to be built for the given configuration and platform settings. When MSBuild processes this input, it's referred to as the solution build. It has some extensible points that allow you to run something at every solution build, but since this build is a separate run from the individual project builds, no settings of properties or target definitions from the solution build are relevant to each project build.
 
 You can find out how to extend the solution build at [Customize the solution build](customize-solution-build.md).
 

docs/msbuild/customize-solution-build.md

@@ -35,6 +35,9 @@ When you have many solution files that you want to extend in the same way, but y
 
 When you have *Directory.Solution.props* or *Directory.Solution.targets* in a root folder, but you have a solution under that folder that you don't want to import them, you can use the solution-specific files mentioned previously `before.{solutionname}.sln.targets` and `after.{solutionname}.sln.targets` to set the properties `$(ImportDirectorySolutionProps)` and `$(ImportDirectorySolutionTargets)` to false. Or, you can use the properties `$(DirectorySolutionPropsPath)` and `$(DirectorySolutionTargetsPath)` to specify a different location for those files. This could be helpful if you have various subsets of your solutions that require certain property values or targets common to the subsets.
 
+> [!NOTE]
+> The solution build is supported with the `.slnx` solution file format in MSBuild 17.12 and later. Both `before.{solutionname}.slnx.targets` and `before.{solutionname}.sln.targets` work (and likewise for the `after` forms) with MSBuild 17.14 and later.
+
 ## Related content
 
 - [Customize your build](customize-your-build.md).

docs/msbuild/msbuild-command-line-reference.md

@@ -32,7 +32,7 @@ The .NET CLI commands [dotnet build](/dotnet/core/tools/dotnet-build), [dotnet p
 
 |Argument|Description|
 |--------------|-----------------|
-|`ProjectFile`|Builds the targets in the project file that you specify. If you don't specify a project file, MSBuild searches the current working directory for a file name extension that ends in *proj* and uses that file. You can also specify a Visual Studio solution file for this argument.|
+|`ProjectFile`|Builds the targets in the project file that you specify. If you don't specify a project file, MSBuild searches the current working directory for a file name extension that ends in *proj* and uses that file. You can also specify a Visual Studio solution file for this argument. In Visual Studio 17.12 and later, the `.slnx` solution file format is supported, as well as the `.sln` format. Both `.sln` and `.slnx` files for the same solution can be present in the same directory; if both are present, you must explicitly specify one of them to build the solution. |
 
 ## Switches