reverting HostAndPort property

Author: rkargMsft

src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs

@@ -392,7 +392,8 @@ private void RecordRequestStartMetrics(HttpContext httpContext)
         var tagsForCreation = new TagList();
         if (_activitySource.HasListeners() && httpContext.Request.Host.HasValue)
         {
-            var (host, port) = httpContext.Request.Host.HostAndPort;
+            var host = httpContext.Request.Host.Host;
+            var port = httpContext.Request.Host.Port;
             tags.Add("server.address", host);
             if (port is not null)
             {

src/Http/Http.Abstractions/src/HostString.cs

@@ -118,22 +118,6 @@ public int? Port
         }
     }
 
-    internal (string host, int? port) HostAndPort
-    {
-        get
-        {
-            GetParts(_value, out var host, out var port);
-
-            if (!StringSegment.IsNullOrEmpty(port)
-                && int.TryParse(port.AsSpan(), NumberStyles.None, CultureInfo.InvariantCulture, out var p))
-            {
-                return (host.ToString(), p);
-            }
-
-            return (host.ToString(), null);
-        }
-    }
-
     /// <summary>
     /// Returns the value as normalized by ToUriComponent().
     /// </summary>

src/Http/Routing/src/Matching/HostMatcherPolicy.cs

@@ -332,22 +332,22 @@ private static int GetScore(in EdgeKey key)
 
     private static (string host, int? port) GetHostAndPort(HttpContext httpContext)
     {
-        var (host, port) = httpContext.Request.Host.HostAndPort;
-        if (port != null)
+        var hostString = httpContext.Request.Host;
+        if (hostString.Port != null)
         {
-            return (host, port);
+            return (hostString.Host, hostString.Port);
         }
         else if (string.Equals("https", httpContext.Request.Scheme, StringComparison.OrdinalIgnoreCase))
         {
-            return (host, 443);
+            return (hostString.Host, 443);
         }
         else if (string.Equals("http", httpContext.Request.Scheme, StringComparison.OrdinalIgnoreCase))
         {
-            return (host, 80);
+            return (hostString.Host, 80);
         }
         else
         {
-            return (host, null);
+            return (hostString.Host, null);
         }
     }