React to HttpAbstractions change: No features in .Internal namespace

dougbu · dougbu · commit f13c418a65db · 2016-03-18T19:01:53.000-07:00
- see issue aspnet/HttpAbstractions#561 and pull aspnet/HttpAbstractions#589
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs
@@ -2,22 +2,22 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Http 
+namespace Microsoft.AspNetCore.Server.Kestrel.Http
 {
     public partial class Frame
     {
         private static readonly Type IHttpRequestFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature);
         private static readonly Type IHttpResponseFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature);
         private static readonly Type IHttpRequestIdentifierFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature);
-        private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);
+        private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);
         private static readonly Type IHttpRequestLifetimeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature);
         private static readonly Type IHttpConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature);
         private static readonly Type IHttpAuthenticationFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature);
-        private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);
-        private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);
+        private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature);
+        private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature);
         private static readonly Type IHttpUpgradeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature);
-        private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);
-        private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);
+        private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);
+        private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature);
         private static readonly Type ITlsConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature);
         private static readonly Type IHttpWebSocketFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature);
         private static readonly Type ISessionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ISessionFeature);
@@ -75,7 +75,7 @@ private object FastFeatureGet(Type key)
             {
                 return _currentIHttpRequestIdentifierFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))
             {
                 return _currentIServiceProvidersFeature;
             }
@@ -91,23 +91,23 @@ private object FastFeatureGet(Type key)
             {
                 return _currentIHttpAuthenticationFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))
             {
                 return _currentIQueryFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))
             {
                 return _currentIFormFeature;
             }
             if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature))
             {
                 return _currentIHttpUpgradeFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))
             {
                 return _currentIResponseCookiesFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))
             {
                 return _currentIItemsFeature;
             }
@@ -149,7 +149,7 @@ private void FastFeatureSet(Type key, object feature)
                 _currentIHttpRequestIdentifierFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))
             {
                 _currentIServiceProvidersFeature = feature;
                 return;
@@ -169,12 +169,12 @@ private void FastFeatureSet(Type key, object feature)
                 _currentIHttpAuthenticationFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))
             {
                 _currentIQueryFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))
             {
                 _currentIFormFeature = feature;
                 return;
@@ -184,12 +184,12 @@ private void FastFeatureSet(Type key, object feature)
                 _currentIHttpUpgradeFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))
             {
                 _currentIResponseCookiesFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))
             {
                 _currentIItemsFeature = feature;
                 return;
@@ -233,7 +233,7 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
             }
             if (_currentIServiceProvidersFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);
+                yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);
             }
             if (_currentIHttpRequestLifetimeFeature != null)
             {
@@ -249,23 +249,23 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
             }
             if (_currentIQueryFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);
+                yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.IQueryFeature);
             }
             if (_currentIFormFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);
+                yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.IFormFeature);
             }
             if (_currentIHttpUpgradeFeature != null)
             {
                 yield return new KeyValuePair<Type, object>(IHttpUpgradeFeatureType, _currentIHttpUpgradeFeature as global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature);
             }
             if (_currentIResponseCookiesFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);
+                yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);
             }
             if (_currentIItemsFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);
+                yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.IItemsFeature);
             }
             if (_currentITlsConnectionFeature != null)
             {
diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Http.Features.Internal;
 using Microsoft.AspNetCore.Http.Features.Authentication;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode
@@ -67,7 +66,7 @@ public static string GeneratedFile()
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Http 
+namespace Microsoft.AspNetCore.Server.Kestrel.Http
 {{
     public partial class Frame
     {{{Each(allFeatures, feature => $@"

Original file line number	Diff line number	Diff line change
`@@ -2,22 +2,22 @@`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`
`5`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Http`
	`5`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Http`
`6`	`6`	`{`
`7`	`7`	`public partial class Frame`
`8`	`8`	`{`
`9`	`9`	`private static readonly Type IHttpRequestFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature);`
`10`	`10`	`private static readonly Type IHttpResponseFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature);`
`11`	`11`	`private static readonly Type IHttpRequestIdentifierFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature);`
`12`		`- private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);`
	`12`	`+ private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);`
`13`	`13`	`private static readonly Type IHttpRequestLifetimeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature);`
`14`	`14`	`private static readonly Type IHttpConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature);`
`15`	`15`	`private static readonly Type IHttpAuthenticationFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature);`
`16`		`- private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);`
`17`		`- private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);`
	`16`	`+ private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature);`
	`17`	`+ private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature);`
`18`	`18`	`private static readonly Type IHttpUpgradeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature);`
`19`		`- private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);`
`20`		`- private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);`
	`19`	`+ private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);`
	`20`	`+ private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature);`
`21`	`21`	`private static readonly Type ITlsConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature);`
`22`	`22`	`private static readonly Type IHttpWebSocketFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature);`
`23`	`23`	`private static readonly Type ISessionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ISessionFeature);`
`@@ -75,7 +75,7 @@ private object FastFeatureGet(Type key)`
`75`	`75`	`{`
`76`	`76`	`return _currentIHttpRequestIdentifierFeature;`
`77`	`77`	`}`
`78`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))`
	`78`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))`
`79`	`79`	`{`
`80`	`80`	`return _currentIServiceProvidersFeature;`
`81`	`81`	`}`
`@@ -91,23 +91,23 @@ private object FastFeatureGet(Type key)`
`91`	`91`	`{`
`92`	`92`	`return _currentIHttpAuthenticationFeature;`
`93`	`93`	`}`
`94`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))`
	`94`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))`
`95`	`95`	`{`
`96`	`96`	`return _currentIQueryFeature;`
`97`	`97`	`}`
`98`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))`
	`98`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))`
`99`	`99`	`{`
`100`	`100`	`return _currentIFormFeature;`
`101`	`101`	`}`
`102`	`102`	`if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature))`
`103`	`103`	`{`
`104`	`104`	`return _currentIHttpUpgradeFeature;`
`105`	`105`	`}`
`106`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))`
	`106`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))`
`107`	`107`	`{`
`108`	`108`	`return _currentIResponseCookiesFeature;`
`109`	`109`	`}`
`110`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))`
	`110`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))`
`111`	`111`	`{`
`112`	`112`	`return _currentIItemsFeature;`
`113`	`113`	`}`
`@@ -149,7 +149,7 @@ private void FastFeatureSet(Type key, object feature)`
`149`	`149`	`_currentIHttpRequestIdentifierFeature = feature;`
`150`	`150`	`return;`
`151`	`151`	`}`
`152`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))`
	`152`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))`
`153`	`153`	`{`
`154`	`154`	`_currentIServiceProvidersFeature = feature;`
`155`	`155`	`return;`
`@@ -169,12 +169,12 @@ private void FastFeatureSet(Type key, object feature)`
`169`	`169`	`_currentIHttpAuthenticationFeature = feature;`
`170`	`170`	`return;`
`171`	`171`	`}`
`172`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))`
	`172`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))`
`173`	`173`	`{`
`174`	`174`	`_currentIQueryFeature = feature;`
`175`	`175`	`return;`
`176`	`176`	`}`
`177`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))`
	`177`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))`
`178`	`178`	`{`
`179`	`179`	`_currentIFormFeature = feature;`
`180`	`180`	`return;`
`@@ -184,12 +184,12 @@ private void FastFeatureSet(Type key, object feature)`
`184`	`184`	`_currentIHttpUpgradeFeature = feature;`
`185`	`185`	`return;`
`186`	`186`	`}`
`187`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))`
	`187`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))`
`188`	`188`	`{`
`189`	`189`	`_currentIResponseCookiesFeature = feature;`
`190`	`190`	`return;`
`191`	`191`	`}`
`192`		`- if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))`
	`192`	`+ if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))`
`193`	`193`	`{`
`194`	`194`	`_currentIItemsFeature = feature;`
`195`	`195`	`return;`
`@@ -233,7 +233,7 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()`
`233`	`233`	`}`
`234`	`234`	`if (_currentIServiceProvidersFeature != null)`
`235`	`235`	`{`
`236`		`- yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);`
	`236`	`+ yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);`
`237`	`237`	`}`
`238`	`238`	`if (_currentIHttpRequestLifetimeFeature != null)`
`239`	`239`	`{`
`@@ -249,23 +249,23 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()`
`249`	`249`	`}`
`250`	`250`	`if (_currentIQueryFeature != null)`
`251`	`251`	`{`
`252`		`- yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);`
	`252`	`+ yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.IQueryFeature);`
`253`	`253`	`}`
`254`	`254`	`if (_currentIFormFeature != null)`
`255`	`255`	`{`
`256`		`- yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);`
	`256`	`+ yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.IFormFeature);`
`257`	`257`	`}`
`258`	`258`	`if (_currentIHttpUpgradeFeature != null)`
`259`	`259`	`{`
`260`	`260`	`yield return new KeyValuePair<Type, object>(IHttpUpgradeFeatureType, _currentIHttpUpgradeFeature as global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature);`
`261`	`261`	`}`
`262`	`262`	`if (_currentIResponseCookiesFeature != null)`
`263`	`263`	`{`
`264`		`- yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);`
	`264`	`+ yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);`
`265`	`265`	`}`
`266`	`266`	`if (_currentIItemsFeature != null)`
`267`	`267`	`{`
`268`		`- yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);`
	`268`	`+ yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.IItemsFeature);`
`269`	`269`	`}`
`270`	`270`	`if (_currentITlsConnectionFeature != null)`
`271`	`271`	`{`