Merged main into live

Author: mijacobs

docs/ide/copilot-usage-and-models.md

@@ -19,32 +19,34 @@ GitHub Copilot includes built-in tools to help you track usage, manage your plan
 To track your Copilot usage:
 
 1. Select the **Copilot badge** in the top-right corner of Visual Studio.
-2. Select **Copilot Consumptions**.
+1. Select **Copilot Consumptions** from the menu to view the dialog.
 
    :::image type="content" source="media/vs-2022/copilot-usage-models/copilot-consumptions-panel.png" alt-text="Screenshot that shows Copilot Consumptions panel." lightbox="media/vs-2022/copilot-usage-models/copilot-consumptions-panel.png":::
 
-Here, you can view your usage and the number of remaining requests. You can also select **Get more requests** to manage your Copilot plan on *GitHub*.
+   Here, you can view your usage and the number of remaining requests. You can also select **Get more requests** to manage your Copilot plan on *GitHub*.
 
 > [!NOTE]
-> GitHub manages billing and subscriptions. For more information, go to [GitHub.com](https://github.com/)
+> GitHub manages billing and subscriptions. For details, visit your [GitHub settings](https://github.com/settings/billing/summary).
 
 ## Understand model selection
 
-Copilot supports multiple AI models, and each model may consume requests at different rates based on assigned multipliers.
+Copilot supports multiple AI models, and each model may consume requests at different rates based on assigned [multipliers](https://docs.github.com/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests#model-multipliers).
 
 To view or change your current model:
+
 1.	Open the **Copilot Chat** window.
-2.	Use the **model picker** dropdown above the input field to select a model.
+1.	Use the **model picker** dropdown above the input field to select a model.
 
-When your [premium request quota](https://docs.github.com/en/copilot/about-github-copilot/plans-for-github-copilot#comparing-copilot-plans) is exhausted, Copilot automatically falls back to a base model so you can continue working without interruption.
+When your [premium request quota](https://docs.github.com/copilot/about-github-copilot/plans-for-github-copilot#comparing-copilot-plans) is exhausted, Copilot automatically falls back to a base model so you can continue working without interruption.
 
 To manage model usage in non-chat interactions, configure the setting **Enhance non-chat requests with premium models** in **GitHub** > **Copilot** > **Editor**.
 
 > [!TIP]
-> Visit your [Copilot settings on GitHub](https://docs.github.com/en/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements) to explore model options and subscription details.
+> Visit your [Copilot settings on GitHub](https://github.com/settings/copilot/features) to explore model options and subscription details.
 
 ## Related content
 
 - [About premium requests](https://docs.github.com/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests#premium-requests)
-- [About billing](https://docs.github.com/en/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans)
+- [About Copilot billing](https://docs.github.com/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans)
+- [GitHub support](https://support.github.com/)
 - [Install and manage GitHub Copilot in Visual Studio](visual-studio-github-copilot-install-and-states.md)

docs/ide/index.yml

@@ -1,7 +1,7 @@
 ### YamlMime:Landing
 
 title: Visual Studio IDE documentation
-summary: An integrated development environment (IDE) is a feature-rich application that can be used for many aspects of software development. The Visual Studio IDE makes it easy to edit, debug, build, and publish your app.
+summary: An integrated development environment (IDE) is a feature-rich application that can be used for many aspects of software development. The Visual Studio IDE makes it easy to edit, debug, build, and publish all your development projects.
 
 metadata:
   title: Visual Studio IDE documentation
@@ -13,7 +13,7 @@ metadata:
   author: ghogen
   ms.author: ghogen
   ms.manager: mijacobs
-  ms.date: 06/20/2024
+  ms.date: 06/4/2025
   ms.custom: vs-acquisition
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new

docs/msbuild/customize-by-directory.md

@@ -118,14 +118,15 @@ It might be desirable to have common properties for all projects *(1)*, common p
 To make MSBuild correctly merge the "inner" files (*2-src* and *2-test*) with the "outer" file (*1*), you must take into account that once MSBuild finds a *Directory.Build.props* file, it stops further scanning. To continue scanning and merge into the outer file, place this code into both inner files:
 
 ```xml
-<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="'' != $([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 ```
 
 A summary of MSBuild's general approach is as follows:
 
 - For any given project, MSBuild finds the first *Directory.Build.props* upward in the solution structure, merges it with defaults, and stops scanning for more.
 - If you want multiple levels to be found and merged, then [`<Import...>`](../msbuild/property-functions.md#msbuild-getpathoffileabove) (shown previously) the "outer" file from the "inner" file.
 - If the "outer" file doesn't itself also import something above it, then scanning stops there.
+- Only do this if the uupper level file actual exists
 
 Or more simply: the first *Directory.Build.props* that doesn't import anything is where MSBuild stops.
 

docs/windows/index.yml

@@ -7,7 +7,7 @@ metadata:
    titleSuffix: ""
    description: Learn how to use Visual Studio to develop applications, services, and tools in the language of your choice, for any platform or device.
    ms.topic: hub-page
-   ms.date: 10/3/2024
+   ms.date: 6/4/2025
    author: ghogen
    ms.author: ghogen
    manager: mijacobs
@@ -26,7 +26,7 @@ highlightedContent:
      url: ../ide/whats-new-visual-studio-2022.md
    - title: GitHub Copilot
      itemType: get-started
-     url: ../ide/ai-assisted-development-visual-studio.md
+     url: ../ide/visual-studio-github-copilot-install-and-states.md
    - title: Previous versions
      itemType: overview
      url: /previous-versions/visualstudio/