From 99541c6633c679d0144fe8c8fa75a6c1e22fe15c Mon Sep 17 00:00:00 2001 From: Teun Leijten Date: Wed, 13 Nov 2024 17:27:00 +0100 Subject: [PATCH] feat: upgrade to net9 --- CHANGELOG.md | 9 ++++++++- Dockerfile | 16 +++++----------- dotnet-build.sh | 6 ++++++ package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38e5ec1..698c487 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,16 @@ 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 to v2.29.7 +- [BREAKING] Dropped NET 7 support + ## [11.0.1] -Added make as a dependency +- Added make as a dependency ## [11.0.0] diff --git a/Dockerfile b/Dockerfile index 6ab44e2..fc979f3 100644 --- a/Dockerfile +++ b/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,7 +27,7 @@ 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 @@ -49,12 +49,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 diff --git a/dotnet-build.sh b/dotnet-build.sh index 261f0fd..03ff3cd 100644 --- a/dotnet-build.sh +++ b/dotnet-build.sh @@ -48,6 +48,12 @@ rm -rf ./**/bin rm -rf ./**/obj rm -rf "$DIST" +# Install dotnet tools +dotnet tool install -g dotnet-reportgenerator-globaltool +dotnet tool install -g dotnet-sonarscanner +dotnet tool install -g dotnet-format +dotnet tool install -g dotnet-coverage + # create artifacts dir mkdir -p "$ARTIFACTS_DIST" diff --git a/package-lock.json b/package-lock.json index cad4c77..a86a0de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dotnet-build", - "version": "11.0.0", + "version": "12.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dotnet-build", - "version": "11.0.0", + "version": "12.0.0", "license": "ISC" } } diff --git a/package.json b/package.json index 7c2738a..7fb69af 100644 --- a/package.json +++ b/package.json @@ -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": {