Skip to content

Commit 0b9175d

Browse files
authored
Merge pull request #10314 from MicrosoftDocs/main638569226875529906sync_temp
Repo sync for protected branch
2 parents 7dcafa7 + ff42d6c commit 0b9175d

File tree

4 files changed

+21
-29
lines changed

4 files changed

+21
-29
lines changed

docs/ide/class-designer/designing-and-viewing-classes-and-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ms.subservice: general-ide
2525
With the **Class Designer** tool in Visual Studio, you can design, visualize, and refactor class diagrams in C#, Visual Basic, or C++ projects. Class diagrams show the code elements and their relationships in a visual design surface, which can help you better understand your project structure and reorganize your code.
2626

2727
> [!NOTE]
28-
> Class Designer is not available in .NET Core projects.
28+
> Class Designer is not available in .NET Core and .NET 5 and later projects.
2929
3030
## About class diagrams
3131

@@ -99,7 +99,7 @@ If you haven't installed the **Class Designer** component, follow these steps to
9999
1. Expand **General**, and then select **Class Diagram** from the template list. For Visual C++ projects, look in the **Utility** category to find the **Class Diagram** template.
100100

101101
> [!NOTE]
102-
> If you don't see the **Class Diagram** template, [follow the steps](#install-the-class-designer-component) to install the **Class Designer** component for Visual Studio.
102+
> If you don't see the **Class Diagram** template, [follow the steps](#install-the-class-designer-component) to install the **Class Designer** component for Visual Studio. As stated earlier in this article, Class Designer is not available for .NET Core and .NET 5 and later.
103103
104104
The class diagram opens in Class Designer and appears as a file that has a *.cd* extension in **Solution Explorer**. You can drag shapes and lines to the diagram from **Toolbox**.
105105

docs/msbuild/errors/msb4025.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "MSB4025: The project file could not be loaded. {0}"
33
description: "This error occurs when MSBuild tries to load the project file, but the project file could not be loaded."
4-
ms.date: "08/15/2022"
4+
ms.date: "07/15/2024"
55
ms.topic: "error-reference"
66
f1_keywords:
77
- MSB4025
@@ -18,7 +18,7 @@ ms.subservice: msbuild
1818
---
1919
# MSB4025
2020

21-
This error occurs when MSBuild tries to load and parse a solution file and create a project, but the project file could not be loaded. The file must be an XML MSBuild file, such as a `.props` file, or `.targets` file, or a file with any other extension that contains XML that is intended to be interpreted by MSBuild.
21+
This error occurs when MSBuild tries to load and parse a project, but the project file or MSBuild import file could not be loaded. The file must be an XML MSBuild file, such as a validly formatted project file, `.props` file, or `.targets` file, or a file with any other extension that contains XML that is intended to be interpreted by MSBuild.
2222

2323
The message resembles the following, but this text might be followed by additional information:
2424

docs/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,10 +741,10 @@
741741
href: ide/walkthrough-creating-a-multiple-computer-build-environment.md
742742
- name: Debug >>
743743
href: debugger/index.yml
744-
- name: Track changes with Git
744+
- name: Git in Visual Studio
745745
displayName: git, github, azure dev ops, dev ops, version control, source control, source, versioning, clone, integrate, release
746746
items:
747-
- name: Git in Visual Studio
747+
- name: About Git in Visual Studio
748748
href: version-control/git-with-visual-studio.md
749749
- name: Get started
750750
expanded: true

docs/version-control/git-with-visual-studio.md

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: The Git experience in Visual Studio
2+
title: About Git in Visual Studio
33
titleSuffix: ""
44
description: Explore Git options for source control in Visual Studio and track the code changes you make over time or revert to specific versions.
55
ms.date: 05/15/2024
@@ -9,15 +9,15 @@ ms.author: ghogen
99
ms.manager: mijacobs
1010
ms.subservice: general-ide
1111
---
12-
# About the Git experience in Visual Studio
12+
# About Git in Visual Studio
1313

1414
Visual Studio provides a user interface for [Git](https://git-scm.com/docs/git), a widely used modern version control system. Whether your source code is hosted in a GitHub repository, Azure DevOps, or another Git provider, you can do all the common version control tasks within the Visual Studio IDE. Or, you can work locally with no provider at all, with the option to back up your source later when you're ready to connect to a provider.
1515

1616
The source code you work with doesn't have to have been created with Visual Studio. You can work with any source folder in any Git repo, whether there's a Visual Studio project file or not.
1717

1818
::: moniker range=">=vs-2022"
1919

20-
## Start with Git & GitHub in Visual Studio
20+
## Start with Git and GitHub in Visual Studio
2121

2222
To get started using Git with Visual Studio:
2323

@@ -35,25 +35,23 @@ If you want to use git commands at the command line, you should also install [Gi
3535

3636
When you clone a repository or open a local repository, Visual Studio switches to the Git context. Solution Explorer loads the folder at the root of the Git repository, and scans the directory tree for any viewable files like `CMakeLists.txt` or those with the `.sln` file extension. For more information, see [View files in Solution Explorer](../get-started/tutorial-open-project-from-repo.md#view-files-in-solution-explorer).
3737

38-
## Intuitive inner-loop workflow
38+
## Branches and remote repositories
3939

40-
For your day-to-day Git workflow, Visual Studio provides a seamless way to interact with Git while coding without having you switch away from your code.
41-
42-
You are empowered to multi-task and experiment with your code through branches. If you or your team works on multiple features at the same time, or if you'd like to explore ideas without affecting your working code, branching is very helpful. The recommended Git workflow uses a new branch for every feature or fix that you work on. Learn how to [create a branch](git-create-branch.md) from Visual Studio.
40+
You can use branches to keep related changes separated from unrelated changes you're also working on. The recommended Git workflow uses a new branch for every feature or fix that you work on. Learn how to [create a branch](git-create-branch.md) from Visual Studio.
4341

4442
Once you create a new branch and switch to it, you can start working by changing existing files or by adding new ones and then committing your work to the repository. To learn more about making a commit in Visual Studio and to better understand file states in Git, refer to the [Make a commit](git-make-commit.md) page.
4543

46-
Git is a distributed version control system, meaning that all the changes made so far are local only changes. To contribute these changes to a remote repository, you must [push those local commit(s) to a remote](git-push-remote.md).
44+
Git is a distributed version control system, meaning that all the changes made so far are local-only changes. To contribute these changes to a remote repository, you must [push those local commit(s) to a remote](git-push-remote.md).
4745

48-
If you are working in a team or if you are using different machines, you will also need to continually fetch and pull new changes on the remote repository. To learn more about managing Git network operations in Visual Studio, refer to the [Fetch, pull, push, and sync](git-fetch-pull-sync.md) page.
46+
If you are working in a team, or if you are using different machines, you might often need to fetch and pull new changes on the remote repository. To learn more about managing Git network operations in Visual Studio, refer to the [Fetch, pull, push, and sync](git-fetch-pull-sync.md) page.
4947

5048
:::image type="content" source="media/git-source-control-inner-loop.png" alt-text="The Visual Studio IDE with the Git menu and the Git Changes tab in Solution Explorer showing.":::
5149

52-
## Repository management & collaboration
50+
## Repository management and collaboration
5351

54-
However, there are times when it makes more sense to focus on your Git repository. For example, you might need to get a good picture of what your team has been working on, or copy a commit from a different branch, or just clean-up your outgoing commits. Visual Studio includes powerful [repository browsing](git-browse-repository.md) and collaboration features that eliminate the need to use other tools.
52+
However, there are times when it makes more sense to focus on your Git repository. For example, you might need to get a good picture of what your team has been working on, or copy a commit from a different branch, or just clean-up your outgoing commits. Visual Studio includes powerful [repository browsing](git-browse-repository.md) and collaboration features that eliminate the need to use other tools.
5553

56-
To help you focus on your Git repository, Visual Studio has a **Git Repository** window, which is a consolidated view of all the details in your repository, including local and remote branches and commit history. You can access this window directly from either **Git** or **View** on the menu bar or from the status bar.
54+
To help you focus on your Git repository, Visual Studio has a **Git Repository** window, which is a consolidated view of all the details in your repository, including local and remote branches and commit history. You can access this window directly from either **Git** or **View** on the menu bar, or from the status bar.
5755

5856
:::image type="content" source="media/git-source-control-repository-management.png" alt-text="The Visual Studio IDE that highlights the Git menu and the Git Changes tab in Solution Explorer.":::
5957

@@ -76,15 +74,9 @@ To personalize your Git settings at a repository level as well as at a global le
7674

7775
:::image type="content" source="media/vs-2022/git-options-settings.png" alt-text="Screenshot of the Options dialog box where you can choose personalization and customization settings in Visual Studio IDE." lightbox="media/vs-2022/git-options-settings.png":::
7876

79-
## Performance & productivity enhancements
80-
81-
When it comes to the integrated Git tooling within Visual Studio, we continue to iterate on performance and productivity enhancements. Here are a few notable updates:
82-
83-
- **Commit graph**. In Visual Studio 2022 [version 17.2](/visualstudio/releases/2022/release-notes-v17.2), we introduced a commit graph feature to help reduce the delays you might experience when you're viewing your Git repository or branch history. For more information, see the [Supercharge your Git experience](https://devblogs.microsoft.com/visualstudio/supercharge-your-git-experience-in-vs/) blog post.
84-
85-
- **Branch switching**. Also in Visual Studio 2022 [version 17.2](/visualstudio/releases/2022/release-notes-v17.2), we reduced the number of branch switches that need solution reloads by an estimate of 80%. To learn more, see the [Performance Enhancements: Git Branch Switching](https://devblogs.microsoft.com/visualstudio/vs2022-performance-enhancements-git-branch-switching/) blog post.
77+
## Productivity enhancements
8678

87-
There are even more feature updates in Visual Studio 2022 [**version 17.6**](/visualstudio/releases/2022/release-notes-v17.6), to include the ability to [search](https://devblogs.microsoft.com/visualstudio/git-tooling-preview-features-to-enhance-productivity/#improved-search-for-related-github-issues-and-azure-devops-work-items) for and [link](https://devblogs.microsoft.com/visualstudio/reference-github-issues-and-pull-requests-in-visual-studio/) to GitHub Issues and Azure DevOps work items, amongst a few. To get all the details, see the [**Git Features to Enhance Productivity**](https://devblogs.microsoft.com/visualstudio/git-tooling-preview-features-to-enhance-productivity/) blog post.
79+
In Visual Studio 2022 [**version 17.6**](/visualstudio/releases/2022/release-notes-v17.6), you can [search](https://devblogs.microsoft.com/visualstudio/git-tooling-preview-features-to-enhance-productivity/#improved-search-for-related-github-issues-and-azure-devops-work-items) for and [link](https://devblogs.microsoft.com/visualstudio/reference-github-issues-and-pull-requests-in-visual-studio/) to GitHub Issues and Azure DevOps work items. See the [**Git Features to Enhance Productivity**](https://devblogs.microsoft.com/visualstudio/git-tooling-preview-features-to-enhance-productivity/) blog post.
8880

8981
::: moniker-end
9082

@@ -152,9 +144,9 @@ When you clone a repository or open a local repository, Visual Studio switches y
152144

153145
Visual Studio adjusts its View based on which file you load in Solution Explorer:
154146

155-
- If you clone a repository that contains a single .sln file, then Solution Explorer directly loads that solution for you.
156-
- If Solution Explorer doesn’t detect any .sln files in your repository, then by default it loads Folder View.
157-
- If your repository has more than one .sln file, then Solution Explorer shows you the list of available Views for you to choose from.
147+
- If you clone a repository that contains a single `.sln` file, then Solution Explorer directly loads that solution for you.
148+
- If Solution Explorer doesn’t detect any `.sln` files in your repository, then by default it loads Folder View.
149+
- If your repository has more than one `.sln` file, then Solution Explorer shows you the list of available Views for you to choose from.
158150

159151
You can toggle between the currently open View and the list of Views by using the **Switch Views** button in the Solution Explorer toolbar.
160152

0 commit comments

Comments
 (0)