migrate test proj to net5 base

Author: tg123

src/KubernetesClient/KubernetesClient.csproj

@@ -9,7 +9,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png</PackageIconUrl>
     <PackageTags>kubernetes;docker;containers;</PackageTags>
 
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>k8s</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj

@@ -1,19 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <LangVersion>8</LangVersion>
     <SignAssembly>true</SignAssembly>
     <RootNamespace>k8s.Tests</RootNamespace>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
       <PackageReference Include="FluentAssertions" Version="5.10.3" />
-      <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9">
-          <!-- this is due to aspnet core 2.1 is not compatible with our code -->
-          <AllowExplicitVersion>true</AllowExplicitVersion>
-      </PackageReference>
-
       <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
       <PackageReference Include="System.Reactive" Version="4.3.2" />
       <PackageReference Include="Nito.AsyncEx" Version="5.1.0" />

tests/KubernetesClient.Tests/KubernetesExecTests.cs

@@ -48,17 +48,18 @@ public async Task WebSocketNamespacedPodExecAsync()
                 tty: true,
                 customHeaders: new Dictionary<string, List<string>>()
                 {
-                    {"X-My-Header", new List<string>() {"myHeaderValue", "myHeaderValue2" } },
+                    { "X-My-Header", new List<string>() { "myHeaderValue", "myHeaderValue2" } },
                 },
                 cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
             var expectedHeaders = new Dictionary<string, string>()
             {
-                {"X-My-Header", "myHeaderValue myHeaderValue2" },
-                {"Authorization", "Basic bXktdXNlcjpteS1zZWNyZXQtcGFzc3dvcmQ=" },
+                { "X-My-Header", "myHeaderValue myHeaderValue2" },
+                { "Authorization", "Basic bXktdXNlcjpteS1zZWNyZXQtcGFzc3dvcmQ=" },
             };
 
-            Assert.Equal(mockWebSocketBuilder.PublicWebSocket,
+            Assert.Equal(
+                mockWebSocketBuilder.PublicWebSocket,
                 webSocket); // Did the method return the correct web socket?
             Assert.Equal(
                 new Uri(
@@ -89,17 +90,18 @@ public async Task WebSocketNamespacedPodPortForwardAsync()
                 ports: new int[] { 80, 8080 },
                 customHeaders: new Dictionary<string, List<string>>()
                 {
-                    {"X-My-Header", new List<string>() {"myHeaderValue", "myHeaderValue2" } },
+                    { "X-My-Header", new List<string>() { "myHeaderValue", "myHeaderValue2" } },
                 },
                 cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
             var expectedHeaders = new Dictionary<string, string>()
             {
-                {"X-My-Header", "myHeaderValue myHeaderValue2" },
-                {"Authorization", "Basic bXktdXNlcjpteS1zZWNyZXQtcGFzc3dvcmQ=" },
+                { "X-My-Header", "myHeaderValue myHeaderValue2" },
+                { "Authorization", "Basic bXktdXNlcjpteS1zZWNyZXQtcGFzc3dvcmQ=" },
             };
 
-            Assert.Equal(mockWebSocketBuilder.PublicWebSocket,
+            Assert.Equal(
+                mockWebSocketBuilder.PublicWebSocket,
                 webSocket); // Did the method return the correct web socket?
             Assert.Equal(
                 new Uri("ws://localhost/api/v1/namespaces/mynamespace/pods/mypod/portforward?ports=80&ports=8080"),
@@ -133,17 +135,18 @@ public async Task WebSocketNamespacedPodAttachAsync()
                 tty: true,
                 customHeaders: new Dictionary<string, List<string>>()
                 {
-                    {"X-My-Header", new List<string>() {"myHeaderValue", "myHeaderValue2" } },
+                    { "X-My-Header", new List<string>() { "myHeaderValue", "myHeaderValue2" } },
                 },
                 cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
             var expectedHeaders = new Dictionary<string, string>()
             {
-                {"X-My-Header", "myHeaderValue myHeaderValue2" },
-                {"Authorization", "Basic bXktdXNlcjpteS1zZWNyZXQtcGFzc3dvcmQ=" },
+                { "X-My-Header", "myHeaderValue myHeaderValue2" },
+                { "Authorization", "Basic bXktdXNlcjpteS1zZWNyZXQtcGFzc3dvcmQ=" },
             };
 
-            Assert.Equal(mockWebSocketBuilder.PublicWebSocket,
+            Assert.Equal(
+                mockWebSocketBuilder.PublicWebSocket,
                 webSocket); // Did the method return the correct web socket?
             Assert.Equal(
                 new Uri(

tests/KubernetesClient.Tests/Mock/Server/Startup.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
+using Microsoft.AspNetCore.Mvc;
 
 namespace k8s.Tests.Mock.Server
 {
@@ -35,7 +36,7 @@ public static void ConfigureServices(IServiceCollection services)
             {
                 logging.ClearProviders(); // Logger provider will be added by the calling test.
             });
-            services.AddMvc();
+            services.AddMvc(opt => opt.EnableEndpointRouting = false);
         }
 
         /// <summary>
@@ -49,7 +50,6 @@ public static void Configure(IApplicationBuilder app)
             app.UseWebSockets(new WebSocketOptions
             {
                 KeepAliveInterval = TimeSpan.FromSeconds(5),
-                ReceiveBufferSize = 2048,
             });
             app.UseMvc();
         }