Skip to content

Commit e45fa77

Browse files
authored
add net6 targets (#745)
* add net6 targets * move to net6 builtin format * e2e target * make codeql happy
1 parent f515fb4 commit e45fa77

File tree

6 files changed

+31
-11
lines changed

6 files changed

+31
-11
lines changed

.github/workflows/buildtest.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ jobs:
1111
- uses: actions/checkout@v2
1212
with:
1313
fetch-depth: 0
14-
- name: Setup dotnet SDK 2.1
15-
uses: actions/setup-dotnet@v1
16-
with:
17-
dotnet-version: '2.1.x'
1814
- name: Setup dotnet SDK 3.1
1915
uses: actions/setup-dotnet@v1
2016
with:
@@ -23,12 +19,14 @@ jobs:
2319
uses: actions/setup-dotnet@v1
2420
with:
2521
dotnet-version: '5.0.x'
26-
- name: Setup Format
27-
run: dotnet tool install -g dotnet-format
22+
- name: Setup dotnet SDK 6
23+
uses: actions/setup-dotnet@v1
24+
with:
25+
dotnet-version: '6.0.x'
2826
- name: Check Format
2927
# don't check formatting on Windows b/c of CRLF issues.
30-
if: matrix.os != 'windows-latest'
31-
run: dotnet format --check --exclude ./src/KubernetesClient/generated/
28+
if: matrix.os == 'ubuntu-latest'
29+
run: dotnet format --severity error --verify-no-changes --exclude ./src/KubernetesClient/generated/
3230
- name: Build
3331
run: dotnet build --configuration Release
3432
- name: Test
@@ -52,6 +50,10 @@ jobs:
5250
uses: actions/setup-dotnet@v1
5351
with:
5452
dotnet-version: '5.0.x'
53+
- name: Setup dotnet SDK 6
54+
uses: actions/setup-dotnet@v1
55+
with:
56+
dotnet-version: '6.0.x'
5557
- name: Minikube
5658
run: minikube start
5759
- name: Test

.github/workflows/codeql-analysis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@ jobs:
2525
with:
2626
fetch-depth: 0
2727

28+
- name: Setup dotnet SDK 3.1
29+
uses: actions/setup-dotnet@v1
30+
with:
31+
dotnet-version: '3.1.x'
32+
- name: Setup dotnet SDK 5
33+
uses: actions/setup-dotnet@v1
34+
with:
35+
dotnet-version: '5.0.x'
36+
- name: Setup dotnet SDK 6
37+
uses: actions/setup-dotnet@v1
38+
with:
39+
dotnet-version: '6.0.x'
40+
2841
# Initializes the CodeQL tools for scanning.
2942
- name: Initialize CodeQL
3043
uses: github/codeql-action/init@v1

.github/workflows/nuget.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ jobs:
2424
with:
2525
dotnet-version: 5.0.x
2626

27+
- name: .NET 6.x SDK
28+
uses: actions/setup-dotnet@v1
29+
with:
30+
dotnet-version: 6.0.x
31+
2732
- name: dotnet restore
2833
run: dotnet restore --verbosity minimal --configfile nuget.config
2934

src/KubernetesClient/KubernetesClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageIconUrl>https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png</PackageIconUrl>
1111
<PackageTags>kubernetes;docker;containers;</PackageTags>
1212

13-
<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
13+
<TargetFrameworks>netstandard2.1;net5;net6</TargetFrameworks>
1414
<RootNamespace>k8s</RootNamespace>
1515
<SignAssembly>true</SignAssembly>
1616
<GenerateDocumentationFile>true</GenerateDocumentationFile>

tests/E2E.Tests/E2E.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<IsPackable>false</IsPackable>
44
<SignAssembly>true</SignAssembly>
55
<RootNamespace>k8s.E2E</RootNamespace>
6-
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
77
</PropertyGroup>
88

99
<ItemGroup>

tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<LangVersion>8</LangVersion>
55
<SignAssembly>true</SignAssembly>
66
<RootNamespace>k8s.Tests</RootNamespace>
7-
<TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
88
</PropertyGroup>
99

1010
<ItemGroup>

0 commit comments

Comments
 (0)