Merge pull request #605 from whoisj/create-1.15.2

Prepare v1.15.2
microsoft · Mar 30, 2018 · 340adf9 · 340adf9
2 parents dcc1c26 + 557369f
commit 340adf9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/Cli-Askpass/Properties/AssemblyInfo.cs b/Cli-Askpass/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyTrademark("Microsoft Corporation")]
 [assembly: AssemblyCulture("")]
 [assembly: Guid("62f52119-63d4-40a8-a9df-f1c4b473308a")]
-[assembly: AssemblyVersion("1.15.1.0")]
-[assembly: AssemblyFileVersion("1.15.1.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: InternalsVisibleTo("Microsoft.Alm.AskPass.Test")]
diff --git a/Cli-CredentialHelper.Test/OperationArgumentsTests.cs b/Cli-CredentialHelper.Test/OperationArgumentsTests.cs
@@ -90,7 +90,7 @@ public void EmailAsUserName()
             var input = new InputArg
             {
                 Host = "example.visualstudio.com",
-                Password = "ḭncorrect",
+                Password = "incorrect",
                 Path = "path",
                 Protocol = Uri.UriSchemeHttps,
                 Username = "[email protected]"
@@ -121,6 +121,34 @@ public void EmailAsUserName()
             Assert.Equal(expected, actual, StringComparer.Ordinal);
         }
 
+        [Fact]
+        public void UsernameWithDomain()
+        {
+            var input = new InputArg
+            {
+                Host = "example.visualstudio.com",
+                Password = "incorrect",
+                Path = "path",
+                Protocol = Uri.UriSchemeHttps,
+                Username = @"DOMAIN\username"
+            };
+
+            OperationArguments cut;
+            using (var memory = new MemoryStream())
+            using (var writer = new StreamWriter(memory))
+            {
+                writer.Write(input.ToString());
+                writer.Flush();
+
+                memory.Seek(0, SeekOrigin.Begin);
+
+                cut = new OperationArguments(memory);
+            }
+
+            Assert.Equal(@"https://DOMAIN\[email protected]/path", cut.TargetUri.ToString(), StringComparer.Ordinal);
+            Assert.Equal(input.ToString(), cut.ToString(), StringComparer.Ordinal);
+        }
+
         [Fact]
         public void CreateTargetUriGitHubSimple()
         {

diff --git a/Cli-CredentialHelper/Properties/AssemblyInfo.cs b/Cli-CredentialHelper/Properties/AssemblyInfo.cs
@@ -12,8 +12,8 @@
 [assembly: AssemblyTrademark("Microsoft Corporation")]
 [assembly: AssemblyCulture("")]
 [assembly: Guid("62f52119-63d4-40a8-a9df-f1c4b473308a")]
-[assembly: AssemblyVersion("1.15.1.0")]
-[assembly: AssemblyFileVersion("1.15.1.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: InternalsVisibleTo("Microsoft.Alm.CredentialHelper.Test")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
diff --git a/Cli-Shared/OperationArguments.cs b/Cli-Shared/OperationArguments.cs
@@ -543,6 +543,7 @@ private static bool NeedsToBeEscaped(string value)
                 {
                     case ':':
                     case '/':
+                    case '\\':
                     case '?':
                     case '#':
                     case '[':