add net6 targets (#745)

* add net6 targets

* move to net6 builtin format

* e2e target

* make codeql happy
This commit is contained in:
Boshi Lian
2021-11-15 19:39:25 -08:00
committed by GitHub
parent f515fb4d76
commit e45fa773ba
6 changed files with 31 additions and 11 deletions

View File

@@ -11,10 +11,6 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 0 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 - name: Setup dotnet SDK 3.1
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
@@ -23,12 +19,14 @@ jobs:
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: '5.0.x' dotnet-version: '5.0.x'
- name: Setup Format - name: Setup dotnet SDK 6
run: dotnet tool install -g dotnet-format uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- name: Check Format - name: Check Format
# don't check formatting on Windows b/c of CRLF issues. # don't check formatting on Windows b/c of CRLF issues.
if: matrix.os != 'windows-latest' if: matrix.os == 'ubuntu-latest'
run: dotnet format --check --exclude ./src/KubernetesClient/generated/ run: dotnet format --severity error --verify-no-changes --exclude ./src/KubernetesClient/generated/
- name: Build - name: Build
run: dotnet build --configuration Release run: dotnet build --configuration Release
- name: Test - name: Test
@@ -52,6 +50,10 @@ jobs:
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: '5.0.x' dotnet-version: '5.0.x'
- name: Setup dotnet SDK 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- name: Minikube - name: Minikube
run: minikube start run: minikube start
- name: Test - name: Test

View File

@@ -25,6 +25,19 @@ jobs:
with: with:
fetch-depth: 0 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. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v1 uses: github/codeql-action/init@v1

View File

@@ -24,6 +24,11 @@ jobs:
with: with:
dotnet-version: 5.0.x dotnet-version: 5.0.x
- name: .NET 6.x SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
- name: dotnet restore - name: dotnet restore
run: dotnet restore --verbosity minimal --configfile nuget.config run: dotnet restore --verbosity minimal --configfile nuget.config

View File

@@ -10,7 +10,7 @@
<PackageIconUrl>https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png</PackageIconUrl> <PackageIconUrl>https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png</PackageIconUrl>
<PackageTags>kubernetes;docker;containers;</PackageTags> <PackageTags>kubernetes;docker;containers;</PackageTags>
<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks> <TargetFrameworks>netstandard2.1;net5;net6</TargetFrameworks>
<RootNamespace>k8s</RootNamespace> <RootNamespace>k8s</RootNamespace>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

View File

@@ -3,7 +3,7 @@
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<RootNamespace>k8s.E2E</RootNamespace> <RootNamespace>k8s.E2E</RootNamespace>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -4,7 +4,7 @@
<LangVersion>8</LangVersion> <LangVersion>8</LangVersion>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<RootNamespace>k8s.Tests</RootNamespace> <RootNamespace>k8s.Tests</RootNamespace>
<TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>