Rename HttpVersion and HttpVersionPolicy

Katya Sokolova · Katya Sokolova · commit 71cc88750b91 · 2022-06-20T16:05:53.000+02:00
diff --git a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs
@@ -43,10 +43,10 @@ internal ClientWebSocketOptions() { }
         public System.Net.Security.RemoteCertificateValidationCallback? RemoteCertificateValidationCallback { get { throw null; } set { } }
         [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public bool UseDefaultCredentials { get { throw null; } set { } }
-        public System.Version Version { get { throw null; }
+        public System.Version HttpVersion { get { throw null; }
             [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
             set { } }
-        public System.Net.Http.HttpVersionPolicy VersionPolicy { get { throw null; }
+        public System.Net.Http.HttpVersionPolicy HttpVersionPolicy { get { throw null; }
             [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
             set { } }
         public void AddSubProtocol(string subProtocol) { }
diff --git a/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/ClientWebSocketOptions.cs b/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/ClientWebSocketOptions.cs
@@ -13,7 +13,7 @@ public sealed class ClientWebSocketOptions
     {
         private bool _isReadOnly; // After ConnectAsync is called the options cannot be modified.
         private List<string>? _requestedSubProtocols;
-        private Version _version = HttpVersion.Version11;
+        private Version _version = Net.HttpVersion.Version11;
         private HttpVersionPolicy _versionPolicy = HttpVersionPolicy.RequestVersionOrLower;
 
         internal ClientWebSocketOptions()
@@ -35,14 +35,14 @@ public bool UseDefaultCredentials
             set => throw new PlatformNotSupportedException();
         }
 
-        public Version Version
+        public Version HttpVersion
         {
             get => _version;
             [UnsupportedOSPlatform("browser")]
             set => throw new PlatformNotSupportedException();
         }
 
-        public System.Net.Http.HttpVersionPolicy VersionPolicy
+        public System.Net.Http.HttpVersionPolicy HttpVersionPolicy
         {
             get => _versionPolicy;
             [UnsupportedOSPlatform("browser")]
diff --git a/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs b/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs
@@ -26,10 +26,10 @@ public sealed class ClientWebSocketOptions
         internal X509CertificateCollection? _clientCertificates;
         internal WebHeaderCollection? _requestHeaders;
         internal List<string>? _requestedSubProtocols;
-        private Version _version = HttpVersion.Version11;
+        private Version _version = Net.HttpVersion.Version11;
         private HttpVersionPolicy _versionPolicy = HttpVersionPolicy.RequestVersionOrLower;
 
-        public Version Version
+        public Version HttpVersion
         {
             get => _version;
             [UnsupportedOSPlatform("browser")]
@@ -40,7 +40,7 @@ public Version Version
             }
         }
 
-        public HttpVersionPolicy VersionPolicy
+        public HttpVersionPolicy HttpVersionPolicy
         {
             get => _versionPolicy;
             [UnsupportedOSPlatform("browser")]
diff --git a/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs b/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs
@@ -51,13 +51,13 @@ public async Task ConnectAsync(Uri uri, HttpMessageInvoker? handler, Cancellatio
             bool disposeHandler = true;
             try
             {
-                if (options.Version.Major >= 3 && options.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
+                if (options.HttpVersion.Major >= 3 && options.HttpVersionPolicy != HttpVersionPolicy.RequestVersionOrLower)
                 {
                     throw new Exception();
                 }
 
                 var request = new HttpRequestMessage(HttpMethod.Get, uri);
-                if (options.Version.Major >= 2 || (options.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))
+                if (options.HttpVersion.Major >= 2 || (options.HttpVersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))
                 {
                     request.Version = new Version(2, 0);
                 }
@@ -108,8 +108,8 @@ public async Task ConnectAsync(Uri uri, HttpMessageInvoker? handler, Cancellatio
                     catch (HttpRequestException ex)
                     {
                         if (ex.Data.Contains("SETTINGS_ENABLE_CONNECT_PROTOCOL") && request.Version.Major == 2
-                            && (options.Version.Major == 2 && options.VersionPolicy == HttpVersionPolicy.RequestVersionOrLower
-                            || options.Version.Major == 1 && options.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))
+                            && (options.HttpVersion.Major == 2 && options.HttpVersionPolicy == HttpVersionPolicy.RequestVersionOrLower
+                            || options.HttpVersion.Major == 1 && options.HttpVersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))
                         {
                             request.Version = new Version(1, 1);
                         }
@@ -343,17 +343,17 @@ static int ParseWindowBits(ReadOnlySpan<char> value)
         /// <param name="options">The options controlling the request.</param>
         private static void AddWebSocketHeaders(HttpRequestMessage request, string secKey, ClientWebSocketOptions options)
         {
-            request.Version = options.Version;
+            request.Version = options.HttpVersion;
             // always exact because we handle downgrade here
             request.VersionPolicy = HttpVersionPolicy.RequestVersionExact;
 
-            if (options.Version == HttpVersion.Version11)
+            if (options.HttpVersion == HttpVersion.Version11)
             {
                 request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.Connection, HttpKnownHeaderNames.Upgrade);
                 request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.Upgrade, "websocket");
                 request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.SecWebSocketKey, secKey);
             }
-            else if (options.Version == HttpVersion.Version20)
+            else if (options.HttpVersion == HttpVersion.Version20)
             {
                 request.Method = HttpMethod.Connect;
                 request.Headers.Protocol = "websocket";
@@ -408,7 +408,7 @@ static string GetDeflateOptions(WebSocketDeflateOptions options)
 
         private static void ValidateResponse(HttpResponseMessage response, string secValue, ClientWebSocketOptions options)
         {
-            if (options.Version == HttpVersion.Version11)
+            if (options.HttpVersion == HttpVersion.Version11)
             {
                 if (response.StatusCode != HttpStatusCode.SwitchingProtocols)
                 {
@@ -420,7 +420,7 @@ private static void ValidateResponse(HttpResponseMessage response, string secVal
                 ValidateHeader(response.Headers, HttpKnownHeaderNames.Upgrade, "websocket");
                 ValidateHeader(response.Headers, HttpKnownHeaderNames.SecWebSocketAccept, secValue);
             }
-            else if (options.Version == HttpVersion.Version20)
+            else if (options.HttpVersion == HttpVersion.Version20)
             {
                 if (response.StatusCode != HttpStatusCode.OK)
                 {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public sealed class ClientWebSocketOptions`
`13`	`13`	`{`
`14`	`14`	`private bool _isReadOnly; // After ConnectAsync is called the options cannot be modified.`
`15`	`15`	`private List<string>? _requestedSubProtocols;`
`16`		`- private Version _version = HttpVersion.Version11;`
	`16`	`+ private Version _version = Net.HttpVersion.Version11;`
`17`	`17`	`private HttpVersionPolicy _versionPolicy = HttpVersionPolicy.RequestVersionOrLower;`
`18`	`18`
`19`	`19`	`internal ClientWebSocketOptions()`
`@@ -35,14 +35,14 @@ public bool UseDefaultCredentials`
`35`	`35`	`set => throw new PlatformNotSupportedException();`
`36`	`36`	`}`
`37`	`37`
`38`		`- public Version Version`
	`38`	`+ public Version HttpVersion`
`39`	`39`	`{`
`40`	`40`	`get => _version;`
`41`	`41`	`[UnsupportedOSPlatform("browser")]`
`42`	`42`	`set => throw new PlatformNotSupportedException();`
`43`	`43`	`}`
`44`	`44`
`45`		`- public System.Net.Http.HttpVersionPolicy VersionPolicy`
	`45`	`+ public System.Net.Http.HttpVersionPolicy HttpVersionPolicy`
`46`	`46`	`{`
`47`	`47`	`get => _versionPolicy;`
`48`	`48`	`[UnsupportedOSPlatform("browser")]`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ public sealed class ClientWebSocketOptions`
`26`	`26`	`internal X509CertificateCollection? _clientCertificates;`
`27`	`27`	`internal WebHeaderCollection? _requestHeaders;`
`28`	`28`	`internal List<string>? _requestedSubProtocols;`
`29`		`- private Version _version = HttpVersion.Version11;`
	`29`	`+ private Version _version = Net.HttpVersion.Version11;`
`30`	`30`	`private HttpVersionPolicy _versionPolicy = HttpVersionPolicy.RequestVersionOrLower;`
`31`	`31`
`32`		`- public Version Version`
	`32`	`+ public Version HttpVersion`
`33`	`33`	`{`
`34`	`34`	`get => _version;`
`35`	`35`	`[UnsupportedOSPlatform("browser")]`
`@@ -40,7 +40,7 @@ public Version Version`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- public HttpVersionPolicy VersionPolicy`
	`43`	`+ public HttpVersionPolicy HttpVersionPolicy`
`44`	`44`	`{`
`45`	`45`	`get => _versionPolicy;`
`46`	`46`	`[UnsupportedOSPlatform("browser")]`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,13 @@ public async Task ConnectAsync(Uri uri, HttpMessageInvoker? handler, Cancellatio`
`51`	`51`	`bool disposeHandler = true;`
`52`	`52`	`try`
`53`	`53`	`{`
`54`		`- if (options.Version.Major >= 3 && options.VersionPolicy != HttpVersionPolicy.RequestVersionOrLower)`
	`54`	`+ if (options.HttpVersion.Major >= 3 && options.HttpVersionPolicy != HttpVersionPolicy.RequestVersionOrLower)`
`55`	`55`	`{`
`56`	`56`	`throw new Exception();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`var request = new HttpRequestMessage(HttpMethod.Get, uri);`
`60`		`- if (options.Version.Major >= 2 \|\| (options.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))`
	`60`	`+ if (options.HttpVersion.Major >= 2 \|\| (options.HttpVersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))`
`61`	`61`	`{`
`62`	`62`	`request.Version = new Version(2, 0);`
`63`	`63`	`}`
`@@ -108,8 +108,8 @@ public async Task ConnectAsync(Uri uri, HttpMessageInvoker? handler, Cancellatio`
`108`	`108`	`catch (HttpRequestException ex)`
`109`	`109`	`{`
`110`	`110`	`if (ex.Data.Contains("SETTINGS_ENABLE_CONNECT_PROTOCOL") && request.Version.Major == 2`
`111`		`- && (options.Version.Major == 2 && options.VersionPolicy == HttpVersionPolicy.RequestVersionOrLower`
`112`		`- \|\| options.Version.Major == 1 && options.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))`
	`111`	`+ && (options.HttpVersion.Major == 2 && options.HttpVersionPolicy == HttpVersionPolicy.RequestVersionOrLower`
	`112`	`+ \|\| options.HttpVersion.Major == 1 && options.HttpVersionPolicy == HttpVersionPolicy.RequestVersionOrHigher))`
`113`	`113`	`{`
`114`	`114`	`request.Version = new Version(1, 1);`
`115`	`115`	`}`
`@@ -343,17 +343,17 @@ static int ParseWindowBits(ReadOnlySpan<char> value)`
`343`	`343`	`/// <param name="options">The options controlling the request.</param>`
`344`	`344`	`private static void AddWebSocketHeaders(HttpRequestMessage request, string secKey, ClientWebSocketOptions options)`
`345`	`345`	`{`
`346`		`- request.Version = options.Version;`
	`346`	`+ request.Version = options.HttpVersion;`
`347`	`347`	`// always exact because we handle downgrade here`
`348`	`348`	`request.VersionPolicy = HttpVersionPolicy.RequestVersionExact;`
`349`	`349`
`350`		`- if (options.Version == HttpVersion.Version11)`
	`350`	`+ if (options.HttpVersion == HttpVersion.Version11)`
`351`	`351`	`{`
`352`	`352`	`request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.Connection, HttpKnownHeaderNames.Upgrade);`
`353`	`353`	`request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.Upgrade, "websocket");`
`354`	`354`	`request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.SecWebSocketKey, secKey);`
`355`	`355`	`}`
`356`		`- else if (options.Version == HttpVersion.Version20)`
	`356`	`+ else if (options.HttpVersion == HttpVersion.Version20)`
`357`	`357`	`{`
`358`	`358`	`request.Method = HttpMethod.Connect;`
`359`	`359`	`request.Headers.Protocol = "websocket";`
`@@ -408,7 +408,7 @@ static string GetDeflateOptions(WebSocketDeflateOptions options)`
`408`	`408`
`409`	`409`	`private static void ValidateResponse(HttpResponseMessage response, string secValue, ClientWebSocketOptions options)`
`410`	`410`	`{`
`411`		`- if (options.Version == HttpVersion.Version11)`
	`411`	`+ if (options.HttpVersion == HttpVersion.Version11)`
`412`	`412`	`{`
`413`	`413`	`if (response.StatusCode != HttpStatusCode.SwitchingProtocols)`
`414`	`414`	`{`
`@@ -420,7 +420,7 @@ private static void ValidateResponse(HttpResponseMessage response, string secVal`
`420`	`420`	`ValidateHeader(response.Headers, HttpKnownHeaderNames.Upgrade, "websocket");`
`421`	`421`	`ValidateHeader(response.Headers, HttpKnownHeaderNames.SecWebSocketAccept, secValue);`
`422`	`422`	`}`
`423`		`- else if (options.Version == HttpVersion.Version20)`
	`423`	`+ else if (options.HttpVersion == HttpVersion.Version20)`
`424`	`424`	`{`
`425`	`425`	`if (response.StatusCode != HttpStatusCode.OK)`
`426`	`426`	`{`