diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
index b0d5e2615..008689615 100644
--- a/.github/workflows/buildtest.yaml
+++ b/.github/workflows/buildtest.yaml
@@ -17,6 +17,7 @@ jobs:
dotnet-version: |
6.0.x
7.0.x
+ 8.0.x
# - name: Check Format
# # don't check formatting on Windows b/c of CRLF issues.
# if: matrix.os == 'ubuntu-latest'
@@ -68,6 +69,7 @@ jobs:
dotnet-version: |
6.0.x
7.0.x
+ 8.0.x
- name: Minikube
run: minikube start
- name: Test
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 83d550e19..08041e97f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -32,6 +32,7 @@ jobs:
3.1.x
6.0.x
7.0.x
+ 8.0.x
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
@@ -43,8 +44,16 @@ jobs:
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
- - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ # Currently .NET8.0 isn't supported
+ # - name: Autobuild
+ # uses: github/codeql-action/autobuild@v2
+
+ - name: Restore dependencies
+ run: dotnet restore
+ - name: Build
+ run: dotnet build --configuration Debug --no-restore
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/docfx.yaml b/.github/workflows/docfx.yaml
index 5d16d0dc8..23a8b02ec 100644
--- a/.github/workflows/docfx.yaml
+++ b/.github/workflows/docfx.yaml
@@ -34,7 +34,8 @@ jobs:
with:
dotnet-version: |
6.0.x
- 7.0.x
+ 7.0.x
+ 8.0.x
- name: Build
run: dotnet build
diff --git a/.github/workflows/draft.yaml b/.github/workflows/draft.yaml
index 460a869c1..c0951bf4f 100644
--- a/.github/workflows/draft.yaml
+++ b/.github/workflows/draft.yaml
@@ -19,7 +19,8 @@ jobs:
with:
dotnet-version: |
6.0.x
- 7.0.x
+ 7.0.x
+ 8.0.x
- name: dotnet restore
run: dotnet restore --verbosity minimal --configfile nuget.config
@@ -36,4 +37,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
- gh release create -d --generate-notes v$env:NBGV_NuGetPackageVersion
\ No newline at end of file
+ gh release create -d --generate-notes v$env:NBGV_NuGetPackageVersion
diff --git a/.github/workflows/nuget.yaml b/.github/workflows/nuget.yaml
index 3646b9ba4..ff77cf64b 100644
--- a/.github/workflows/nuget.yaml
+++ b/.github/workflows/nuget.yaml
@@ -20,6 +20,7 @@ jobs:
dotnet-version: |
6.0.x
7.0.x
+ 8.0.x
- name: dotnet restore
run: dotnet restore --verbosity minimal --configfile nuget.config
diff --git a/Directory.Build.targets b/Directory.Build.targets
index f55e7396d..f8adb35da 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,12 +1,24 @@
-
-
-
-
-
-
+
+
+ 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/examples/Directory.Build.props b/examples/Directory.Build.props
index 609159b2e..edc5738f1 100644
--- a/examples/Directory.Build.props
+++ b/examples/Directory.Build.props
@@ -1,6 +1,6 @@
- net7.0
+ net8.0
diff --git a/examples/openTelemetryConsole/openTelemetryConsole.csproj b/examples/openTelemetryConsole/openTelemetryConsole.csproj
index 95b05339c..161cea0c0 100644
--- a/examples/openTelemetryConsole/openTelemetryConsole.csproj
+++ b/examples/openTelemetryConsole/openTelemetryConsole.csproj
@@ -7,7 +7,6 @@
-
diff --git a/global.json b/global.json
index f6fbd3cbd..101665708 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,9 @@
-
{
- "sdk": {
- "version": "7.0.100",
- "rollForward": "latestMajor"
- },
- "msbuild-sdks": {
- "Microsoft.Build.Traversal" : "4.1.0"
- }
+ "sdk": {
+ "version": "8.0.100",
+ "rollForward": "latestMajor"
+ },
+ "msbuild-sdks": {
+ "Microsoft.Build.Traversal": "4.1.0"
+ }
}
diff --git a/kubernetes-client.sln b/kubernetes-client.sln
index f70cb88a9..63b8abc97 100644
--- a/kubernetes-client.sln
+++ b/kubernetes-client.sln
@@ -1,4 +1,4 @@
-3D1864AA-1FFC-4512-BB13-46055E410F73
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
@@ -65,6 +65,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cp", "examples\cp\cp.csproj
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.ModelConverter", "src\KubernetesClient.ModelConverter\KubernetesClient.ModelConverter.csproj", "{F1C8276A-8A60-4362-96B8-A006314446AE}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibKubernetesGenerator", "src\LibKubernetesGenerator\generators\LibKubernetesGenerator\LibKubernetesGenerator.csproj", "{5EBC9C3E-855A-4757-800A-CC038DB491CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibKubernetesGenerator.Automapper", "src\LibKubernetesGenerator\generators\LibKubernetesGenerator.Automapper\LibKubernetesGenerator.Automapper.csproj", "{999C6150-4EC7-44E1-B4B9-77556F8A3B93}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -255,18 +259,6 @@ Global
{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Release|x64.Build.0 = Release|Any CPU
{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Release|x86.ActiveCfg = Release|Any CPU
{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Release|x86.Build.0 = Release|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x64.ActiveCfg = Debug|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x64.Build.0 = Debug|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x86.ActiveCfg = Debug|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x86.Build.0 = Debug|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Release|Any CPU.Build.0 = Release|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x64.ActiveCfg = Release|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x64.Build.0 = Release|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x86.ActiveCfg = Release|Any CPU
- {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x86.Build.0 = Release|Any CPU
{DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -435,6 +427,30 @@ Global
{F1C8276A-8A60-4362-96B8-A006314446AE}.Release|x64.Build.0 = Release|Any CPU
{F1C8276A-8A60-4362-96B8-A006314446AE}.Release|x86.ActiveCfg = Release|Any CPU
{F1C8276A-8A60-4362-96B8-A006314446AE}.Release|x86.Build.0 = Release|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Debug|x64.Build.0 = Debug|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Debug|x86.Build.0 = Debug|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Release|x64.ActiveCfg = Release|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Release|x64.Build.0 = Release|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Release|x86.ActiveCfg = Release|Any CPU
+ {5EBC9C3E-855A-4757-800A-CC038DB491CF}.Release|x86.Build.0 = Release|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Debug|x64.Build.0 = Debug|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Debug|x86.Build.0 = Debug|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Release|Any CPU.Build.0 = Release|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Release|x64.ActiveCfg = Release|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Release|x64.Build.0 = Release|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Release|x86.ActiveCfg = Release|Any CPU
+ {999C6150-4EC7-44E1-B4B9-77556F8A3B93}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj b/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj
index 1d3d18bc4..cd3d74109 100644
--- a/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj
+++ b/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj
@@ -1,7 +1,7 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
enable
enable
k8s.kubectl
diff --git a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
index a59add709..424e3f744 100644
--- a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
+++ b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
@@ -1,6 +1,6 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
k8s.ModelConverter
diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj
index a65ad1508..b3aaf808c 100644
--- a/src/KubernetesClient/KubernetesClient.csproj
+++ b/src/KubernetesClient/KubernetesClient.csproj
@@ -1,7 +1,7 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
k8s
diff --git a/tests/E2E.Tests/E2E.Tests.csproj b/tests/E2E.Tests/E2E.Tests.csproj
index 5062d0ef0..fe1ead723 100644
--- a/tests/E2E.Tests/E2E.Tests.csproj
+++ b/tests/E2E.Tests/E2E.Tests.csproj
@@ -3,7 +3,7 @@
false
true
k8s.E2E
- net6.0;net7.0
+ net6.0;net7.0;net8.0
diff --git a/tests/Kubectl.Tests/Kubectl.Tests.csproj b/tests/Kubectl.Tests/Kubectl.Tests.csproj
index bb247a887..dbbc9004d 100644
--- a/tests/Kubectl.Tests/Kubectl.Tests.csproj
+++ b/tests/Kubectl.Tests/Kubectl.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
enable
enable
false
diff --git a/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj b/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj
index aaa8b0e27..a86c4b3af 100644
--- a/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj
+++ b/tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj
@@ -2,8 +2,8 @@
false
k8s.Tests
- net6.0
- net6.0;net48
+ net6.0;net7.0;net8.0
+ net6.0;net7.0;net8.0;net48
diff --git a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
index 6393634cb..25f2a3228 100644
--- a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
+++ b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
@@ -2,7 +2,7 @@
false
k8s.Tests
- net6.0;net7.0
+ net6.0;net7.0;net8.0
diff --git a/tests/KubernetesClient.Tests/WatchTests.cs b/tests/KubernetesClient.Tests/WatchTests.cs
index 9eee491f8..3ddf6981c 100644
--- a/tests/KubernetesClient.Tests/WatchTests.cs
+++ b/tests/KubernetesClient.Tests/WatchTests.cs
@@ -409,7 +409,12 @@ public async Task WatchServerDisconnect()
await Task.WhenAny(waitForClosed.WaitAsync(), Task.Delay(TestTimeout)).ConfigureAwait(false);
Assert.True(waitForClosed.IsSet);
Assert.False(watcher.Watching);
+
+#if NET8_0_OR_GREATER
+ Assert.IsType(exceptionCatched);
+#else
Assert.IsType(exceptionCatched);
+#endif
}
}
diff --git a/version.json b/version.json
index bfcc6cd9f..8be08d1d3 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.1",
+ "version": "12.2",
"publicReleaseRefSpec": [
"^refs/heads/master$",
"^refs/tags/v\\d+\\.\\d+\\.\\d+"