diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml index 4cc49d252..05f4aca88 100644 --- a/.github/workflows/buildtest.yaml +++ b/.github/workflows/buildtest.yaml @@ -23,7 +23,7 @@ jobs: - name: Test run: dotnet test --configuration Release --collect:"Code Coverage;Format=Cobertura" --logger trx --results-directory TestResults --settings CodeCoverage.runsettings --no-build - name: Upload coverage to Codecov - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 + uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1 with: directory: ./TestResults files: '*.cobertura.xml' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 56a4faedb..629df6cdd 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -64,7 +64,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3 + uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -84,4 +84,4 @@ jobs: run: dotnet build --configuration Debug --no-restore - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3 + uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2 diff --git a/Directory.Packages.props b/Directory.Packages.props index 00fcc0169..3a19d0c19 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,29 +8,30 @@ - - - - - + + + + + - - + + - + + - - + + @@ -45,8 +46,8 @@ - - + + diff --git a/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj b/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj index 84522ab7c..c9d631ba9 100644 --- a/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj +++ b/examples/workerServiceDependencyInjection/workerServiceDependencyInjection.csproj @@ -7,5 +7,6 @@ + diff --git a/tests/KubernetesClient.Tests/AuthTests.cs b/tests/KubernetesClient.Tests/AuthTests.cs index 23abf6208..79c90e9ff 100644 --- a/tests/KubernetesClient.Tests/AuthTests.cs +++ b/tests/KubernetesClient.Tests/AuthTests.cs @@ -21,7 +21,6 @@ using System.Text; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests { diff --git a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj index 1f58cb54d..c7b0bea60 100644 --- a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj +++ b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj @@ -6,7 +6,6 @@ - @@ -19,11 +18,12 @@ + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs b/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs index 96561a509..927474c8a 100644 --- a/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs +++ b/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests { diff --git a/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs b/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs index a8b159a48..cde2692c0 100644 --- a/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs +++ b/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs @@ -7,7 +7,6 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests.LeaderElection { diff --git a/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs b/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs index 39e0bb94a..53d6ed449 100644 --- a/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs +++ b/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; using System; using System.Reactive.Disposables; -using Xunit.Abstractions; +using Xunit; namespace k8s.Tests.Logging { diff --git a/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs b/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs index 48f0b83f8..fc6eb5f88 100644 --- a/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs +++ b/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; using System; -using Xunit.Abstractions; +using Xunit; namespace k8s.Tests.Logging { diff --git a/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs b/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs index 4f94343c9..78a8d8681 100644 --- a/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs +++ b/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; using System; -using Xunit.Abstractions; +using Xunit; namespace k8s.Tests.Logging { diff --git a/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs b/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs index 67a1bd72c..6a8dded98 100644 --- a/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs +++ b/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using Xunit.Abstractions; +using Xunit; namespace k8s.Tests.Mock { diff --git a/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs b/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs index 983c37e9b..6e9034a8e 100644 --- a/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs +++ b/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs @@ -1,18 +1,15 @@ using System.Runtime.InteropServices; using Xunit; +using Xunit.v3; namespace k8s.Tests { - public class OperatingSystemDependentFactAttribute : FactAttribute + public class OperatingSystemDependentFactAttribute : FactAttribute, IFactAttribute { public OperatingSystems Include { get; set; } = OperatingSystems.Linux | OperatingSystems.Windows | OperatingSystems.OSX; public OperatingSystems Exclude { get; set; } - public override string Skip - { - get => IsOS(Include) && !IsOS(Exclude) ? null : "Not compatible with current OS"; - set { } - } + string IFactAttribute.Skip => IsOS(Include) && !IsOS(Exclude) ? null : "Not compatible with current OS"; private bool IsOS(OperatingSystems operatingSystems) { diff --git a/tests/KubernetesClient.Tests/PodExecTests.cs b/tests/KubernetesClient.Tests/PodExecTests.cs index d37e098e8..e6305c4df 100644 --- a/tests/KubernetesClient.Tests/PodExecTests.cs +++ b/tests/KubernetesClient.Tests/PodExecTests.cs @@ -14,7 +14,6 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests { diff --git a/tests/KubernetesClient.Tests/SerializationTests.cs b/tests/KubernetesClient.Tests/SerializationTests.cs index b11cba313..4427f69d5 100644 --- a/tests/KubernetesClient.Tests/SerializationTests.cs +++ b/tests/KubernetesClient.Tests/SerializationTests.cs @@ -3,7 +3,6 @@ using System.Text.Json.Serialization; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests { diff --git a/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs b/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs index bdd315ed2..375ea96f8 100644 --- a/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs +++ b/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs @@ -2,7 +2,6 @@ using k8s.Tests.Mock; using System.Text.Json; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests { diff --git a/tests/KubernetesClient.Tests/WatchTests.cs b/tests/KubernetesClient.Tests/WatchTests.cs index 53259d770..2b55596f5 100644 --- a/tests/KubernetesClient.Tests/WatchTests.cs +++ b/tests/KubernetesClient.Tests/WatchTests.cs @@ -12,7 +12,6 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests { diff --git a/tests/KubernetesClient.Tests/WebSocketTestBase.cs b/tests/KubernetesClient.Tests/WebSocketTestBase.cs index 6766cc585..b0d2ba7de 100644 --- a/tests/KubernetesClient.Tests/WebSocketTestBase.cs +++ b/tests/KubernetesClient.Tests/WebSocketTestBase.cs @@ -14,7 +14,6 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -using Xunit.Abstractions; namespace k8s.Tests {