Skip to content

Commit

Permalink
feat(dotnet): upgrade to .net 6.0 and upgrade kubernetes client
Browse files Browse the repository at this point in the history
  • Loading branch information
@buehler
buehler committed Dec 26, 2021
1 parent ce1e149 commit 7b4429e
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 6.0.101
- name: Test
run: ./build.sh --target test --no-logo
semantic-release:
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 6.0.101
- name: Semantic Release
uses: cycjimmy/semantic-release-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 6.0.101
- name: Test
run: ./build.sh --target test --no-logo
2 changes: 1 addition & 1 deletion .github/workflows/github-pages.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 6.0.101
- name: Setup MS Build
uses: microsoft/setup-msbuild@v1.0.3
- name: Install DocFX
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-analysis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 6.0.101

- name: Build
run: ./build.sh --target compile --no-logo
Expand Down
2 changes: 1 addition & 1 deletion build/_build.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand Down
4 changes: 2 additions & 2 deletions config/CodeAnalysis.targets
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="3.2.2" PrivateAssets="All" />
<PackageReference Include="Roslynator.Analyzers" Version="3.3.0" PrivateAssets="All" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="All" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)/stylecop.json" />
</ItemGroup>
Expand All @@ -11,4 +11,4 @@
<TreatWarningsAsErrors Condition="'$(Configuration)' == 'Release'">true</TreatWarningsAsErrors>
</PropertyGroup>

</Project>
</Project>
6 changes: 3 additions & 3 deletions config/Common.targets
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

This comment has been minimized.

Sign in to view

Copy link
@lucid-at-dream

lucid-at-dream Mar 24, 2022

Hi! KubeOps is supposed to be used as a library, right? Is it really necessary to package this as net6.0? Could it be netstandard? If not, why not have multiple targets? Packaged as it is right now I will not be able to use any version packaged with targetFramework > 5.0. Thank you!

This comment has been minimized.

Sign in to view

Copy link
@buehler

buehler Mar 24, 2022

Author Owner

Hi :-)

I tried. Sadly, we need net6.0 because of the references to asp.net stuff. So, right now, .net is required. There are discussions that target this right now.
<Nullable>enable</Nullable>
<LangVersion>9</LangVersion>
<LangVersion>10</LangVersion>
<Authors>Christoph Bühler</Authors>
<Owner>cbuehler</Owner>
</PropertyGroup>
Expand All @@ -21,4 +21,4 @@
</AssemblyAttribute>
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion src/KubeOps.Testing/KubeOps.Testing.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/KubeOps/KubeOps.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@

<ItemGroup>
<PackageReference Include="CompareNETObjects" Version="4.74.0" />
<PackageReference Include="DotnetKubernetesClient" Version="2.0.25" />
<PackageReference Include="DotnetKubernetesClient" Version="2.1.0" />
<PackageReference Include="JsonDiffPatch" Version="2.0.55" />
<PackageReference Include="Localtunnel" Version="1.0.4" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
<PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.13" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="Namotion.Reflection" Version="2.0.9" />
<PackageReference Include="prometheus-net.AspNetCore" Version="5.0.2" />
<PackageReference Include="prometheus-net.AspNetCore.HealthChecks" Version="5.0.2" />
Expand Down
4 changes: 2 additions & 2 deletions tests/KubeOps.Templates.Test/KubeOps.Templates.Test.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
Expand Down
4 changes: 2 additions & 2 deletions tests/KubeOps.Test/KubeOps.Test.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>9</LangVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
4 changes: 2 additions & 2 deletions tests/KubeOps.TestOperator.Test/KubeOps.TestOperator.Test.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>9</LangVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
2 changes: 1 addition & 1 deletion tests/KubeOps.TestOperator/KubeOps.TestOperator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>9</LangVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>CS1591</NoWarn>
Expand Down

0 comments on commit 7b4429e

Please sign in to comment.