From 9e6e2f0baabea6f8abd3224f66db88979bcc5231 Mon Sep 17 00:00:00 2001 From: stan-sz <37585349+stan-sz@users.noreply.github.com> Date: Tue, 29 Mar 2022 22:01:26 +0200 Subject: [PATCH] Standardize TargetFramwork for VisualStudio IDE (#810) * Follow up on unused using cleanup * Revert * Package upgrades * LF * Update README.md Co-authored-by: Boshi Lian Co-authored-by: Boshi Lian --- Directory.Build.props | 78 +++++++++---------- README.md | 10 +-- examples/Directory.Build.props | 12 +-- .../KubernetesClient.Basic.csproj | 4 +- .../KubernetesClient.Models.csproj | 2 +- src/KubernetesClient/KubernetesClient.csproj | 4 +- .../LibKubernetesGenerator.csproj | 5 +- src/nuget.proj | 15 ++-- tests/E2E.Tests/E2E.Tests.csproj | 4 +- .../KubernetesClient.Tests.csproj | 4 +- .../KubernetesClient.Util.Tests.csproj | 2 +- 11 files changed, 69 insertions(+), 71 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 440a63a7b..6af780d70 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,39 +1,39 @@ - - - - $(MSBuildThisFileDirectory)\kubernetes-client.ruleset - true - true - - - - The Kubernetes Project Authors - 2017 The Kubernetes Project Authors - Client library for the Kubernetes open source container orchestrator. - - Apache-2.0 - https://github.com/kubernetes-client/csharp - https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png - logo.png - kubernetes;docker;containers; - true - - - true - - - true - snupkg - true - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - 10.0 - - - - true - - - - - - + + + + $(MSBuildThisFileDirectory)\kubernetes-client.ruleset + true + true + + + + The Kubernetes Project Authors + 2017 The Kubernetes Project Authors + Client library for the Kubernetes open source container orchestrator. + + Apache-2.0 + https://github.com/kubernetes-client/csharp + https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png + logo.png + kubernetes;docker;containers; + true + + + true + + + true + snupkg + true + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + 10.0 + + + + true + + + + + + diff --git a/README.md b/README.md index a22651383..c72aadcb7 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ dotnet add package KubernetesClient ## Authentication/Configuration You should be able to use a standard KubeConfig file with this library, see the `BuildConfigFromConfigFile` function below. Most authentication -methods are currently supported, but a few are not, see the +methods are currently supported, but a few are not, see the [known-issues](https://github.com/kubernetes-client/csharp#known-issues). You should also be able to authenticate with the in-cluster service @@ -141,16 +141,16 @@ git clone https://github.com/kubernetes-client/gen ```bash # Where REPO_DIR points to the root of the csharp repository -cd +cd ${GEN_DIR}/openapi/csharp.sh ${REPO_DIR}/src/KubernetesClient ${REPO_DIR}/csharp.settings ``` -# Version Compatibility +# Version Compatibility | SDK Version | Kubernetes Version | .NET Targeting | |-------------|--------------------|---------------------------------------| -| 7.0 | 1.23 | netstandard2.1;net5;net6 | -| 6.0 | 1.22 | netstandard2.1;net5 | +| 7.0 | 1.23 | netstandard2.1;net5.0;net6.0 | +| 6.0 | 1.22 | netstandard2.1;net5.0 | | 5.0 | 1.21 | netstandard2.1;net5 | | 4.0 | 1.20 | netstandard2.0;netstandard2.1 | | 3.0 | 1.19 | netstandard2.0;net452 | diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props index ed0221943..ab4d8e735 100644 --- a/examples/Directory.Build.props +++ b/examples/Directory.Build.props @@ -1,6 +1,6 @@ - - - - net6 - - + + + + net6.0 + + diff --git a/src/KubernetesClient.Basic/KubernetesClient.Basic.csproj b/src/KubernetesClient.Basic/KubernetesClient.Basic.csproj index d38f5ec37..848174702 100644 --- a/src/KubernetesClient.Basic/KubernetesClient.Basic.csproj +++ b/src/KubernetesClient.Basic/KubernetesClient.Basic.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.0 k8s @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/src/KubernetesClient.Models/KubernetesClient.Models.csproj b/src/KubernetesClient.Models/KubernetesClient.Models.csproj index 3414903ed..f6b197b7a 100644 --- a/src/KubernetesClient.Models/KubernetesClient.Models.csproj +++ b/src/KubernetesClient.Models/KubernetesClient.Models.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + netstandard2.0 k8s.Models diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj index 245f54953..28f607f8a 100644 --- a/src/KubernetesClient/KubernetesClient.csproj +++ b/src/KubernetesClient/KubernetesClient.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net5;net6 + netstandard2.1;net5.0;net6.0 k8s @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/LibKubernetesGenerator/LibKubernetesGenerator.csproj b/src/LibKubernetesGenerator/LibKubernetesGenerator.csproj index c8fe907db..ba4704b71 100644 --- a/src/LibKubernetesGenerator/LibKubernetesGenerator.csproj +++ b/src/LibKubernetesGenerator/LibKubernetesGenerator.csproj @@ -1,7 +1,6 @@ netstandard2.0 - 10.0 CA1812 @@ -24,7 +23,7 @@ $(GetTargetPathDependsOn);GetDependencyTargetPaths - + @@ -39,5 +38,5 @@ - + diff --git a/src/nuget.proj b/src/nuget.proj index e22ee484a..236467fe4 100644 --- a/src/nuget.proj +++ b/src/nuget.proj @@ -1,8 +1,7 @@ - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/tests/E2E.Tests/E2E.Tests.csproj b/tests/E2E.Tests/E2E.Tests.csproj index f2b4c8844..43ab2c1fb 100644 --- a/tests/E2E.Tests/E2E.Tests.csproj +++ b/tests/E2E.Tests/E2E.Tests.csproj @@ -3,14 +3,14 @@ false true k8s.E2E - netcoreapp3.1;net5;net6 + netcoreapp3.1;net5.0;net6.0 - + diff --git a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj index 89eb1464b..bbd49e2a3 100755 --- a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj +++ b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj @@ -4,7 +4,7 @@ 8 true k8s.Tests - netcoreapp3.1;net5;net6 + netcoreapp3.1;net5.0;net6.0 @@ -24,7 +24,7 @@ runtime; build; native; contentfiles; analyzers - + all diff --git a/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj b/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj index 28b011509..e54ad7af1 100644 --- a/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj +++ b/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj @@ -10,7 +10,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive