Merge branch 'master' into fixes/1186-projection-buffers

Author: jcansdale

src/GitHub.Api/WindowsLoginCache.cs

@@ -39,8 +39,14 @@ public Task SaveLogin(string userName, string password, HostAddress hostAddress)
             Guard.ArgumentNotEmptyString(password, nameof(password));
             Guard.ArgumentNotNull(hostAddress, nameof(hostAddress));
 
+            var keyGit = GetKeyGit(hostAddress.CredentialCacheKeyHost);
             var keyHost = GetKeyHost(hostAddress.CredentialCacheKeyHost);
 
+            using (var credential = new Credential(userName, password, keyGit))
+            {
+                credential.Save();
+            }
+
             using (var credential = new Credential(userName, password, keyHost))
             {
                 credential.Save();
@@ -54,8 +60,16 @@ public Task EraseLogin(HostAddress hostAddress)
         {
             Guard.ArgumentNotNull(hostAddress, nameof(hostAddress));
 
+            var keyGit = GetKeyGit(hostAddress.CredentialCacheKeyHost);
             var keyHost = GetKeyHost(hostAddress.CredentialCacheKeyHost);
 
+            using (var credential = new Credential())
+            {
+                credential.Target = keyGit;
+                credential.Type = CredentialType.Generic;
+                credential.Delete();
+            }
+
             using (var credential = new Credential())
             {
                 credential.Target = keyHost;
@@ -66,6 +80,17 @@ public Task EraseLogin(HostAddress hostAddress)
             return Task.CompletedTask;
         }
 
+        static string GetKeyGit(string key)
+        {
+            key = FormatKey(key);
+            // it appears this is how MS expects the host key
+            if (!key.StartsWith("git:", StringComparison.Ordinal))
+                key = "git:" + key;
+            if (key.EndsWith("/", StringComparison.Ordinal))
+                key = key.Substring(0, key.Length - 1);
+            return key;
+        }
+
         static string GetKeyHost(string key)
         {
             key = FormatKey(key);

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -11,7 +11,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
-    <ApplicationVersion>2.3.0.20</ApplicationVersion>
+    <ApplicationVersion>2.3.0.22</ApplicationVersion>
     <OutputPath>..\..\build\$(Configuration)\</OutputPath>
     <VsixType>v3</VsixType>
     <IsProductComponent>false</IsProductComponent>

src/GitHub.VisualStudio/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.3.0.20" Language="en-US" Publisher="GitHub, Inc" />
+    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.3.0.22" Language="en-US" Publisher="GitHub, Inc" />
     <DisplayName>GitHub Extension for Visual Studio</DisplayName>
     <Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
     <PackageId>GitHub.VisualStudio</PackageId>

src/MsiInstaller/Version.wxi

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define VersionNumber="2.3.0.20" ?>
+  <?define VersionNumber="2.3.0.22" ?>
 </Include>

src/common/SolutionInfo.cs

@@ -3,8 +3,8 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyProduct("GitHub Extension for Visual Studio")]
-[assembly: AssemblyVersion("2.3.0.20")]
-[assembly: AssemblyFileVersion("2.3.0.20")]
+[assembly: AssemblyVersion("2.3.0.22")]
+[assembly: AssemblyFileVersion("2.3.0.22")]
 [assembly: ComVisible(false)]
 [assembly: AssemblyCompany("GitHub, Inc.")]
 [assembly: AssemblyCopyright("Copyright © GitHub, Inc. 2014-2016")]
@@ -16,6 +16,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.3.0.20";
+        internal const string Version = "2.3.0.22";
     }
 }