From 007ef8946cb8b1508f3c249129133a8123cde967 Mon Sep 17 00:00:00 2001 From: Weihan Li Date: Sun, 16 Jun 2024 12:41:28 +0800 Subject: [PATCH] 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 16caafe..10ec5bf 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 f8adb35..517121e 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 0000000..72014a9 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,54 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/cp/cp.csproj b/examples/cp/cp.csproj index 92dc6a9..cde0f0f 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 956886b..f67de4f 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 1c03d65..ad2bdd7 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 7562673..ff48d44 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 d5b8b6a..0d5a49c 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 b126dcb..23e466d 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 03c52d7..84522ab 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 30aa23b..740ad73 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 69deff7..a40cd4c 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 935ce43..09e3773 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 412c48b..763583d 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 226a80b..cbe1e29 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 e5ae804..ee9aeb0 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 1384202..fb562b8 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 3709c46..f317c37 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 4adbd59..d24ff89 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 5d13b67..9304c2b 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 ebbe1f2..0a0f9f1 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 4f07e16..e298617 100644 --- a/tests/SkipTestLogger/SkipTestLogger.csproj +++ b/tests/SkipTestLogger/SkipTestLogger.csproj @@ -5,7 +5,7 @@ - +