Merge branch 'fixes/1644-GitServiceHelper-avoid-MEF' of https://github.com/github/VisualStudio.git

Author: jcansdale

docs/getting-started/authenticating-to-github.md

@@ -1,15 +1,43 @@
 # Authenticating to GitHub
 
-Add your GitHub.com or GitHub Enterprise account information to GitHub Desktop so you can access your repositories.
+## How to login to GitHub or GitHub Enterprise
+
+1. In Visual Studio, select **Team Explorer** from the **View** menu.
+    <a href="images/view_team_explorer.png?raw=true" target="_blank"><div><img src="images/view_team_explorer.png" alt="Team Explorer in the view menu" width="500px"/></div></a>
+1. In the Team Explorer pane, click the **Manage Connectios** toolbar icon.
+    <a href="images/manage_connections.png?raw=true" target="_blank"><div><img src="images/manage_connections.png" alt="Manage connections toolbar icon in the Team Explorer pane" width="500px"/></div></a>
+1. Click the **Connect** link in the GitHub section.
+        <a href="images/sign-in-to-github-provider.png?raw=true" target="_blank"><div><img src="images/sign-in-to-github-provider.png" alt="Connect to GitHub" height="300px"/></div></a>   
+
+   If you're connected to a TFS instance, click on the **Sign in** link instead
+   <a href="images/sign-in-to-github.png?raw=true" target="_blank"><div><img src="images/sign-in-to-github.png" alt="Sign in to GitHub" width="300px"/></div></a>  
+
+   If none of these options are visible, click **Manage Connections** and then **Connect to GitHub**.  
+   <a href="images/connect_to_github.png?raw=true" target="_blank"><div><img src="images/connect_to_github.png" alt="Connect to GitHub in the manage connections dropdown in the Team Explorer pane" width="500px"/></div></a>
+1. In the **Connect to GitHub dialog** choose **GitHub** or **GitHub Enterprise**, depending on which product you're using.
+
+**GitHub option**:
+<a href="images/connect-to-github-dialog.png?raw=true" target="_blank"><div><img src="images/connect-to-github-dialog.png" alt="Connect to GitHub dialog view" height="400px"/></div></a>
+
+- To sign in with credentials, enter either username or email and password.
+- To sign in with SSO, select `Sign in with your browser`.
+
+**GitHub Enterprise option**:  
+<a href="images/connect-to-github-enterprise-dialog.png?raw=true" target="_blank"><div><img src="images/connect-to-github-enterprise-dialog.png" alt="Connect to GitHub Enterprise dialog view" height="400px"/></div></a>
+
+- To sign in with SSO, enter the GitHub Enterprise server address and select `Sign in with your browser`.
+- To sign in with credentials, enter the GitHub Enterprise server address.
+   - If a `Password` field appears, enter your password.
+   - If a `Token` field appears, enter a valid token. You can create personal access tokens by [following the instructions in the section below](#personal_access_tokens).
 
 Before you authenticate, you must already have a GitHub or GitHub Enterprise account.
 
 - For more information on creating a GitHub account, see "[Signing up for a new GitHub account](https://help.github.com/articles/signing-up-for-a-new-github-account/)".
 - For a GitHub Enterprise account, contact your GitHub Enterprise site administrator.
 
-**Note:** If your organization is on the [Business plan](https://help.github.com/articles/organization-billing-plans) and has not enabled SAML single sign-on or login with username and password, you must create and authorize a personal access token to access protected content. In addition, SAML single sign-on is not available for GitHub enterprise versions less than 2.12.2.
+### Personal access tokens
 
-### Scopes for personal access tokens
+If all signin options above fail, you can manually create a personal access token and use it as your password.
 
 The scopes for the personal access token are: `user`, `repo`, `gist`, and `write:public_key`. 
 - *user* scope: Grants access to the user profile data. We currently use this to display your avatar and check whether your plans lets you publish private repositories.
@@ -20,21 +48,3 @@ The scopes for the personal access token are: `user`, `repo`, `gist`, and `write
 For more information on creating personal access tokens, see "[Creating a personal access token for the command line](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line). 
 
 For more information on authenticating with SAML single sign-on, see "[About authentication with SAML single sign-on](https://help.github.com/articles/about-authentication-with-saml-single-sign-on)."
-
-1. In Visual Studio, select **Team Explorer** from the **View** menu.
-![Team Explorer in the view menu](images/view_team_explorer.png)
-2. In the Team Explorer pane, click the **Manage Connections** toolbar button.
-![Manage connections toolbar button in the Team Explorer pane](images/manage_connections.png)
-3. Click the **Connect** link in the GitHub section. If you are already connected to a GitHub instance and want to connect to another, this link will not be visible; instead click **Manage Connections** and then **Connect to GitHub**.
-![Connect to GitHub in the manage connections dropdown in the Team Explorer pane](images/connect_to_github.png)
-4. In the **Connect to GitHub dialog** choose **GitHub** or **GitHub Enterprise**, depending on which product you're using.
-
-**GitHub option**:  
-![Connect to GitHub dialog view](images/connect-to-github-dialog.png)
-- To sign in with credentials, enter either username or email and password.
-- To sign in with SSO, select `Sign in with your browser`.
-
-**GitHub Enterprise option**:  
-![Connect to GitHub Enterprise dialog view](images/connect-to-github-enterprise-dialog.png)
-- To sign in with credentials, first enter GitHub Enterprise server address. Once a valid server address is entered, a `Token` field appears and a valid token can be entered to sign in.
-  - To sign in with SSO, first enter the GitHub Enterprise server address. Once a valid server address is entered, select `Sign in with your browser`. Follow the steps to authenticate with your SSO provider.

docs/getting-started/images/sign-in-to-github-provider.png

@@ -49,6 +49,8 @@
         <Strings>
           <CommandName>GitHub.InlineReviews.NextInlineComment</CommandName>
           <ButtonText>Next Comment</ButtonText>
+          <CanonicalName>.GitHub.NextComment</CanonicalName>
+          <LocCanonicalName>.GitHub.NextComment</LocCanonicalName>
         </Strings>
       </Button>
       <Button guid="guidGitHubCommandSet" id="PreviousInlineCommentId" priority="0x0100" type="Button">
@@ -58,6 +60,8 @@
         <Strings>
           <CommandName>GitHub.InlineReviews.PreviousInlineComment</CommandName>
           <ButtonText>Previous Comment</ButtonText>
+          <CanonicalName>.GitHub.PreviousComment</CanonicalName>
+          <LocCanonicalName>.GitHub.PreviousComment</LocCanonicalName>
         </Strings>
       </Button>
     </Buttons>

docs/getting-started/images/sign-in-to-github.png

@@ -77,6 +77,8 @@
         <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
           <ButtonText>&amp;Connect to GitHub</ButtonText>
+          <CanonicalName>.GitHub.ConnectToGitHub</CanonicalName>
+          <LocCanonicalName>.GitHub.ConnectToGitHub</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -85,6 +87,8 @@
         <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
           <ButtonText>GitHub</ButtonText>
+          <CanonicalName>.GitHub.ShowGitHubPane</CanonicalName>
+          <LocCanonicalName>.GitHub.ShowGitHubPane</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -93,8 +97,8 @@
         <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
           <ButtonText>Show Current Pull Request</ButtonText>
-          <CanonicalName>GitHub.ShowCurrentPullRequest</CanonicalName>
-          <LocCanonicalName>GitHub.ShowCurrentPullRequest</LocCanonicalName>
+          <CanonicalName>.GitHub.ShowCurrentPullRequest</CanonicalName>
+          <LocCanonicalName>.GitHub.ShowCurrentPullRequest</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -105,6 +109,8 @@
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
           <ButtonText>Back</ButtonText>
+          <CanonicalName>.GitHub.Back</CanonicalName>
+          <LocCanonicalName>.GitHub.Back</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -114,6 +120,8 @@
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
           <ButtonText>Forward</ButtonText>
+          <CanonicalName>.GitHub.Forward</CanonicalName>
+          <LocCanonicalName>.GitHub.Forward</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -123,6 +131,8 @@
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
           <ButtonText>Pull Requests</ButtonText>
+          <CanonicalName>.GitHub.PullRequests</CanonicalName>
+          <LocCanonicalName>.GitHub.PullRequests</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -132,6 +142,8 @@
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
           <ButtonText>Refresh</ButtonText>
+          <CanonicalName>.GitHub.Refresh</CanonicalName>
+          <LocCanonicalName>.GitHub.Refresh</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -141,6 +153,8 @@
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
           <ButtonText>View on GitHub</ButtonText>
+          <CanonicalName>.GitHub.ViewOnGitHub</CanonicalName>
+          <LocCanonicalName>.GitHub.ViewOnGitHub</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -149,6 +163,8 @@
         <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
           <ButtonText>Help</ButtonText>
+          <CanonicalName>.GitHub.Help</CanonicalName>
+          <LocCanonicalName>.GitHub.Help</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -159,6 +175,8 @@
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <ButtonText>Create a GitHub Gist</ButtonText>
+          <CanonicalName>.GitHub.CreateGist</CanonicalName>
+          <LocCanonicalName>.GitHub.CreateGist</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -169,6 +187,8 @@
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <ButtonText>Open on GitHub</ButtonText>
+          <CanonicalName>.GitHub.OpenLink</CanonicalName>
+          <LocCanonicalName>.GitHub.OpenLink</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -179,6 +199,8 @@
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <ButtonText>Copy link to clipboard</ButtonText>
+          <CanonicalName>.GitHub.CopyLink</CanonicalName>
+          <LocCanonicalName>.GitHub.CopyLink</LocCanonicalName>
         </Strings>
       </Button>
 
@@ -189,16 +211,20 @@
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <ButtonText>Blame</ButtonText>
+          <CanonicalName>.GitHub.Blame</CanonicalName>
+          <LocCanonicalName>.GitHub.Blame</LocCanonicalName>
         </Strings>
       </Button>
-      
+
       <Button guid="guidContextMenuSet" id="openFileInSolutionCommand" type="Button">
         <Icon guid="guidImages" id="logo" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultInvisible</CommandFlag>
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <ButtonText>Open File in Solution</ButtonText>
+          <CanonicalName>.GitHub.OpenFileInSolution</CanonicalName>
+          <LocCanonicalName>.GitHub.OpenFileInSolution</LocCanonicalName>
         </Strings>
       </Button>