Merge pull request #767 from jeschu1/pathpriority

Give path priority when supplied
microsoft · Sep 27, 2018 · 2c42ca6 · 2c42ca6
2 parents b76af7e + 5f712b5
commit 2c42ca6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Shared/Cli/OperationArguments.cs b/Shared/Cli/OperationArguments.cs
@@ -743,8 +743,13 @@ internal virtual void CreateTargetUri()
 
             queryUrl = buffer.ToString();
 
+            // if path is specified we should give the host/path priority
+            if (!string.IsNullOrWhiteSpace(_queryPath))
+            {
+                actualUrl = queryUrl;
+            }
             // If the actual-url override has been set, honor it.
-            if (!string.IsNullOrEmpty(_urlOverride))
+            else if (!string.IsNullOrEmpty(_urlOverride))
             {
                 if (Uri.TryCreate(_urlOverride, UriKind.Absolute, out Uri uri))
                 {