Support .net 6 for tcp keep alive (#777)

zhiweiv · web-flow · commit d74f357c9f09 · 2022-02-08T00:13:24.000-08:00
diff --git a/src/KubernetesClient/Kubernetes.ConfigInit.cs b/src/KubernetesClient/Kubernetes.ConfigInit.cs
@@ -176,7 +176,7 @@ private void CreateHttpClient(DelegatingHandler[] handlers, KubernetesClientConf
             FirstMessageHandler = HttpClientHandler = CreateRootHandler();
 
 
-#if NET5_0
+#if NET5_0_OR_GREATER
             // https://github.com/kubernetes-client/csharp/issues/587
             // let user control if tcp keep alive until better fix
             if (config.TcpKeepAlive)
diff --git a/src/KubernetesClient/Kubernetes.WebSocket.cs b/src/KubernetesClient/Kubernetes.WebSocket.cs
@@ -300,7 +300,7 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string webSocketSubP
                 }
                 else
                 {
-#if NET5_0
+#if NET5_0_OR_GREATER
                     var content = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
 #else
                     var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string webSocketSubP`
`300`	`300`	`}`
`301`	`301`	`else`
`302`	`302`	`{`
`303`		`-#if NET5_0`
	`303`	`+#if NET5_0_OR_GREATER`
`304`	`304`	`var content = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);`
`305`	`305`	`#else`
`306`	`306`	`var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);`