From 6df71f5e389a582d766bb53b96e10afc9d05f1b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 17:52:32 -0700 Subject: [PATCH 1/7] Bump BouncyCastle.Cryptography in /src/KubernetesClient.Classic (#1557) Bumps [BouncyCastle.Cryptography](https://github.com/bcgit/bc-csharp) from 2.2.1 to 2.3.1. - [Commits](https://github.com/bcgit/bc-csharp/compare/release-2.2.1...release-2.3.1) --- updated-dependencies: - dependency-name: BouncyCastle.Cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/KubernetesClient.Classic/KubernetesClient.Classic.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj index f97178520..69deff788 100644 --- a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj +++ b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj @@ -6,7 +6,7 @@ - + From 2c2bd6a4a388f630f9aac84cbe4b8a65f0096ee1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 16:57:00 -0700 Subject: [PATCH 2/7] Bump nunit/docfx-action from 3.2.0 to 3.3.0 (#1558) Bumps [nunit/docfx-action](https://github.com/nunit/docfx-action) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/nunit/docfx-action/releases) - [Commits](https://github.com/nunit/docfx-action/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: nunit/docfx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docfx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docfx.yaml b/.github/workflows/docfx.yaml index 44d432589..045825535 100644 --- a/.github/workflows/docfx.yaml +++ b/.github/workflows/docfx.yaml @@ -39,7 +39,7 @@ jobs: - name: Build run: dotnet build -c Release - - uses: nunit/docfx-action@v3.2.0 + - uses: nunit/docfx-action@v3.3.0 name: Build Documentation with: args: doc/docfx.json From b6315d8622b4f747be4387d2179d6ca00d862d52 Mon Sep 17 00:00:00 2001 From: Weihan Li Date: Fri, 7 Jun 2024 13:14:14 +0800 Subject: [PATCH 3/7] Update KubernetesClient DiagnosticSource dependency (#1561) System.Diagnostics.DiagnosticSource has been included into the framework reference, no need to reference for net8 --- src/KubernetesClient/KubernetesClient.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj index 01feb75f7..226a80bea 100644 --- a/src/KubernetesClient/KubernetesClient.csproj +++ b/src/KubernetesClient/KubernetesClient.csproj @@ -7,7 +7,7 @@ - + From 007ef8946cb8b1508f3c249129133a8123cde967 Mon Sep 17 00:00:00 2001 From: Weihan Li Date: Sun, 16 Jun 2024 12:41:28 +0800 Subject: [PATCH 4/7] init cpm support (#1565) * feat: init cpm support * remove dotnet-xunit DotNetCliToolReference * use VersionOverride for compatibility --- Directory.Build.props | 6 +-- Directory.Build.targets | 19 ------- Directory.Packages.props | 54 +++++++++++++++++++ examples/cp/cp.csproj | 2 +- examples/csrApproval/csrApproval.csproj | 2 +- examples/customResource/customResource.csproj | 2 +- .../openTelemetryConsole.csproj | 4 +- examples/restart/restart.csproj | 2 +- .../webApiDependencyInjection.csproj | 2 +- .../workerServiceDependencyInjection.csproj | 2 +- .../KubernetesClient.Aot.csproj | 8 +-- .../KubernetesClient.Classic.csproj | 14 ++--- .../KubernetesClient.Kubectl.csproj | 2 +- .../KubernetesClient.ModelConverter.csproj | 2 +- src/KubernetesClient/KubernetesClient.csproj | 13 +++-- .../LibKubernetesGenerator.target | 20 +++---- tests/E2E.Aot.Tests/E2E.Aot.Tests.csproj | 16 +++--- tests/E2E.Tests/E2E.Tests.csproj | 16 +++--- tests/Kubectl.Tests/Kubectl.Tests.csproj | 13 ++--- .../KubernetesClient.Classic.Tests.csproj | 27 +++++----- .../KubernetesClient.Tests.csproj | 27 +++++----- tests/SkipTestLogger/SkipTestLogger.csproj | 2 +- 22 files changed, 136 insertions(+), 119 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props index 16caafe5d..10ec5bf39 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,4 @@ - + $(MSBuildThisFileDirectory)\kubernetes-client.ruleset @@ -36,8 +36,4 @@ - - - - diff --git a/Directory.Build.targets b/Directory.Build.targets index f8adb35da..517121e49 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,23 +1,4 @@ - - - all - runtime; build; native; contentfiles; analyzers - - - all - runtime; build; native; contentfiles; analyzers - - - all - runtime; build; native; contentfiles; analyzers - - - all - runtime; build; native; contentfiles; analyzers - - - diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..72014a9a6 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,54 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/cp/cp.csproj b/examples/cp/cp.csproj index 92dc6a930..cde0f0fca 100644 --- a/examples/cp/cp.csproj +++ b/examples/cp/cp.csproj @@ -5,7 +5,7 @@ - + diff --git a/examples/csrApproval/csrApproval.csproj b/examples/csrApproval/csrApproval.csproj index 956886bf8..f67de4fbc 100644 --- a/examples/csrApproval/csrApproval.csproj +++ b/examples/csrApproval/csrApproval.csproj @@ -7,6 +7,6 @@ - + diff --git a/examples/customResource/customResource.csproj b/examples/customResource/customResource.csproj index 1c03d65ab..ad2bdd739 100644 --- a/examples/customResource/customResource.csproj +++ b/examples/customResource/customResource.csproj @@ -5,7 +5,7 @@ - + diff --git a/examples/openTelemetryConsole/openTelemetryConsole.csproj b/examples/openTelemetryConsole/openTelemetryConsole.csproj index 75626737c..ff48d4450 100644 --- a/examples/openTelemetryConsole/openTelemetryConsole.csproj +++ b/examples/openTelemetryConsole/openTelemetryConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/restart/restart.csproj b/examples/restart/restart.csproj index d5b8b6a48..0d5a49c4c 100644 --- a/examples/restart/restart.csproj +++ b/examples/restart/restart.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/webApiDependencyInjection/webApiDependencyInjection.csproj b/examples/webApiDependencyInjection/webApiDependencyInjection.csproj index b126dcb56..23e466d7e 100644 --- a/examples/webApiDependencyInjection/webApiDependencyInjection.csproj +++ b/examples/webApiDependencyInjection/webApiDependencyInjection.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj b/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj index 03c52d77a..84522ab7c 100644 --- a/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj +++ b/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj @@ -6,6 +6,6 @@ - + diff --git a/src/KubernetesClient.Aot/KubernetesClient.Aot.csproj b/src/KubernetesClient.Aot/KubernetesClient.Aot.csproj index 30aa23b01..740ad73ff 100644 --- a/src/KubernetesClient.Aot/KubernetesClient.Aot.csproj +++ b/src/KubernetesClient.Aot/KubernetesClient.Aot.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj index 69deff788..a40cd4c7b 100644 --- a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj +++ b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj @@ -6,13 +6,13 @@ - - - - - - - + + + + + + + diff --git a/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj b/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj index 935ce4375..09e37730b 100644 --- a/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj +++ b/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj index 412c48b63..763583da5 100644 --- a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj +++ b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj @@ -10,6 +10,6 @@ - + diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj index 226a80bea..cbe1e29d7 100644 --- a/src/KubernetesClient/KubernetesClient.csproj +++ b/src/KubernetesClient/KubernetesClient.csproj @@ -7,16 +7,15 @@ - - - - - + + + + + - + diff --git a/src/LibKubernetesGenerator/LibKubernetesGenerator.target b/src/LibKubernetesGenerator/LibKubernetesGenerator.target index e5ae80459..ee9aeb083 100644 --- a/src/LibKubernetesGenerator/LibKubernetesGenerator.target +++ b/src/LibKubernetesGenerator/LibKubernetesGenerator.target @@ -12,26 +12,26 @@ - + - + - + - - - + + + - - - - + + + + diff --git a/tests/E2E.Aot.Tests/E2E.Aot.Tests.csproj b/tests/E2E.Aot.Tests/E2E.Aot.Tests.csproj index 13842028b..fb562b8cb 100644 --- a/tests/E2E.Aot.Tests/E2E.Aot.Tests.csproj +++ b/tests/E2E.Aot.Tests/E2E.Aot.Tests.csproj @@ -7,18 +7,16 @@ - - + + - + - - - - all + + + runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -27,7 +25,7 @@ - + diff --git a/tests/E2E.Tests/E2E.Tests.csproj b/tests/E2E.Tests/E2E.Tests.csproj index 3709c46c2..f317c3729 100644 --- a/tests/E2E.Tests/E2E.Tests.csproj +++ b/tests/E2E.Tests/E2E.Tests.csproj @@ -7,18 +7,16 @@ - - + + - + - - - - all + + + runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -28,6 +26,6 @@ - + diff --git a/tests/Kubectl.Tests/Kubectl.Tests.csproj b/tests/Kubectl.Tests/Kubectl.Tests.csproj index 4adbd5908..d24ff8993 100644 --- a/tests/Kubectl.Tests/Kubectl.Tests.csproj +++ b/tests/Kubectl.Tests/Kubectl.Tests.csproj @@ -9,16 +9,13 @@ - - - - all + + + runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + diff --git a/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj b/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj index 5d13b67d9..9304c2b41 100644 --- a/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj +++ b/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj @@ -7,27 +7,24 @@ - - - - - - - + + + + + + + - - - - all + + + runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + diff --git a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj index ebbe1f29d..0a0f9f1ac 100644 --- a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj +++ b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj @@ -6,27 +6,24 @@ - - - - - - - + + + + + + + - - - - all + + + runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + diff --git a/tests/SkipTestLogger/SkipTestLogger.csproj b/tests/SkipTestLogger/SkipTestLogger.csproj index 4f07e1649..e29861786 100644 --- a/tests/SkipTestLogger/SkipTestLogger.csproj +++ b/tests/SkipTestLogger/SkipTestLogger.csproj @@ -5,7 +5,7 @@ - + From 17edc6a2a789bf888265bcbef4a4c38c4f3b5c68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 07:32:40 -0700 Subject: [PATCH 5/7] Bump nunit/docfx-action from 3.3.0 to 3.4.0 (#1569) Bumps [nunit/docfx-action](https://github.com/nunit/docfx-action) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/nunit/docfx-action/releases) - [Commits](https://github.com/nunit/docfx-action/compare/v3.3.0...v3.4.0) --- updated-dependencies: - dependency-name: nunit/docfx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docfx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docfx.yaml b/.github/workflows/docfx.yaml index 045825535..a0f5e93aa 100644 --- a/.github/workflows/docfx.yaml +++ b/.github/workflows/docfx.yaml @@ -39,7 +39,7 @@ jobs: - name: Build run: dotnet build -c Release - - uses: nunit/docfx-action@v3.3.0 + - uses: nunit/docfx-action@v3.4.0 name: Build Documentation with: args: doc/docfx.json From e05bc143b99c33a1d27c7185d905dac6d77690e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:55:18 -0700 Subject: [PATCH 6/7] Bump nunit/docfx-action from 3.4.0 to 3.4.1 (#1572) Bumps [nunit/docfx-action](https://github.com/nunit/docfx-action) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/nunit/docfx-action/releases) - [Commits](https://github.com/nunit/docfx-action/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: nunit/docfx-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docfx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docfx.yaml b/.github/workflows/docfx.yaml index a0f5e93aa..00db8dc88 100644 --- a/.github/workflows/docfx.yaml +++ b/.github/workflows/docfx.yaml @@ -39,7 +39,7 @@ jobs: - name: Build run: dotnet build -c Release - - uses: nunit/docfx-action@v3.4.0 + - uses: nunit/docfx-action@v3.4.1 name: Build Documentation with: args: doc/docfx.json From 36a02046439d01f1256aed4e5071cb7f1b57d6eb Mon Sep 17 00:00:00 2001 From: Ivan Josipovic <9521987+IvanJosipovic@users.noreply.github.com> Date: Sun, 11 Aug 2024 13:21:59 -0700 Subject: [PATCH 7/7] feat: yamldotnet 16 support (#1574) * feat: yamldotnet 16 support * update yamldotnet * fix interface * update Vecc.YamlDotNet.Analyzers.StaticGenerator --- Directory.Packages.props | 4 ++-- src/KubernetesClient.Aot/KubernetesYaml.cs | 4 ++-- src/KubernetesClient/KubernetesYaml.cs | 4 ++-- src/KubernetesClient/Models/IntOrStringYamlConverter.cs | 4 ++-- src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs | 5 ++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 72014a9a6..67df46d62 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -28,11 +28,11 @@ - + - + diff --git a/src/KubernetesClient.Aot/KubernetesYaml.cs b/src/KubernetesClient.Aot/KubernetesYaml.cs index a017d1050..069b1c12e 100644 --- a/src/KubernetesClient.Aot/KubernetesYaml.cs +++ b/src/KubernetesClient.Aot/KubernetesYaml.cs @@ -45,7 +45,7 @@ public bool Accepts(Type type) return type == typeof(byte[]); } - public object ReadYaml(IParser parser, Type type) + public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) { if (parser?.Current is Scalar scalar) { @@ -67,7 +67,7 @@ public object ReadYaml(IParser parser, Type type) throw new InvalidOperationException(parser.Current?.ToString()); } - public void WriteYaml(IEmitter emitter, object value, Type type) + public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer) { var obj = (byte[])value; emitter?.Emit(new Scalar(Encoding.UTF8.GetString(obj))); diff --git a/src/KubernetesClient/KubernetesYaml.cs b/src/KubernetesClient/KubernetesYaml.cs index 803c2bb64..7f677a3f2 100644 --- a/src/KubernetesClient/KubernetesYaml.cs +++ b/src/KubernetesClient/KubernetesYaml.cs @@ -67,7 +67,7 @@ public bool Accepts(Type type) return type == typeof(byte[]); } - public object ReadYaml(IParser parser, Type type) + public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) { if (parser?.Current is Scalar scalar) { @@ -89,7 +89,7 @@ public object ReadYaml(IParser parser, Type type) throw new InvalidOperationException(parser.Current?.ToString()); } - public void WriteYaml(IEmitter emitter, object value, Type type) + public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer) { var obj = (byte[])value; emitter?.Emit(new Scalar(Encoding.UTF8.GetString(obj))); diff --git a/src/KubernetesClient/Models/IntOrStringYamlConverter.cs b/src/KubernetesClient/Models/IntOrStringYamlConverter.cs index 125ea5f93..49116bd6c 100644 --- a/src/KubernetesClient/Models/IntOrStringYamlConverter.cs +++ b/src/KubernetesClient/Models/IntOrStringYamlConverter.cs @@ -10,7 +10,7 @@ public bool Accepts(Type type) return type == typeof(IntstrIntOrString); } - public object ReadYaml(IParser parser, Type type) + public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) { if (parser?.Current is YamlDotNet.Core.Events.Scalar scalar) { @@ -32,7 +32,7 @@ public object ReadYaml(IParser parser, Type type) throw new InvalidOperationException(parser?.Current?.ToString()); } - public void WriteYaml(IEmitter emitter, object value, Type type) + public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer) { var obj = (IntstrIntOrString)value; emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.Value)); diff --git a/src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs b/src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs index ef274bf81..ce0ec8e54 100644 --- a/src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs +++ b/src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs @@ -10,7 +10,7 @@ public bool Accepts(Type type) return type == typeof(ResourceQuantity); } - public object ReadYaml(IParser parser, Type type) + public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) { if (parser?.Current is YamlDotNet.Core.Events.Scalar scalar) { @@ -32,8 +32,7 @@ public object ReadYaml(IParser parser, Type type) throw new InvalidOperationException(parser?.Current?.ToString()); } - - public void WriteYaml(IEmitter emitter, object value, Type type) + public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer) { var obj = (ResourceQuantity)value; emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.ToString()));