Skip to content

Repo sync for protected CLA branch #9511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 74 commits into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
cde30c4
Merge pull request #11231 from MicrosoftDocs/cxwtool-22852
ghogen May 18, 2023
16c0d18
Merge branch 'main' into cxwtool-13628
cxwtool May 19, 2023
7dd394f
Merge pull request #11247 from MicrosoftDocs/cxwtool-13628
ghogen May 22, 2023
1046155
Merge branch 'main' into cxwtool-31258
cxwtool May 22, 2023
0f18e48
Merge pull request #11255 from MicrosoftDocs/cxwtool-31258
ghogen May 23, 2023
c70d665
Merge branch 'main' into cxwtool-9103
cxwtool May 29, 2023
3270663
Merge pull request #11282 from MicrosoftDocs/cxwtool-9103
ghogen May 30, 2023
d876527
Merge branch 'main' into cxwtool-2256
cxwtool May 31, 2023
b6756ce
Merge pull request #11291 from MicrosoftDocs/cxwtool-2256
ghogen May 31, 2023
272cdd0
Merge branch 'main' into cxwtool-651
cxwtool Jun 2, 2023
c590aef
Merge pull request #11304 from MicrosoftDocs/cxwtool-651
ghogen Jun 5, 2023
2130dc9
Merge branch 'main' into cxwtool-23341
cxwtool Jun 5, 2023
1e9cb5d
FIx typo
ghogen Jun 5, 2023
5e30500
Merge pull request #11309 from MicrosoftDocs/cxwtool-23341
ghogen Jun 5, 2023
6739a5f
Merge branch 'main' into release-17.7
ghogen Jun 14, 2023
fb4ecb8
Merge branch 'main' into cxwtool-6089
cxwtool Jun 16, 2023
ae6e4b4
Merge pull request #11359 from MicrosoftDocs/cxwtool-6089
ghogen Jun 19, 2023
bfb4968
Merge branch 'main' into cxwtool-30657
cxwtool Jun 19, 2023
cbbbd1f
Merge pull request #11367 from MicrosoftDocs/cxwtool-30657
ghogen Jun 20, 2023
da782be
Merge branch 'main' into cxwtool-26809
cxwtool Jun 21, 2023
26abff1
Merge pull request #11377 from MicrosoftDocs/cxwtool-26809
ghogen Jun 22, 2023
eef0d02
Merge branch 'main' into cxwtool-3937
cxwtool Jun 23, 2023
3506b5c
Merge branch 'main' into cxwtool-108
cxwtool Jun 26, 2023
bd83f33
Merge pull request #11384 from MicrosoftDocs/cxwtool-3937
ghogen Jun 28, 2023
96c15de
Merge pull request #11391 from MicrosoftDocs/cxwtool-108
ghogen Jun 28, 2023
a8af59f
Merge branch 'main' into cxwtool-31572
cxwtool Jun 28, 2023
698692d
Merge pull request #11397 from MicrosoftDocs/cxwtool-31572
ghogen Jun 29, 2023
912761f
Merge branch 'main' into cxwtool-17392
cxwtool Jun 30, 2023
09025ee
Merge pull request #11411 from MicrosoftDocs/cxwtool-17392
ghogen Jul 1, 2023
16a217d
Merge branch 'main' into cxwtool-7661
cxwtool Jul 7, 2023
068da08
Merge pull request #11428 from MicrosoftDocs/cxwtool-7661
ghogen Jul 10, 2023
30a1d80
Merge branch 'main' into cxwtool-6845
cxwtool Jul 10, 2023
a425941
Merge pull request #11434 from MicrosoftDocs/cxwtool-6845
ghogen Jul 11, 2023
34c5a54
Merge branch 'main' into cxwtool-23630
cxwtool Jul 12, 2023
195c0f0
Merge pull request #11441 from MicrosoftDocs/cxwtool-23630
ghogen Jul 13, 2023
f0e9561
Merge branch 'main' into cxwtool-20826
cxwtool Jul 14, 2023
5e96ba5
Merge pull request #11457 from MicrosoftDocs/cxwtool-20826
ghogen Jul 14, 2023
d56f30f
Merge branch 'main' into cxwtool-10088
cxwtool Jul 17, 2023
0ceefab
Merge pull request #11461 from MicrosoftDocs/cxwtool-10088
ghogen Jul 18, 2023
81bd250
Merge branch 'main' into cxwtool-8866
cxwtool Jul 19, 2023
91d1aa4
Merge pull request #11468 from MicrosoftDocs/cxwtool-8866
ghogen Jul 21, 2023
39b8db9
Merge branch 'main' into cxwtool-30118
cxwtool Jul 21, 2023
33e679d
Merge pull request #11472 from MicrosoftDocs/cxwtool-30118
ghogen Jul 24, 2023
a5298f5
Merge branch 'main' into cxwtool-5945
cxwtool Jul 24, 2023
24012dd
Merge pull request #11478 from MicrosoftDocs/cxwtool-5945
ghogen Jul 26, 2023
cdc69e4
Merge branch 'main' into cxwtool-8716
cxwtool Jul 26, 2023
68f3399
Merge pull request #11493 from MicrosoftDocs/cxwtool-8716
ghogen Jul 27, 2023
06f5dc0
Merge branch 'main' into cxwtool-4140
cxwtool Jul 28, 2023
6f6c731
Merge pull request #11497 from MicrosoftDocs/cxwtool-4140
ghogen Jul 31, 2023
a317a46
Merge branch 'main' into cxwtool-2490
cxwtool Jul 31, 2023
0975110
Merge pull request #11501 from MicrosoftDocs/cxwtool-2490
ghogen Jul 31, 2023
4179592
Update workload and component docs for 17.7
Aug 1, 2023
cd1e837
Merge pull request #11507 from davilimap/dev/dalimapa/UpdateComponent…
PMEds28 Aug 2, 2023
abf0ed8
Merge branch 'main' into cxwtool-24197
cxwtool Aug 2, 2023
7565a8e
Merge pull request #11510 from MicrosoftDocs/cxwtool-24197
ghogen Aug 4, 2023
29c5e3f
Merge pull request #11518 from MicrosoftDocs/main
ghogen Aug 4, 2023
71267b8
replace hero screenshot
TerryGLee Aug 4, 2023
b933acb
update the Update date
TerryGLee Aug 4, 2023
553c144
add new Multi-Graph Branch View section
TerryGLee Aug 4, 2023
493a913
revise new section + add new multigraph screenshot
TerryGLee Aug 5, 2023
1b6d466
remove superfluous info block
TerryGLee Aug 7, 2023
7835f95
update top tag-line for 17.7
TerryGLee Aug 7, 2023
7ea494f
Merge pull request #11524 from TerryGLee/tglee-whatsnew-17.7
prmerger-automator[bot] Aug 7, 2023
d10f844
revise section heading + fix typo
TerryGLee Aug 7, 2023
0712214
Merge branch 'release-17.7' into tglee-gitmultigraph-17.7
TerryGLee Aug 7, 2023
583119f
Merge pull request #11521 from TerryGLee/tglee-gitmultigraph-17.7
JamesJBarnett Aug 7, 2023
cd50514
Merge branch 'main' into cxwtool-31283
cxwtool Aug 7, 2023
7679ab2
Merge pull request #11527 from MicrosoftDocs/cxwtool-31283
ghogen Aug 7, 2023
0965249
add new File Comparison section
TerryGLee Aug 8, 2023
d255bc0
change H3 to H2, revise links, apply text edits
TerryGLee Aug 8, 2023
ef357f5
Merge pull request #11529 from TerryGLee/tglee-comparefiles-17.7
AnnaMHuff Aug 8, 2023
6c44afa
Merge pull request #11533 from MicrosoftDocs/release-17.7
ghogen Aug 8, 2023
92c751e
Merge pull request #11535 from MicrosoftDocs/main
ghogen Aug 8, 2023
cdfab79
Merging changes synced from https://github.com/MicrosoftDocs/visualst…
Aug 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added docs/ide/media/vs-2022/file-comparison.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 15 additions & 1 deletion docs/ide/use-solution-explorer.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Learn about Solution Explorer
description: Learn how you can use Solution Explorer and its context menu to manage the projects and files in a solution.
ms.date: 04/21/2023
ms.date: 08/08/2023
ms.topic: conceptual
ms.custom: contperf-fy22q4
helpviewer_keywords:
Expand Down Expand Up @@ -131,6 +131,20 @@ Visual Studio remembers your choice so that you get the experience that best sui
> [!TIP]
> You can configure the [keyboard shortcuts](default-keyboard-shortcuts-in-visual-studio.md) for the **Project.AddNewItem** command and the **AddQuickFile** command from **Tools** > **Options** > **Environment** > **Keyboard**.

## File comparison

Starting with the Visual Studio 2022 version [17.7](/visualstudio/releases/2022/release-notes/) release, you can now select two files in Solution Explorer and compare them by using the new **Compare Selected** option.

:::image type="content" source="media/vs-2022/file-comparison.png" alt-text="Screenshot of the file comparison tool from the right-click context menu in Solution Explorer.":::

You can compare files in the following ways:

- Multi-select two files by holding down the **Ctrl** button and then right-clicking and selecting the **Compare Selected** from the context menu.
- Right-click a single file (for example, `File1`) and then select the **Select for Compare** option from the context menu. Then, navigate to the second file (for example, `File2`) in Solution Explorer, right-click the second file, and press **Compare with File1**.
- Right-click a single file, select **Compare With…** from the context menu, which opens File Explorer. Navigate to any file and select it for comparison.

No matter which way you choose to compare your files, the file comparison tool should make it easier to compare your files without having to leave your IDE.

::: moniker-end

## See also
Expand Down
4 changes: 2 additions & 2 deletions docs/ide/whats-new-visual-studio-2022.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "What's new in Visual Studio 2022"
titleSuffix: ""
description: "Learn about the new features in Visual Studio 2022."
ms.date: 05/16/2023
ms.date: 08/18/2023
helpviewer_keywords:
- "Visual Studio, what's new"
- "what's new [Visual Studio]"
Expand All @@ -19,7 +19,7 @@ ms.workload:

[!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]

**Updated for the 17.6 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)
**Updated for the 17.7 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)

>[!div class="button"]
>[Download Visual Studio 2022](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta)
Expand Down
847 changes: 436 additions & 411 deletions docs/install/includes/vs-2022/workload-component-id-vs-build-tools.md

Large diffs are not rendered by default.

1,617 changes: 822 additions & 795 deletions docs/install/includes/vs-2022/workload-component-id-vs-community.md

Large diffs are not rendered by default.

1,683 changes: 855 additions & 828 deletions docs/install/includes/vs-2022/workload-component-id-vs-enterprise.md

Large diffs are not rendered by default.

1,617 changes: 822 additions & 795 deletions docs/install/includes/vs-2022/workload-component-id-vs-professional.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.prod: visual-studio-windows
ms.technology: vs-installation
ms.topic: include
Expand All @@ -21,7 +21,7 @@ ms.topic: include

Component ID | Name | Version | Dependency type
--- | --- | --- | ---
Microsoft.VisualStudio.Component.CoreEditor | Visual Studio core editor | 17.6.33605.316 | Required
Microsoft.VisualStudio.Component.CoreEditor | Visual Studio core editor | 17.7.33905.399 | Required

## Unaffiliated components

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.prod: visual-studio-windows
ms.technology: vs-installation
ms.topic: include
Expand All @@ -21,7 +21,7 @@ ms.topic: include

Component ID | Name | Version | Dependency type
--- | --- | --- | ---
Microsoft.VisualStudio.ComponentGroup.TestTools.TestAgent | Test Agent core features | 17.6.33605.316 | Required
Microsoft.VisualStudio.ComponentGroup.TestTools.TestAgent | Test Agent core features | 17.7.33905.399 | Required

## Unaffiliated components

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.prod: visual-studio-windows
ms.technology: vs-installation
ms.topic: include
Expand All @@ -21,7 +21,7 @@ ms.topic: include

Component ID | Name | Version | Dependency type
--- | --- | --- | ---
Microsoft.VisualStudio.ComponentGroup.TestTools.TestController | Test Controller core features | 17.6.33605.316 | Required
Microsoft.VisualStudio.ComponentGroup.TestTools.TestController | Test Controller core features | 17.7.33905.399 | Required

## Unaffiliated components

Expand Down
4 changes: 2 additions & 2 deletions docs/install/workload-and-component-ids.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.custom: vs-acquisition
ms.topic: reference
helpviewer_keywords:
Expand Down Expand Up @@ -48,7 +48,7 @@ For more information about how to use these lists, see the [Use command-line par

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

**Updated for the [17.6 release](/visualstudio/releases/2022/release-notes/)**
**Updated for the [17.7 release](/visualstudio/releases/2022/release-notes/)**

| **Edition** | **ID** | **Description** |
| ----------- | ------ | --------------- |
Expand Down
2 changes: 1 addition & 1 deletion docs/install/workload-component-id-vs-build-tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.topic: reference
helpviewer_keywords:
- workload ID, Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion docs/install/workload-component-id-vs-community.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.topic: reference
helpviewer_keywords:
- workload ID, Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion docs/install/workload-component-id-vs-enterprise.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.topic: reference
helpviewer_keywords:
- workload ID, Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion docs/install/workload-component-id-vs-professional.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.topic: reference
helpviewer_keywords:
- workload ID, Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion docs/install/workload-component-id-vs-team-explorer.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.topic: reference
helpviewer_keywords:
- workload ID, Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion docs/install/workload-component-id-vs-test-agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.topic: reference
helpviewer_keywords:
- workload ID, Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion docs/install/workload-component-id-vs-test-controller.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
author: anandmeg
ms.author: meghaanand
manager: jmartens
ms.date: 05/16/2023
ms.date: 08/08/2023
ms.topic: reference
helpviewer_keywords:
- workload ID, Visual Studio
Expand Down
17 changes: 13 additions & 4 deletions docs/version-control/git-browse-repository.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Browse repos, compare branches & commits"
description: Browse any Git repository in Visual Studio by using the Git Repository window.
ms.date: 06/07/2023
ms.date: 08/08/2023
ms.topic: how-to
author: houghj16
ms.author: tglee
Expand Down Expand Up @@ -31,8 +31,9 @@ The **Git Repository** window contains three main sections, as numbered in the p

- **Incoming** shows incoming commits that your team has been contributing.
- **Outgoing** shows your local commits that you still haven't pushed.
- **Local History** shows the rest of commits tracked by your local repository.
1. **Commit**: Selecting any commit in the **Graph** section opens its details. You can check the changes that a commit has introduced by selecting them, which shows a difference. For example, the previous screenshot shows the changes that one commit introduced to the *Files.csproj* file.
- **Local History** shows the rest of commits tracked by your local repository.

1. **Commit**: Selecting any commit in the **Graph** section opens its details. You can check the changes that a commit has introduced by selecting them, which shows a difference. For example, the previous screenshot shows the changes that one commit introduced to the *Resize.cs* file.

The **Alt**+**Up arrow** or **Alt**+**Down arrow** keyboard shortcuts allow you to jump between these sections.

Expand All @@ -47,6 +48,14 @@ You can browse through any local or remote branch without having to switch your
>
> :::image type="content" source="media/vs-2022/git-repository-commit-details-full-screen.png" alt-text="Screenshot of full-screen commit details with diff configurations." lightbox="media/vs-2022/git-repository-commit-details-full-screen.png":::

### Multi-branch graph view

**[New with version 17.7](/visualstudio/releases/2022/release-notes)**: When you open the Git Repo window, you start in the single branch view. You can then select any branch to add both the branch and its commits to a multi-branch graph view, which adds visual cues that make it more efficient to interact with multiple branches.

:::image type="content" source="media/vs-2022/git-repository-multigraph-branch-view.png" alt-text="Screenshot of the multi-graph branch view in Visual Studio." lightbox="media/vs-2022/git-repository-multigraph-branch-view.png":::

There's both line coloring and branch labels on the left side of the **Local History** view that help make it easier to trace which commits belong to each branch. You can use the list of branches at the top of the table to scroll between branches more easily and know immediately which branches appear in the graph.

<a name="compare-commits"/>

## Compare commits
Expand Down Expand Up @@ -116,4 +125,4 @@ To continue your journey, see [Manage Git repositories in Visual Studio](git-man
## See also

- [The Git experience in Visual Studio](git-with-visual-studio.md)
- [Visual Studio and GitHub: Better together](https://visualstudio.microsoft.com/vs/github/)
- [Visual Studio and GitHub: Better together](https://visualstudio.microsoft.com/vs/github/)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.