Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/buildtest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup dotnet SDK 2.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: '2.1.x'
- name: Setup dotnet SDK 3.1
uses: actions/setup-dotnet@v1
with:
Expand All @@ -23,12 +19,14 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
- name: Setup Format
run: dotnet tool install -g dotnet-format
- name: Setup dotnet SDK 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- name: Check Format
# don't check formatting on Windows b/c of CRLF issues.
if: matrix.os != 'windows-latest'
run: dotnet format --check --exclude ./src/KubernetesClient/generated/
if: matrix.os == 'ubuntu-latest'
run: dotnet format --severity error --verify-no-changes --exclude ./src/KubernetesClient/generated/
- name: Build
run: dotnet build --configuration Release
- name: Test
Expand All @@ -52,6 +50,10 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
- name: Setup dotnet SDK 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- name: Minikube
run: minikube start
- name: Test
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@ jobs:
with:
fetch-depth: 0

- name: Setup dotnet SDK 3.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.x'
- name: Setup dotnet SDK 5
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
- name: Setup dotnet SDK 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/nuget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
with:
dotnet-version: 5.0.x

- name: .NET 6.x SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

- name: dotnet restore
run: dotnet restore --verbosity minimal --configfile nuget.config

Expand Down
2 changes: 1 addition & 1 deletion src/KubernetesClient/KubernetesClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageIconUrl>https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png</PackageIconUrl>
<PackageTags>kubernetes;docker;containers;</PackageTags>

<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net5;net6</TargetFrameworks>
<RootNamespace>k8s</RootNamespace>
<SignAssembly>true</SignAssembly>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion tests/E2E.Tests/E2E.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<RootNamespace>k8s.E2E</RootNamespace>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<LangVersion>8</LangVersion>
<SignAssembly>true</SignAssembly>
<RootNamespace>k8s.Tests</RootNamespace>
<TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down