Skip to content

Commit 24639f9

Browse files
authored
Merge pull request #8686 from MicrosoftDocs/main638047587347558473sync_temp
Repo sync for protected CLA branch
2 parents 71a03ac + 65104f8 commit 24639f9

14 files changed

+104
-15
lines changed

docs/get-started/tutorial-projects-solutions.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Introduction to projects and solutions
33
description: Learn about the difference between projects and solutions and how to use them in Visual Studio.
4-
ms.date: 11/12/2021
4+
ms.date: 11/22/2022
55
ms.technology: vs-ide-general
66
ms.custom: [vs-acquisition, get-started, SEO-VS-2020]
77
ms.topic: tutorial
@@ -42,7 +42,7 @@ In Visual Studio, a solution isn't an "answer". A solution is simply a container
4242

4343
### Create a solution
4444

45-
Start your exploration by creating an empty solution. After you get to know Visual Studio, you probably won't create empty solutions very often. When you create a new project, Visual Studio automatically creates a solution for the project unless a solution is already open.
45+
Start your exploration by creating an empty solution. After you get to know Visual Studio, you probably won't create empty solutions often. When you create a new project, Visual Studio automatically creates a solution for the project unless a solution is already open.
4646

4747
::: moniker range="vs-2019"
4848

@@ -124,7 +124,7 @@ Now add your first project to the solution. Start with an empty project, and add
124124
125125
1. On the **Configure your new project** page, name the project **QuickDate**, and then select **Create**.
126126

127-
The **QuickDate** project appears under the solution in **Solution Explorer**. Currently the project contains a single file called **App.config**.
127+
The **QuickDate** project appears under the solution in **Solution Explorer**. The project contains a References node and a single file named **App.config**.
128128

129129
::: moniker-end
130130

@@ -231,7 +231,7 @@ You'll use the new unit test project to test your method in the **QuickDate** pr
231231

232232
1. In **Solution Explorer**, right-click the **References** node of the **QuickTest** project, and select **Add Reference** from the context menu.
233233

234-
1. In the **Reference Manager** dialog box, under **Projects**, select the checkbox next to **QuickDate**, and then select **OK**.
234+
1. In the **Reference Manager** dialog box, select **Projects**. In the middle pane, select the checkbox next to **QuickDate**, and then select **OK**.
235235

236236
A reference to the **QuickDate** project appears under the **QuickTest** project in **Solution Explorer**.
237237

@@ -263,7 +263,7 @@ You'll use the new unit test project to test your method in the **QuickDate** pr
263263

264264
A red squiggle appears under some of the code. You can fix this error by making the test project a [friend assembly](/dotnet/standard/assembly/friend-assemblies) to the **QuickDate** project.
265265

266-
1. In the *Calendar.cs* file, add the following [using statement](/dotnet/csharp/language-reference/keywords/using-statement) and <xref:System.Runtime.CompilerServices.InternalsVisibleToAttribute> attribute to the top of the file to resolve the error in the test project.
266+
1. In the ***Calendar.cs*** file, add the following [using statement](/dotnet/csharp/language-reference/keywords/using-statement) and <xref:System.Runtime.CompilerServices.InternalsVisibleToAttribute> attribute to the top of the file to resolve the error in the test project.
267267

268268
```csharp
269269
using System.Runtime.CompilerServices;
@@ -302,7 +302,7 @@ To check that your unit test is working, choose **Test** > **Run All Tests** fro
302302
::: moniker-end
303303

304304
> [!TIP]
305-
> If **Test Explorer** doesn't open automatically, open it by choosing **Test** > **Test Explorer** from the menu bar.
305+
> You can also open **Test Explorer** by choosing **Test** > **Test Explorer** from the menu bar.
306306
307307
## Project properties
308308

@@ -331,7 +331,6 @@ The line in the *Calendar.cs* file that contains the <xref:System.Runtime.Compil
331331
## See also
332332

333333
- [Work with projects and solutions](../ide/creating-solutions-and-projects.md)
334+
- [Develop code in Visual Studio without projects or solutions](../ide/develop-code-in-visual-studio-without-projects-or-solutions.md)
334335
- [Manage project and solution properties](../ide/managing-project-and-solution-properties.md)
335336
- [Manage references in a project](../ide/managing-references-in-a-project.md)
336-
- [Develop code in Visual Studio without projects or solutions](../ide/develop-code-in-visual-studio-without-projects-or-solutions.md)
337-
- [Visual Studio IDE overview](../get-started/visual-studio-ide.md)

docs/version-control/git-manage-repository.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Manage Git repos in Visual Studio
33
titleSuffix: ""
44
description: Manage any Git repository in Visual Studio by using the Git Repository window.
5-
ms.date: 03/29/2022
5+
ms.date: 11/18/2022
66
ms.topic: how-to
77
author: houghj16
88
ms.author: tglee
@@ -158,7 +158,7 @@ To learn more about resetting branches, see the [Git webpage for the reset comma
158158

159159
## Next steps
160160

161-
To continue your journey, see [Resolve merge conflicts in Visual Studio](git-resolve-conflicts.md).
161+
To continue your journey, see [Work with multiple repos](git-multi-repository-support.md).
162162

163163
## See also
164164

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
---
2+
title: Work with multiple repositories
3+
titleSuffix: ""
4+
description: Learn how to view, manage, and debug across 10 active repos at the same time by using the Git tooling within Visual Studio.
5+
ms.date: 11/22/2022
6+
ms.topic: conceptual
7+
author: houghj16
8+
ms.author: tglee
9+
ms.manager: jmartens
10+
ms.prod: visual-studio-windows
11+
ms.technology: vs-ide-general
12+
ms.custom: version-control
13+
monikerRange: vs-2022
14+
---
15+
# Work with multiple repos
16+
17+
As one of our most [highly requested features in the Developer Community](https://developercommunity.visualstudio.com/t/allow-multiple-git-repositories-to-be-active-at-on/351156), we've added multi-repository support to Visual Studio 2022, starting with [version 17.4](/visualstudio/releases/2022/release-notes-v17.4).
18+
19+
Now, you can have up to 10 active Git repositories at one time in Visual Studio. Multi-repo support means that you can work with a solution that spans more than one repository, and apply Git operations across several repositories at the same time. For example, in a large web project, you might need different repositories to manage work done on the frontend, the API, the database, the documentation, along with various libraries and dependencies. Before multi-repo support, you might have had to open multiple instances of Visual Studio to work between repos. Starting with [version 17.4](/visualstudio/releases/2022/release-notes-v17.4), you can manage, view, and debug them all with one instance of Visual Studio.
20+
21+
> [!NOTE]
22+
> To see multi-repository support in action, view the [Use multiple Git repositories in Visual Studio](https://www.youtube.com/watch?v=ctnlQzX2YwI&t=34s) video on YouTube.
23+
24+
## Branch management and track changes
25+
26+
Multi-repository support extends the capabilities of the **Git Changes** and **Git Repository** windows. You can manage your multi-repo scenarios the same way as you would in working with a single repository.
27+
28+
:::image type="content" source="media/vs-2022/multi-repo-new-branch-button.png" alt-text="Screenshot of the New Branch button in Visual Studio.":::
29+
30+
You can create your branches across several repositories at one time by using the extended branch creation dialog.
31+
32+
:::image type="content" source="media/vs-2022/multi-repo-create-new-branch.png" alt-text="Screenshot of the 'Create a new branch' dialog in Visual Studio.":::
33+
34+
Then, as you make changes, the **Git Changes** window tracks your work separated by repository. You can stage and commit as you typically would.
35+
36+
:::image type="content" source="media/vs-2022/multi-repo-track-changes.png" alt-text="Screenshot of the Git Changes window that tracks changes to your work.":::
37+
38+
You can use the branch pickers in the status bar and the **Git Changes** tool window to switch branches. All you need to do is select the branch you’d like to check out. Also, you can perform inner loop branching operations like merging, rebasing, renaming, deleting, and comparing branches by right-clicking the branch to open the context menu.
39+
40+
:::image type="content" source="media/vs-2022/multi-repo-branch-picker.png" alt-text="Screenshot of the branch picker functionality in the Git Changes tool window.":::
41+
42+
And, you can perform more advanced repository and branch management operations in the **Git Repository** window.
43+
44+
:::image type="content" source="media/vs-2022/multi-repo-git-repository-tool-window.png" alt-text="Screenshot of the branch picker functionality in the Git Repository tool window.":::
45+
46+
## Network operations
47+
48+
Once you’re ready to commit, the network operations dialog makes it easy to specify the exact branch you’re pushing to and reorder your pushes. This same dialog allows you to exercise more control over other network operations, like [fetch and pull](git-fetch-pull-sync.md).
49+
50+
:::image type="content" source="media/vs-2022/multi-repo-push-network-operation.png" alt-text="Screenshot showing a push action in the network operations dialog.":::
51+
52+
## Repository settings
53+
54+
You can use the **Git Repository Settings** page to specify your options for each repository. For example, you can specify whether to prune remote branches during fetch.
55+
56+
:::image type="content" source="media/vs-2022/multi-repo-git-repository-settings.png" alt-text="Screenshot of the Git Repository Settings option in Visual Studio.":::
57+
58+
## Activate multiple repos from a solution or a folder
59+
60+
You can activate multiple repositories from either a solution or a folder.
61+
62+
### Use a solution
63+
64+
Here's how to create a solution with multiple repositories:
65+
66+
1. Open one of your existing solutions that already has a repository initialized.
67+
68+
1. Right-click the solution in **Solution Explorer**, and then select **Add** > **[Existing Project](../ide/use-solution-explorer.md#the-add-context-menu-fly-out)**.
69+
70+
1. Select the .csproj file for another project that has a repository initialized.
71+
72+
After the project's added, Visual Studio detects and activates the second repo. Then, you can adjust the Project References as necessary.
73+
74+
### Use a folder
75+
76+
If the repositories you want to use are independent of each other and don't need to be part of the same solution, you might want to use a folder to open them.
77+
78+
To do so, you can place the local repo directories in the same parent folder and then use the **Open a local folder** option from the Visual Studio launch page to open the parent folder. Visual Studio detects and activates each repo, and then tracks changes by repo (as shown in the following screenshot).
79+
80+
:::image type="content" source="media/vs-2022/multi-repo-open-folder-solution.png" alt-text="Screenshot showing how you can activate multiple repositories from a folder in Visual Studio.":::
81+
82+
## Next steps
83+
84+
Want to know more about how we'll develop further Git functionality within Visual Studio 2022, or to share your feedback with us on the multi-repo feature? See the "Building with your feedback", "What's next", and "Let us know what you think" sections of the [Multi-repository support released](https://devblogs.microsoft.com/visualstudio/multi-repository-support-released/) blog post.
85+
86+
Next, to continue your journey with repo management, see [Resolve merge conflicts in Visual Studio](git-resolve-conflicts.md).

docs/version-control/index.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
title: Version control & source control with Git docs # Required; page title displayed in search results. Include the brand. < 60 chars.
88
description: Use version / source control technologies in Visual Studio. You can share, integrate, and manage your code releases in Git & GitHub without leaving your codebase.
99
ms.topic: landing-page
10-
ms.date: 10/13/2022
10+
ms.date: 11/18/2022
1111
author: TerryGLee
1212
ms.author: tglee
1313
manager: jmartens
@@ -61,9 +61,11 @@ landingContent:
6161
- linkListType: how-to-guide
6262
links:
6363
- text: Browse repos & compare branches
64-
url: git-browse-repository.md
64+
url: git-browse-repository.md
6565
- text: Manage repos
66-
url: git-manage-repository.md
66+
url: git-manage-repository.md
67+
- text: Work with multiple repos
68+
url: git-multi-repository-support.md
6769
- text: Resolve merge conflicts
6870
url: git-resolve-conflicts.md
6971
- text: Git settings & preferences
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

docs/version-control/toc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- name: Create a repo
1414
href: git-create-repository.md
1515
- name: Git settings and preferences
16-
href: git-settings.md
16+
href: git-settings.md
1717
- name: Innerloop workflow
1818
expanded: true
1919
items:
@@ -34,6 +34,8 @@
3434
href: git-browse-repository.md
3535
- name: Manage a repo
3636
href: git-manage-repository.md
37+
- name: Work with multiple repos
38+
href: git-multi-repository-support.md
3739
- name: Resolve merge conflicts
3840
href: git-resolve-conflicts.md
3941
- name: Resources

subscriptions/manage-vs-subscriptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ To add an alternate account:
8888

8989
1. Sign in to the [Subscriber Portal](https://my.visualstudio.com?wt.mc_id=o~msft~docs) with your Microsoft Account (MSA).
9090
2. Select the **Subscriptions** tab.
91-
3. Under **Related Links**, choose **Add alternate account**.
91+
3. Under **Alternate account**, choose **Add alternate account**.
9292
4. Enter your work/school account email address and select **Add**.
9393

9494
After you've added an alternate account, you can update or remove it at any time by selecting the **Subscriptions** tab and choosing the appropriate option in the **Related Links** section.

0 commit comments

Comments
 (0)