Skip to content

Commit d9e9673

Browse files
committed
Fixing CATS issues
1 parent e82efb4 commit d9e9673

File tree

1 file changed

+26
-23
lines changed

1 file changed

+26
-23
lines changed

mac/tf-version-control.md

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Follow the prompts to install the extension. Once it's installed, restart the ID
3434

3535
Updates to the TFVC extension are made periodically. To access updates, choose **Visual Studio > Extensions...** from the menu and select the **Updates** tab. Select the extension in the list and press the **Update** button:
3636

37-
![Extension manager](media/tfvc-update.png)
37+
![Extension manager showing update](media/tfvc-update.png)
3838

3939
Press **Install** on the next dialog to uninstall the old package and install the new one.
4040

@@ -46,25 +46,25 @@ Once the extension is installed, select the **Version Control > TFS/VSTS > Open
4646

4747
Choose either Visual Studio Team Services or Team Foundation Server to get started and press **Connect**:
4848

49-
![Connect with a TFVC Server](media/tfvc-choose-server-type.png)
49+
![Connect with a Server](media/tfvc-choose-server-type.png)
5050

5151
### VSTS Authentication
5252

5353
When you select a project that is hosted on VSTS, you're prompted to enter your Microsoft account details:
5454

55-
![Connect with a TFVC Server](media/tfvc-vsts-login.png)
55+
![Connect with a VSTS Server](media/tfvc-vsts-login.png)
5656

5757
### TFS Authentication
5858

5959
To connect to TFS, enter the server details and your account credentials. Enter a domain to use NTLM authentication, otherwise leave blank to use basic authentication. Select **Add Server**:
6060

61-
![Sign in to a TFVC Server](media/tfvc-login.png)
61+
![Sign in to a TFS Server](media/tfvc-login.png)
6262

6363
## Selecting a project
6464

6565
Once you've successfully authenticated, you can see a list of repositories that are associated with the account in the **Open from Source Control** dialog:
6666

67-
![Connect with a TFVC Server](media/tfvc-vsts-projects.png)
67+
![Open from Source Control dialog with projects displayed](media/tfvc-vsts-projects.png)
6868

6969
This dialog is organized with the following nodes:
7070

@@ -77,34 +77,29 @@ At this point, you can search and filter by the name of a project or account.
7777

7878
To add a new server to the list, press the **+** button on the **Open from Source Control** dialog:
7979

80-
![Sign in to a TFVC Server](media/tfvc-add-new-server.png)
80+
![Highlighted add button to add new server to the list](media/tfvc-add-new-server.png)
8181

8282
Select the provider from the list, and enter your credentials:
8383

84-
![Add new server credentials](media/tfvc-add-new-creds.png)
85-
86-
<!--Once you've successfully logged in, select the projects that you want to access and press **OK**:
87-
88-
![Choose projects](media/tfvc-choose-projects.png)
89-
-->
84+
![Dialog showing option for source control provider](media/tfvc-add-new-creds.png)
9085

9186
## Creating a new workspace
9287

9388
To start working with a project, you need to have a _workspace_. If you don't already have a workspace, you can create one from the **Workspace** combobox in the **Open from Source Control** dialog:
9489

95-
![Source Explorer](media/tfvc-create-new-workspace.png)
90+
![Create new workspace combobox option](media/tfvc-create-new-workspace.png)
9691

9792
Set the name and local path for your new workspace and select **Create Workspace**:
9893

99-
![Source Explorer](media/tfvc-local-workspace.png)
94+
![Entering a name and local path for the new workspace](media/tfvc-local-workspace.png)
10095

10196
## Using the Source Code Explorer
10297

10398
Once you've created a workspace and mapped your project, you can start working with the _Source Code Explorer_.
10499

105100
To open the Source Code Explorer, select the **Version Control > TFS/VSTS > Source Control Explorer**:
106101

107-
![](media/tfvc-source-control-explorer.png)
102+
![Menu item to open the source code explorer](media/tfvc-source-control-explorer.png)
108103

109104
The Source Code Explorer enables you to navigate through all the mapped projects, their files, and folders. It also allows you to perform all the basic source control actions such as:
110105

@@ -118,25 +113,30 @@ The Source Code Explorer enables you to navigate through all the mapped projects
118113

119114
Many of these actions are available through context actions on the project:
120115

121-
![](media/tfvc-sourcecode-actions.png)
116+
![Context menu actions for a project](media/tfvc-sourcecode-actions.png)
122117

123118
## Managing workspaces
124119

125-
If you haven't already create a workspace, as described in the [Creating a workspace]() section, you'll notice that the Source Code Explorer is empty:
120+
If you haven't already create a workspace, as described in the [Creating a workspace](#creating-a-new-workspace) section, you'll notice that the Source Code Explorer is empty:
126121

127-
![](media/tfvc-setup-empty-sce.png)
122+
![empty source code explorer](media/tfvc-setup-empty-sce.png)
128123

129124
To set up your remote project with a local workspace, use the following steps:
130125

131-
1. Select the **Server** from the combobox
126+
1. Select the **Server** from the combobox.
132127
1. Not that there are "no workspaces" and tht the Local Path is "Not Mapped". Select the **Not Mapped** link to display the **Create new Workspace** dialog.
133128
1. Provide a name for the workspace and then click **Add Working Folder** to map the project to a local folder on your computer:
134-
![](media/tfvc-workspace1.png)
129+
130+
![Create a new workspace dialog showing default options](media/tfvc-workspace1.png)
131+
135132
1. Select the "$" folder to map all Team projects on your server to the same workspace, or select an individual project, and click **OK**:
136-
![](media/tfvc-workspace2.png)
133+
134+
![Browse for folder dialog showing all projects](media/tfvc-workspace2.png)
135+
137136
1. Select the location on your local machine that you wish mp the project(s) to and click **Select Folder**.
138137
1. Confirm the details of the new workspace by pressing **OK**
139-
![](media/tfvc-workspace3.png)
138+
139+
![Create new workspace dialog with working folder added](media/tfvc-workspace3.png)
140140

141141
Once your workspace is set up, it can be changed or removed by clicking the **Manage Workspaces** button in the Source Code Explorer.
142142

@@ -156,13 +156,16 @@ To use basic authentication it is necessary to enable **Alternative authenticati
156156

157157
1. Sign in as the account owner to your VSTS account (https://{youraccount}.visualstudio.com).
158158
2. From your account toolbar, select the gear icon and select **Policy**:
159+
159160
![Policy settings option selected](media/tfvc-auth2.png)
161+
160162
3. Review your application connection settings. Change these settings, based on your security policies:
163+
161164
![Policy settings option selected](media/tfvc-auth.png)
162165

163166
### I do not see anything in TFVC
164167

165-
To set up Team Foundation Version Control (TFVC) on your dev machine, you **must** create a workspace, as described in the [Creating a new workspace](#creating-a-new-workspace) section.
168+
To set up Team Foundation Version Control (TFVC) on your dev machine, you **must** create a workspace, as described in the [Managing workspaces](#managing-workspaces) section.
166169

167170
In Source Control Explorer, press the **Manage Workspaces** Button. Follow the steps to map the team project to a folder on your dev machine.
168171

0 commit comments

Comments
 (0)