Merge branch 'develop' into 'master'

Add dotnet 6.0

See merge request !76

Makefile

@@ -29,7 +29,7 @@ php-unit-test: php-unit-test_5.6 php-unit-test_7.0 php-unit-test_7.1 php-unit-te
 mobile: android-build-server
 static-code-analysis: static-code-analysis_latest static-code-analysys_php static-code-analysys_python static-code-analysys_android
 utility: alpine-ssh-client merge-request-check
-dotnet: dotnet_3.1 dotnet_5.0
+dotnet: dotnet_3.1 dotnet_6.0
 
 # PHP Lint Images
 ####################
@@ -144,9 +144,8 @@ dependency-check: dependency-check/Dockerfile
 dotnet_3.1: dotnet-build-server/3.1/Dockerfile
 	docker build $(BUILD_ARGS) -t ${REPO_ORG}/dotnet-build-server:3.1 -f dotnet-build-server/3.1/Dockerfile dotnet-build-server/3.1/
 
-dotnet_5.0: dotnet-build-server/5.0/Dockerfile
-	docker build $(BUILD_ARGS) -t ${REPO_ORG}/dotnet-build-server:5.0 -f dotnet-build-server/5.0/Dockerfile dotnet-build-server/5.0/
-
+dotnet_6.0: dotnet-build-server/6.0/Dockerfile
+	docker build $(BUILD_ARGS) -t ${REPO_ORG}/dotnet-build-server:6.0 -f dotnet-build-server/6.0/Dockerfile dotnet-build-server/6.0/
 
 #IMAGES_TO_SCAN = $(shell docker images --format '{{.Repository}}:{{.Tag}}' | grep unl-its )
 #security:

dotnet-build-server/5.0/Dockerfile → dotnet-build-server/6.0/Dockerfile

-FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim
+FROM mcr.microsoft.com/dotnet/sdk:6.0
 
 ARG BUILD_DATE
 ARG VCS_REF
 ARG VERSION
 LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.name="dotnet SDK 5.0" \
-      org.label-schema.description="Docker image to build .NET core 5.0 applications" \
+      org.label-schema.name="dotnet SDK 6.0" \
+      org.label-schema.description="Docker image to build .NET core 6.0 applications" \
       org.label-schema.vcs-ref=$VCS_REF \
       org.label-schema.vendor="University of Nebraska - Lincoln" \
       org.label-schema.version="0.1.2" \