Merge pull request #56 from frontlinersnl/feature/upgrade-to-net9

feat: upgrade to net9

Author: Mastermindzh

CHANGELOG.md

@@ -5,9 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [12.0.0]
+
+- Updated to NET 9 SDK Container
+- Update to Node 20
+- Update Docker Compose to v2.29.7
+- Removed not working code coverage report generation
+- [BREAKING] Removed dotnet tools global. These are moved to the project repo as local. This makes it easier to update or change.
+- [BREAKING] Dropped NET 7 support
+
 ## [11.0.1]
 
-Added make as a dependency
+- Added make as a dependency
 
 ## [11.0.0]
 

Dockerfile

@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0
+FROM mcr.microsoft.com/dotnet/sdk:9.0
 
-# "install" the dotnet 7 runtime so we can also run the NET 7 tests
-COPY --from=mcr.microsoft.com/dotnet/sdk:7.0.404-1-bookworm-slim-amd64 /usr/share/dotnet/shared /usr/share/dotnet/shared
+# "install" the dotnet 8 runtime so we can also run the NET 8 tests
+COPY --from=mcr.microsoft.com/dotnet/sdk:8.0 /usr/share/dotnet/shared /usr/share/dotnet/shared
 
 # install base software
 RUN mkdir -p /usr/share/man/man1 \
@@ -16,7 +16,7 @@ RUN mkdir -p /usr/share/man/man1 \
   zip \
   make \
   ca-certificates \
-  && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
+  && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
   && apt-get install --no-install-recommends -y nodejs \
   && apt-get install -y --no-install-recommends nuget libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb procps\
   && apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -27,12 +27,11 @@ RUN apt-get update \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # install docker-compose
-RUN curl -L "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+RUN curl -L "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
   && chmod +x /usr/local/bin/docker-compose
 
 # install Chromium for (unit)-testing during build-phase
 RUN apt-get update && \
-  apt-get install -y --no-install-recommends libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb && \
   apt-get install -y --no-install-recommends chromium && \
   rm -rf /var/lib/apt/lists/*
 
@@ -49,12 +48,6 @@ RUN mkdir -p ~/scripts
 COPY scripts /scripts
 RUN echo "source /scripts/dotnetcore.sh" >> ~/.bashrc
 
-# install reportgenerator for code coverage
-RUN dotnet tool install -g dotnet-reportgenerator-globaltool
-RUN dotnet tool install -g dotnet-sonarscanner
-RUN dotnet tool install -g dotnet-format
-RUN dotnet tool install -g dotnet-coverage
-
 # add entrypoint and run
 COPY dotnet-build.sh /dotnet-build.sh
 COPY entrypoint.sh /entrypoint.sh

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 FRONTLINERS
+Copyright (c) 2025 FRONTLINERS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # bitbucket-pipelines dotnet-build
 
-[![logo](./logo.jpg)](https://frontliners.nl)
+[![logo](./logo.png)](https://frontliners.nl)
 
 Docker image to automate dotnet builds
 

dotnet-build.sh

@@ -48,6 +48,9 @@ rm -rf ./**/bin
 rm -rf ./**/obj
 rm -rf "$DIST"
 
+# Install dotnet tools
+dotnet tool restore
+
 # create artifacts dir
 mkdir -p "$ARTIFACTS_DIST"
 
@@ -68,14 +71,10 @@ shopt -s nocaseglob # disable casing
 echo "running tests"
 for f in *.test/*.csproj; do
   echo "Processing $f file..."
-  dotnet add "$f" package JUnitTestLogger
-  dotnet test "$f" --logger "junit" --configuration $RELEASE --results-directory "$DIST/test-results" /p:CollectCoverage=true /p:CoverletOutputFormat="opencover" /p:CoverletOutput="$DIST/test-coverlet"
+  dotnet test "$f" --configuration $RELEASE --results-directory "$DIST/test-results" /p:CollectCoverage=true /p:CoverletOutputFormat="opencover" /p:CoverletOutput="$DIST/test-coverlet"
 done
 shopt -u nocaseglob # enable casing
 
-# collect codecoverage files and generate report for sonarcloud (warning is for backwards compatability)
-reportgenerator -reports:"**/*.opencover*.xml" -targetdir:"$DIST/coverage" -reporttypes:"Cobertura;HTMLInline;HTMLChart;SonarQube" || echo -e "\033[33mWARNING: codecoverage not succesfull\033[0m"
-
 # publish
 echo "publishing $CS_PROJECT_FILE"
 dotnet publish --configuration $RELEASE --output "$PROJECT_DIST" "$CS_PROJECT_FILE"

logo.jpg

@@ -1,6 +1,6 @@
 {
   "name": "dotnet-build",
-  "version": "11.0.1",
+  "version": "12.0.0",
   "description": "[![logo](./logo.jpg)](https://frontliners.nl)",
   "main": "index.js",
   "scripts": {