diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
index 59d7c1067..b0d5e2615 100644
--- a/.github/workflows/buildtest.yaml
+++ b/.github/workflows/buildtest.yaml
@@ -52,9 +52,9 @@ jobs:
with:
dotnet-version: '7.0.x'
- name: Restore nugets (msbuild)
- run: msbuild .\src\KubernetesClient.Models\ -t:restore -p:RestorePackagesConfig=true
+ run: msbuild .\src\KubernetesClient\ -t:restore -p:RestorePackagesConfig=true
- name: Build (msbuild)
- run: msbuild .\src\KubernetesClient.Models\
+ run: msbuild .\src\KubernetesClient\
e2e:
runs-on: ubuntu-latest
diff --git a/.github/workflows/nuget.yaml b/.github/workflows/nuget.yaml
index d8c5dc1d4..3646b9ba4 100644
--- a/.github/workflows/nuget.yaml
+++ b/.github/workflows/nuget.yaml
@@ -44,8 +44,6 @@ jobs:
matrix:
nuget-package:
- "KubernetesClient"
- - "KubernetesClient.Models"
- - "KubernetesClient.Basic"
- "KubernetesClient.Classic"
runs-on: ubuntu-latest
permissions:
diff --git a/kubernetes-client.sln b/kubernetes-client.sln
index c11aeeb3e..4dfcda28c 100644
--- a/kubernetes-client.sln
+++ b/kubernetes-client.sln
@@ -47,10 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus", "examples\prom
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "yaml", "examples\yaml\yaml.csproj", "{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Models", "src\KubernetesClient.Models\KubernetesClient.Models.csproj", "{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Basic", "src\KubernetesClient.Basic\KubernetesClient.Basic.csproj", "{927995F5-05CC-4078-8805-8E6CC06914D8}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Classic", "src\KubernetesClient.Classic\KubernetesClient.Classic.csproj", "{80F19E8A-F097-4AA4-A68C-D417B96BBC68}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Classic.Tests", "tests\KubernetesClient.Classic.Tests\KubernetesClient.Classic.Tests.csproj", "{FD90C861-56C6-4536-B7F5-AC7779296384}"
@@ -311,30 +307,6 @@ Global
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x64.Build.0 = Release|Any CPU
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.ActiveCfg = Release|Any CPU
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.Build.0 = Release|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x64.Build.0 = Debug|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x86.Build.0 = Debug|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|Any CPU.Build.0 = Release|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x64.ActiveCfg = Release|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x64.Build.0 = Release|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x86.ActiveCfg = Release|Any CPU
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x86.Build.0 = Release|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x64.ActiveCfg = Debug|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x64.Build.0 = Debug|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x86.ActiveCfg = Debug|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x86.Build.0 = Debug|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Release|Any CPU.Build.0 = Release|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x64.ActiveCfg = Release|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x64.Build.0 = Release|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x86.ActiveCfg = Release|Any CPU
- {927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x86.Build.0 = Release|Any CPU
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -491,8 +463,6 @@ Global
{DFBB1025-BD22-459D-A04D-E2AB31E129E2} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
{682B94E4-1761-48FF-B5D0-87B45DC0C735} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
- {F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
- {927995F5-05CC-4078-8805-8E6CC06914D8} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
{80F19E8A-F097-4AA4-A68C-D417B96BBC68} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
{FD90C861-56C6-4536-B7F5-AC7779296384} = {8AF4A5C2-F0CE-47D5-A4C5-FE4AB83CA509}
{F626860C-F141-45B3-9DDD-88AD3932ACAF} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
diff --git a/src/KubernetesClient.Basic/AbstractKubernetes.cs b/src/KubernetesClient.Basic/AbstractKubernetes.cs
index e65d6100e..1d6ed2ae7 100644
--- a/src/KubernetesClient.Basic/AbstractKubernetes.cs
+++ b/src/KubernetesClient.Basic/AbstractKubernetes.cs
@@ -15,7 +15,7 @@ private static class HttpMethods
public static readonly HttpMethod Put = HttpMethod.Put;
public static readonly HttpMethod Trace = HttpMethod.Trace;
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET48
public static readonly HttpMethod Patch = new HttpMethod("PATCH");
#else
public static readonly HttpMethod Patch = HttpMethod.Patch;
diff --git a/src/KubernetesClient.Basic/KubernetesClient.Basic.csproj b/src/KubernetesClient.Basic/KubernetesClient.Basic.csproj
deleted file mode 100644
index e0f9230d8..000000000
--- a/src/KubernetesClient.Basic/KubernetesClient.Basic.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- netstandard2.0;net6.0;net7.0
- k8s
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/KubernetesClient.Classic/CertUtils.cs b/src/KubernetesClient.Classic/CertUtils.cs
index 60805cd93..112ef922e 100644
--- a/src/KubernetesClient.Classic/CertUtils.cs
+++ b/src/KubernetesClient.Classic/CertUtils.cs
@@ -6,7 +6,6 @@
using Org.BouncyCastle.Pkcs;
using Org.BouncyCastle.Security;
using Org.BouncyCastle.X509;
-using System.IO;
using System.Security.Cryptography.X509Certificates;
namespace k8s
diff --git a/src/KubernetesClient.Classic/Global.cs b/src/KubernetesClient.Classic/Global.cs
index 70b3700e1..2b5a4ae8e 100644
--- a/src/KubernetesClient.Classic/Global.cs
+++ b/src/KubernetesClient.Classic/Global.cs
@@ -1,5 +1,10 @@
+global using k8s.Autorest;
+global using k8s.Models;
global using System;
global using System.Collections.Generic;
+global using System.IO;
global using System.Linq;
global using System.Text.Json;
global using System.Text.Json.Serialization;
+global using System.Threading;
+global using System.Threading.Tasks;
diff --git a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
index 2ac9a1475..052d3b540 100644
--- a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
+++ b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
@@ -10,11 +10,70 @@
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -59,8 +118,16 @@
-
+
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
index 4acafbbc0..569445d6f 100644
--- a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
+++ b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/KubernetesClient.Models/Extensions.cs b/src/KubernetesClient.Models/Extensions.cs
index f7cde08d7..270a74724 100644
--- a/src/KubernetesClient.Models/Extensions.cs
+++ b/src/KubernetesClient.Models/Extensions.cs
@@ -1,4 +1,3 @@
-using k8s.Models;
using System.Reflection;
using System.Text.RegularExpressions;
diff --git a/src/KubernetesClient.Models/IMetadata.cs b/src/KubernetesClient.Models/IMetadata.cs
index e633e9e85..edf540184 100644
--- a/src/KubernetesClient.Models/IMetadata.cs
+++ b/src/KubernetesClient.Models/IMetadata.cs
@@ -1,5 +1,3 @@
-using k8s.Models;
-
namespace k8s
{
///
diff --git a/src/KubernetesClient.Models/KubernetesClient.Models.csproj b/src/KubernetesClient.Models/KubernetesClient.Models.csproj
deleted file mode 100644
index 992da6adb..000000000
--- a/src/KubernetesClient.Models/KubernetesClient.Models.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- netstandard2.0;net6.0;net7.0
- k8s.Models
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/KubernetesClient.Models/KubernetesJson.cs b/src/KubernetesClient.Models/KubernetesJson.cs
index b85f0bdfa..d0d4e9d13 100644
--- a/src/KubernetesClient.Models/KubernetesJson.cs
+++ b/src/KubernetesClient.Models/KubernetesJson.cs
@@ -1,6 +1,4 @@
-using k8s.Models;
using System.Globalization;
-using System.IO;
using System.Text.RegularExpressions;
using System.Xml;
diff --git a/src/KubernetesClient.Models/KubernetesYaml.cs b/src/KubernetesClient.Models/KubernetesYaml.cs
index ffcd5a449..b40ed8d44 100644
--- a/src/KubernetesClient.Models/KubernetesYaml.cs
+++ b/src/KubernetesClient.Models/KubernetesYaml.cs
@@ -1,8 +1,5 @@
-using k8s.Models;
-using System.IO;
using System.Reflection;
using System.Text;
-using System.Threading.Tasks;
using YamlDotNet.Core;
using YamlDotNet.Core.Events;
using YamlDotNet.Serialization;
diff --git a/src/KubernetesClient/Authentication/BasicAuthenticationCredentials.cs b/src/KubernetesClient/Authentication/BasicAuthenticationCredentials.cs
index 0844b17be..0f0964544 100644
--- a/src/KubernetesClient/Authentication/BasicAuthenticationCredentials.cs
+++ b/src/KubernetesClient/Authentication/BasicAuthenticationCredentials.cs
@@ -5,8 +5,6 @@
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/Authentication/ExecTokenProvider.cs b/src/KubernetesClient/Authentication/ExecTokenProvider.cs
index 76551fe0b..26bc9b961 100644
--- a/src/KubernetesClient/Authentication/ExecTokenProvider.cs
+++ b/src/KubernetesClient/Authentication/ExecTokenProvider.cs
@@ -1,7 +1,5 @@
using k8s.KubeConfigModels;
using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/Authentication/GcpTokenProvider.cs b/src/KubernetesClient/Authentication/GcpTokenProvider.cs
index 633548bd8..d81713b89 100644
--- a/src/KubernetesClient/Authentication/GcpTokenProvider.cs
+++ b/src/KubernetesClient/Authentication/GcpTokenProvider.cs
@@ -1,8 +1,6 @@
using k8s.Exceptions;
using System.Diagnostics;
using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/Authentication/ITokenProvider.cs b/src/KubernetesClient/Authentication/ITokenProvider.cs
index a03f9aac2..a04f7600b 100644
--- a/src/KubernetesClient/Authentication/ITokenProvider.cs
+++ b/src/KubernetesClient/Authentication/ITokenProvider.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
#pragma warning disable SA1606
#pragma warning disable SA1614
diff --git a/src/KubernetesClient/Authentication/OidcTokenProvider.cs b/src/KubernetesClient/Authentication/OidcTokenProvider.cs
index e587baa3f..d62e6e820 100644
--- a/src/KubernetesClient/Authentication/OidcTokenProvider.cs
+++ b/src/KubernetesClient/Authentication/OidcTokenProvider.cs
@@ -2,8 +2,6 @@
using k8s.Exceptions;
using System.IdentityModel.Tokens.Jwt;
using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/Authentication/ServiceClientCredentials.cs b/src/KubernetesClient/Authentication/ServiceClientCredentials.cs
index 296caa57f..d8ec8bb67 100644
--- a/src/KubernetesClient/Authentication/ServiceClientCredentials.cs
+++ b/src/KubernetesClient/Authentication/ServiceClientCredentials.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/Authentication/StringTokenProvider.cs b/src/KubernetesClient/Authentication/StringTokenProvider.cs
index 26858c612..680dd2f9b 100644
--- a/src/KubernetesClient/Authentication/StringTokenProvider.cs
+++ b/src/KubernetesClient/Authentication/StringTokenProvider.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/Authentication/TokenCredentials.cs b/src/KubernetesClient/Authentication/TokenCredentials.cs
index 7fefda265..ed272627e 100644
--- a/src/KubernetesClient/Authentication/TokenCredentials.cs
+++ b/src/KubernetesClient/Authentication/TokenCredentials.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/Authentication/TokenFileAuth.cs b/src/KubernetesClient/Authentication/TokenFileAuth.cs
index bc0eddcd0..5d423aeb4 100644
--- a/src/KubernetesClient/Authentication/TokenFileAuth.cs
+++ b/src/KubernetesClient/Authentication/TokenFileAuth.cs
@@ -1,7 +1,4 @@
-using System.IO;
using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.Authentication
{
diff --git a/src/KubernetesClient/ByteBuffer.cs b/src/KubernetesClient/ByteBuffer.cs
index eb0d1366b..a6bc92fa0 100644
--- a/src/KubernetesClient/ByteBuffer.cs
+++ b/src/KubernetesClient/ByteBuffer.cs
@@ -1,6 +1,5 @@
using System.Buffers;
using System.Diagnostics;
-using System.Threading;
namespace k8s
{
diff --git a/src/KubernetesClient/CertUtils.cs b/src/KubernetesClient/CertUtils.cs
index 04a8245e4..53f6078f1 100644
--- a/src/KubernetesClient/CertUtils.cs
+++ b/src/KubernetesClient/CertUtils.cs
@@ -1,8 +1,7 @@
using k8s.Exceptions;
using System.Runtime.InteropServices;
-using System.Text;
-using System.IO;
using System.Security.Cryptography.X509Certificates;
+using System.Text;
namespace k8s
{
diff --git a/src/KubernetesClient/ExecAsyncCallback.cs b/src/KubernetesClient/ExecAsyncCallback.cs
index 6ad735d22..461f980f2 100644
--- a/src/KubernetesClient/ExecAsyncCallback.cs
+++ b/src/KubernetesClient/ExecAsyncCallback.cs
@@ -1,6 +1,3 @@
-using System.IO;
-using System.Threading.Tasks;
-
namespace k8s
{
///
diff --git a/src/KubernetesClient/FileSystem.cs b/src/KubernetesClient/FileSystem.cs
index 22736ef98..4a1e7654e 100644
--- a/src/KubernetesClient/FileSystem.cs
+++ b/src/KubernetesClient/FileSystem.cs
@@ -1,5 +1,3 @@
-using System.IO;
-
namespace k8s
{
internal static class FileSystem
diff --git a/src/KubernetesClient/GenericClient.cs b/src/KubernetesClient/GenericClient.cs
index beb5c55ba..2ccb7cc82 100644
--- a/src/KubernetesClient/GenericClient.cs
+++ b/src/KubernetesClient/GenericClient.cs
@@ -1,8 +1,3 @@
-using k8s.Models;
-using System.Threading;
-using System.Threading.Tasks;
-
-
namespace k8s
{
public class GenericClient : IDisposable
diff --git a/src/KubernetesClient/Global.cs b/src/KubernetesClient/Global.cs
index 70b3700e1..2b5a4ae8e 100644
--- a/src/KubernetesClient/Global.cs
+++ b/src/KubernetesClient/Global.cs
@@ -1,5 +1,10 @@
+global using k8s.Autorest;
+global using k8s.Models;
global using System;
global using System.Collections.Generic;
+global using System.IO;
global using System.Linq;
global using System.Text.Json;
global using System.Text.Json.Serialization;
+global using System.Threading;
+global using System.Threading.Tasks;
diff --git a/src/KubernetesClient/IKubernetes.Exec.cs b/src/KubernetesClient/IKubernetes.Exec.cs
index 89d64d4da..b9197a897 100644
--- a/src/KubernetesClient/IKubernetes.Exec.cs
+++ b/src/KubernetesClient/IKubernetes.Exec.cs
@@ -1,6 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s
{
public partial interface IKubernetes
diff --git a/src/KubernetesClient/IKubernetes.WebSocket.cs b/src/KubernetesClient/IKubernetes.WebSocket.cs
index e5976efe6..ed6657332 100644
--- a/src/KubernetesClient/IKubernetes.WebSocket.cs
+++ b/src/KubernetesClient/IKubernetes.WebSocket.cs
@@ -1,6 +1,4 @@
using System.Net.WebSockets;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/IStreamDemuxer.cs b/src/KubernetesClient/IStreamDemuxer.cs
index 406e086c0..2097dcca7 100644
--- a/src/KubernetesClient/IStreamDemuxer.cs
+++ b/src/KubernetesClient/IStreamDemuxer.cs
@@ -1,7 +1,3 @@
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s
{
///
diff --git a/src/KubernetesClient/Kubernetes.ConfigInit.cs b/src/KubernetesClient/Kubernetes.ConfigInit.cs
index cf817b03c..8d6fa31a8 100644
--- a/src/KubernetesClient/Kubernetes.ConfigInit.cs
+++ b/src/KubernetesClient/Kubernetes.ConfigInit.cs
@@ -3,7 +3,6 @@
using System.Net.Http;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
-using System.Threading;
namespace k8s
{
diff --git a/src/KubernetesClient/Kubernetes.Exec.cs b/src/KubernetesClient/Kubernetes.Exec.cs
index cacc73704..53671aead 100644
--- a/src/KubernetesClient/Kubernetes.Exec.cs
+++ b/src/KubernetesClient/Kubernetes.Exec.cs
@@ -1,9 +1,3 @@
-using k8s.Autorest;
-using k8s.Models;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s
{
public partial class Kubernetes
diff --git a/src/KubernetesClient/Kubernetes.WebSocket.cs b/src/KubernetesClient/Kubernetes.WebSocket.cs
index 54922a8a6..3d376f0de 100644
--- a/src/KubernetesClient/Kubernetes.WebSocket.cs
+++ b/src/KubernetesClient/Kubernetes.WebSocket.cs
@@ -1,13 +1,9 @@
-using k8s.Autorest;
-using k8s.Models;
using System.Globalization;
using System.Net;
using System.Net.Http;
using System.Net.WebSockets;
using System.Security.Cryptography.X509Certificates;
using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/Kubernetes.cs b/src/KubernetesClient/Kubernetes.cs
index 95fee7077..53783edc6 100644
--- a/src/KubernetesClient/Kubernetes.cs
+++ b/src/KubernetesClient/Kubernetes.cs
@@ -1,10 +1,6 @@
using k8s.Authentication;
-using k8s.Autorest;
-using System.IO;
using System.Net;
using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj
index fffd3b867..e95a5a173 100644
--- a/src/KubernetesClient/KubernetesClient.csproj
+++ b/src/KubernetesClient/KubernetesClient.csproj
@@ -1,19 +1,85 @@
-
- net6.0;net7.0
- k8s
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ net6.0;net7.0
+ k8s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs b/src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
index 9661679a8..1449fe770 100644
--- a/src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
+++ b/src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
@@ -2,11 +2,9 @@
using k8s.Exceptions;
using k8s.KubeConfigModels;
using System.Diagnostics;
-using System.IO;
using System.Net;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/KubernetesClientConfiguration.InCluster.cs b/src/KubernetesClient/KubernetesClientConfiguration.InCluster.cs
index 41df24731..4846b7425 100644
--- a/src/KubernetesClient/KubernetesClientConfiguration.InCluster.cs
+++ b/src/KubernetesClient/KubernetesClientConfiguration.InCluster.cs
@@ -1,6 +1,5 @@
using k8s.Authentication;
using k8s.Exceptions;
-using System.IO;
namespace k8s
{
diff --git a/src/KubernetesClient/KubernetesException.cs b/src/KubernetesClient/KubernetesException.cs
index 3dd4e7667..0735b78f7 100644
--- a/src/KubernetesClient/KubernetesException.cs
+++ b/src/KubernetesClient/KubernetesException.cs
@@ -1,4 +1,3 @@
-using k8s.Models;
using System.Runtime.Serialization;
namespace k8s
diff --git a/src/KubernetesClient/KubernetesMetricsExtensions.cs b/src/KubernetesClient/KubernetesMetricsExtensions.cs
index a5dec8885..b676cd542 100644
--- a/src/KubernetesClient/KubernetesMetricsExtensions.cs
+++ b/src/KubernetesClient/KubernetesMetricsExtensions.cs
@@ -1,6 +1,3 @@
-using k8s.Models;
-using System.Threading.Tasks;
-
namespace k8s
{
///
diff --git a/src/KubernetesClient/LeaderElection/ILock.cs b/src/KubernetesClient/LeaderElection/ILock.cs
index 2fd5cdd47..a56e0fd38 100644
--- a/src/KubernetesClient/LeaderElection/ILock.cs
+++ b/src/KubernetesClient/LeaderElection/ILock.cs
@@ -1,6 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s.LeaderElection
{
///
diff --git a/src/KubernetesClient/LeaderElection/LeaderElector.cs b/src/KubernetesClient/LeaderElection/LeaderElector.cs
index 3ae5ae4bf..3d8d3c318 100644
--- a/src/KubernetesClient/LeaderElection/LeaderElector.cs
+++ b/src/KubernetesClient/LeaderElection/LeaderElector.cs
@@ -1,7 +1,4 @@
-using k8s.Autorest;
using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s.LeaderElection
{
diff --git a/src/KubernetesClient/LeaderElection/ResourceLock/ConfigMapLock.cs b/src/KubernetesClient/LeaderElection/ResourceLock/ConfigMapLock.cs
index b5e7a2617..eef16edde 100644
--- a/src/KubernetesClient/LeaderElection/ResourceLock/ConfigMapLock.cs
+++ b/src/KubernetesClient/LeaderElection/ResourceLock/ConfigMapLock.cs
@@ -1,7 +1,3 @@
-using k8s.Models;
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s.LeaderElection.ResourceLock
{
public class ConfigMapLock : MetaObjectAnnotationLock
diff --git a/src/KubernetesClient/LeaderElection/ResourceLock/EndpointsLock.cs b/src/KubernetesClient/LeaderElection/ResourceLock/EndpointsLock.cs
index 1ebf64fc4..23ebaab1f 100644
--- a/src/KubernetesClient/LeaderElection/ResourceLock/EndpointsLock.cs
+++ b/src/KubernetesClient/LeaderElection/ResourceLock/EndpointsLock.cs
@@ -1,7 +1,3 @@
-using k8s.Models;
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s.LeaderElection.ResourceLock
{
public class EndpointsLock : MetaObjectAnnotationLock
diff --git a/src/KubernetesClient/LeaderElection/ResourceLock/LeaseLock.cs b/src/KubernetesClient/LeaderElection/ResourceLock/LeaseLock.cs
index 35befc037..38de063ce 100644
--- a/src/KubernetesClient/LeaderElection/ResourceLock/LeaseLock.cs
+++ b/src/KubernetesClient/LeaderElection/ResourceLock/LeaseLock.cs
@@ -1,7 +1,3 @@
-using k8s.Models;
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s.LeaderElection.ResourceLock
{
public class LeaseLock : MetaObjectLock
diff --git a/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectAnnotationLock.cs b/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectAnnotationLock.cs
index b755bcc5d..42f948db8 100644
--- a/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectAnnotationLock.cs
+++ b/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectAnnotationLock.cs
@@ -1,6 +1,3 @@
-using k8s.Models;
-
-
namespace k8s.LeaderElection.ResourceLock
{
public abstract class MetaObjectAnnotationLock : MetaObjectLock
diff --git a/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectLock.cs b/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectLock.cs
index 8a0b7defb..4d97842d8 100644
--- a/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectLock.cs
+++ b/src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectLock.cs
@@ -1,9 +1,3 @@
-using k8s.Autorest;
-using k8s.Models;
-using System.Threading;
-using System.Threading.Tasks;
-
-
namespace k8s.LeaderElection.ResourceLock
{
public abstract class MetaObjectLock : ILock
diff --git a/src/KubernetesClient/LeaderElection/ResourceLock/MultiLock.cs b/src/KubernetesClient/LeaderElection/ResourceLock/MultiLock.cs
index 920c25d52..64256612e 100644
--- a/src/KubernetesClient/LeaderElection/ResourceLock/MultiLock.cs
+++ b/src/KubernetesClient/LeaderElection/ResourceLock/MultiLock.cs
@@ -1,6 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
-
namespace k8s.LeaderElection.ResourceLock
{
public class MultiLock : ILock
diff --git a/src/KubernetesClient/LineSeparatedHttpContent.cs b/src/KubernetesClient/LineSeparatedHttpContent.cs
index f26c04056..9206fe4ff 100644
--- a/src/KubernetesClient/LineSeparatedHttpContent.cs
+++ b/src/KubernetesClient/LineSeparatedHttpContent.cs
@@ -1,8 +1,5 @@
-using System.IO;
using System.Net;
using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/MuxedStream.cs b/src/KubernetesClient/MuxedStream.cs
index 8670bab1f..17edc1f0e 100644
--- a/src/KubernetesClient/MuxedStream.cs
+++ b/src/KubernetesClient/MuxedStream.cs
@@ -1,5 +1,3 @@
-using System.IO;
-
namespace k8s
{
///
diff --git a/src/KubernetesClient/PrometheusHandler.cs b/src/KubernetesClient/PrometheusHandler.cs
index 768b7dfed..c74abe460 100644
--- a/src/KubernetesClient/PrometheusHandler.cs
+++ b/src/KubernetesClient/PrometheusHandler.cs
@@ -1,7 +1,5 @@
using Prometheus;
using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/StreamDemuxer.cs b/src/KubernetesClient/StreamDemuxer.cs
index 1d4ac7404..3cebd172e 100644
--- a/src/KubernetesClient/StreamDemuxer.cs
+++ b/src/KubernetesClient/StreamDemuxer.cs
@@ -1,9 +1,6 @@
using System.Buffers;
using System.Diagnostics;
-using System.IO;
using System.Net.WebSockets;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/Watcher.cs b/src/KubernetesClient/Watcher.cs
index 9e1996077..9546fa21b 100644
--- a/src/KubernetesClient/Watcher.cs
+++ b/src/KubernetesClient/Watcher.cs
@@ -1,9 +1,5 @@
-using k8s.Models;
-using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/WatcherExt.cs b/src/KubernetesClient/WatcherExt.cs
index 0ddf302a5..7b2fe9308 100644
--- a/src/KubernetesClient/WatcherExt.cs
+++ b/src/KubernetesClient/WatcherExt.cs
@@ -1,8 +1,4 @@
-using k8s.Autorest;
using k8s.Exceptions;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/KubernetesClient/WebSocketBuilder.cs b/src/KubernetesClient/WebSocketBuilder.cs
index 053acf29b..8acc3c5ce 100644
--- a/src/KubernetesClient/WebSocketBuilder.cs
+++ b/src/KubernetesClient/WebSocketBuilder.cs
@@ -1,7 +1,5 @@
using System.Net.WebSockets;
using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
namespace k8s
{
diff --git a/src/nuget.proj b/src/nuget.proj
index 93ed6ba8e..1d04b6fb5 100644
--- a/src/nuget.proj
+++ b/src/nuget.proj
@@ -1,7 +1,5 @@
-
-
diff --git a/tests/KubernetesClient.Tests/QuantityValueTests.cs b/tests/KubernetesClient.Tests/QuantityValueTests.cs
index 752fa6022..afde7836f 100644
--- a/tests/KubernetesClient.Tests/QuantityValueTests.cs
+++ b/tests/KubernetesClient.Tests/QuantityValueTests.cs
@@ -217,7 +217,7 @@ public void DeserializeJson()
var value = KubernetesJson.Deserialize>(@"{""cpu"": ""1.1""}");
Assert.Equal(new ResourceQuantity(11, -1, DecimalSI), value["cpu"]);
}
-
+
// int
{
var value = KubernetesJson.Deserialize>(@"{""cpu"": 1}");
diff --git a/version.json b/version.json
index 442587a0f..bfcc6cd9f 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
- "version": "12.0",
+ "version": "12.1",
"publicReleaseRefSpec": [
"^refs/heads/master$",
"^refs/tags/v\\d+\\.\\d+\\.\\d+"