Bump .NET SDK to net6.0

Author: ccheetham

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Dockerfile

@@ -1,11 +1,11 @@
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
 WORKDIR /source
 COPY . .
 RUN dotnet restore
 RUN dotnet publish -c release -o /srv --no-restore
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine
+FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine
 ARG templates_version=1.3.0-g46d70c9f41
 RUN dotnet nuget add source https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/dev/nuget/v3/index.json -n SteeltoeDev
 RUN dotnet new --install Steeltoe.NetCoreTool.Templates::${templates_version} &&\

azure-pipelines.yaml

@@ -25,10 +25,10 @@ stages:
           vmImage: ubuntu-latest
         steps:
           - task: UseDotNet@2
-            displayName: 'Use .NET Core SDK 5.0'
+            displayName: 'Use .NET Core SDK 6.0'
             inputs:
               packageType: sdk
-              version: 5.0.x
+              version: 6.0.x
           - task: DotNetCoreCLI@2
             displayName: dotnet restore
             inputs:

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.0",
+    "version": "6.0.0",
     "rollForward": "latestFeature"
   }
 }

src/NetCoreToolService/Startup.cs

@@ -11,6 +11,7 @@
 using Microsoft.OpenApi.Models;
 using Steeltoe.Common.Utils.Diagnostics;
 using Steeltoe.Management.Endpoint;
+using System.Text.Json.Serialization;
 
 namespace Steeltoe.NetCoreToolService
 {
@@ -41,7 +42,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers().AddJsonOptions(options =>
             {
-                options.JsonSerializerOptions.IgnoreNullValues = true;
+                options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
                 options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
             });
             services.AddTransient<ICommandExecutor, CommandExecutor>();

test/Common.Utils.Test/Diagnostics/CommandExecutorTest.cs

@@ -25,7 +25,7 @@ public async void UnsuccessfulCommandShouldNotReturn0()
         {
             var result = await _commandExecutor.ExecuteAsync("dotnet --no-such-option");
             Assert.NotEqual(0, result.ExitCode);
-            Assert.Contains("Unknown option: --no-such-option", result.Error);
+            Assert.Contains("--no-such-option does not exist", result.Error);
         }
 
         [Fact]

test/Common.Utils.Test/IO/Steeltoe.Common.IO.Test.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;</TargetFrameworks>
-  </PropertyGroup>
-
-  <Import Project="..\..\..\..\versions.props" />
-  <Import Project="..\..\..\..\sharedtest.props" />
 
   <ItemGroup>
     <None Update="xunit.runner.json">

test/Common.Utils.Test/Steeltoe.Common.Utils.Test.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Common.Utils\Steeltoe.Common.Utils.csproj" />
   </ItemGroup>