Remove or make public pubternals for Http #11312 (#11429)

Author: Tratcher

src/Antiforgery/test/DefaultAntiforgeryTokenStoreTest.cs

@@ -5,8 +5,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
@@ -20,7 +20,7 @@ public class DefaultAntiforgeryTokenStoreTest
         public void GetCookieToken_CookieDoesNotExist_ReturnsNull()
         {
             // Arrange
-            var httpContext = GetHttpContext(new RequestCookieCollection());
+            var httpContext = GetHttpContext();
             var options = new AntiforgeryOptions
             {
                 Cookie = { Name = _cookieName }
@@ -79,7 +79,7 @@ public void GetCookieToken_CookieIsNotEmpty_ReturnsToken()
         public async Task GetRequestTokens_CookieIsEmpty_ReturnsNullTokens()
         {
             // Arrange
-            var httpContext = GetHttpContext(new RequestCookieCollection());
+            var httpContext = GetHttpContext();
             httpContext.Request.Form = FormCollection.Empty;
 
             var options = new AntiforgeryOptions
@@ -407,18 +407,14 @@ public void SaveCookieToken_NonNullAntiforgeryOptionsConfigureCookieOptionsDomai
 
         private HttpContext GetHttpContext(string cookieName, string cookieValue)
         {
-            var cookies = new RequestCookieCollection(new Dictionary<string, string>
-            {
-                { cookieName, cookieValue },
-            });
-
-            return GetHttpContext(cookies);
+            var context = GetHttpContext();
+            context.Request.Headers[HeaderNames.Cookie] = $"{cookieName}={cookieValue}";
+            return context;
         }
 
-        private HttpContext GetHttpContext(IRequestCookieCollection cookies)
+        private HttpContext GetHttpContext()
         {
             var httpContext = new DefaultHttpContext();
-            httpContext.Request.Cookies = cookies;
 
             return httpContext;
         }

src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Builder.Internal;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

src/Hosting/Hosting/src/Builder/ApplicationBuilderFactory.cs

@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Builder.Internal;
 using Microsoft.AspNetCore.Http.Features;
 
 namespace Microsoft.AspNetCore.Hosting.Builder

src/Hosting/Hosting/test/ConfigureBuilderTests.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Reflection;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Builder.Internal;
 using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
@@ -52,4 +51,4 @@ public CrasherService()
             }
         }
     }
-}
+}

src/Hosting/Hosting/test/StartupManagerTests.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Builder.Internal;
 using Microsoft.AspNetCore.Hosting.Fakes;
 using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.AspNetCore.Hosting.Tests.Internal;

src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs

@@ -474,58 +474,6 @@ public partial interface IRouteValuesFeature
         Microsoft.AspNetCore.Routing.RouteValueDictionary RouteValues { get; set; }
     }
 }
-namespace Microsoft.AspNetCore.Http.Internal
-{
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct HeaderSegment : System.IEquatable<Microsoft.AspNetCore.Http.Internal.HeaderSegment>
-    {
-        private readonly object _dummy;
-        public HeaderSegment(Microsoft.Extensions.Primitives.StringSegment formatting, Microsoft.Extensions.Primitives.StringSegment data) { throw null; }
-        public Microsoft.Extensions.Primitives.StringSegment Data { get { throw null; } }
-        public Microsoft.Extensions.Primitives.StringSegment Formatting { get { throw null; } }
-        public bool Equals(Microsoft.AspNetCore.Http.Internal.HeaderSegment other) { throw null; }
-        public override bool Equals(object obj) { throw null; }
-        public override int GetHashCode() { throw null; }
-        public static bool operator ==(Microsoft.AspNetCore.Http.Internal.HeaderSegment left, Microsoft.AspNetCore.Http.Internal.HeaderSegment right) { throw null; }
-        public static bool operator !=(Microsoft.AspNetCore.Http.Internal.HeaderSegment left, Microsoft.AspNetCore.Http.Internal.HeaderSegment right) { throw null; }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct HeaderSegmentCollection : System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Internal.HeaderSegment>, System.Collections.IEnumerable, System.IEquatable<Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection>
-    {
-        private readonly object _dummy;
-        public HeaderSegmentCollection(Microsoft.Extensions.Primitives.StringValues headers) { throw null; }
-        public bool Equals(Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection other) { throw null; }
-        public override bool Equals(object obj) { throw null; }
-        public Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection.Enumerator GetEnumerator() { throw null; }
-        public override int GetHashCode() { throw null; }
-        public static bool operator ==(Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection left, Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection right) { throw null; }
-        public static bool operator !=(Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection left, Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection right) { throw null; }
-        System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Http.Internal.HeaderSegment> System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Internal.HeaderSegment>.GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-        public partial struct Enumerator : System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Http.Internal.HeaderSegment>, System.Collections.IEnumerator, System.IDisposable
-        {
-            private object _dummy;
-            private int _dummyPrimitive;
-            public Enumerator(Microsoft.Extensions.Primitives.StringValues headers) { throw null; }
-            public Microsoft.AspNetCore.Http.Internal.HeaderSegment Current { get { throw null; } }
-            object System.Collections.IEnumerator.Current { get { throw null; } }
-            public void Dispose() { }
-            public bool MoveNext() { throw null; }
-            public void Reset() { }
-        }
-    }
-    public static partial class ParsingHelpers
-    {
-        public static void AppendHeaderJoined(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, params string[] values) { }
-        public static void AppendHeaderUnmodified(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, Microsoft.Extensions.Primitives.StringValues values) { }
-        public static Microsoft.Extensions.Primitives.StringValues GetHeader(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key) { throw null; }
-        public static Microsoft.Extensions.Primitives.StringValues GetHeaderSplit(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key) { throw null; }
-        public static Microsoft.Extensions.Primitives.StringValues GetHeaderUnmodified(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key) { throw null; }
-        public static void SetHeaderJoined(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, Microsoft.Extensions.Primitives.StringValues value) { }
-        public static void SetHeaderUnmodified(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, Microsoft.Extensions.Primitives.StringValues? values) { }
-    }
-}
 namespace Microsoft.AspNetCore.Routing
 {
     public partial class RouteValueDictionary : System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string, object>>, System.Collections.Generic.IDictionary<string, object>, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>>, System.Collections.Generic.IReadOnlyCollection<System.Collections.Generic.KeyValuePair<string, object>>, System.Collections.Generic.IReadOnlyDictionary<string, object>, System.Collections.IEnumerable

src/Http/Http.Abstractions/src/Extensions/HeaderDictionaryExtensions.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNetCore.Http

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

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.AspNetCore.Http.Abstractions;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNetCore.Http

src/Http/Http.Abstractions/src/Internal/HeaderSegment.cs

@@ -4,9 +4,9 @@
 using System;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Http.Internal
+namespace Microsoft.AspNetCore.Http
 {
-    public readonly struct HeaderSegment : IEquatable<HeaderSegment>
+    internal readonly struct HeaderSegment : IEquatable<HeaderSegment>
     {
         private readonly StringSegment _formatting;
         private readonly StringSegment _data;

src/Http/Http.Abstractions/src/Internal/HeaderSegmentCollection.cs

@@ -6,9 +6,9 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Http.Internal
+namespace Microsoft.AspNetCore.Http
 {
-    public readonly struct HeaderSegmentCollection : IEnumerable<HeaderSegment>, IEquatable<HeaderSegmentCollection>
+    internal readonly struct HeaderSegmentCollection : IEnumerable<HeaderSegment>, IEquatable<HeaderSegmentCollection>
     {
         private readonly StringValues _headers;