From 9bcf068d02bf0ebeeb185d329ba12090393d8c29 Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Sun, 8 Sep 2024 21:05:58 +0200 Subject: [PATCH 1/2] :arrow_up: bumped dependencies --- .docfx/BuildDocfxImage.ps1 | 4 +- .docfx/Dockerfile.docfx | 4 +- .docfx/PublishDocfxImage.ps1 | 2 +- .github/dependabot.yml | 6 -- .github/workflows/pipelines.yml | 68 ++++++++++--------- Directory.Build.props | 14 ++-- Directory.Build.targets | 9 --- .../Codebelt.SharedKernel.csproj | 2 +- .../Codebelt.SharedKernel.Tests.csproj | 8 +-- 9 files changed, 53 insertions(+), 64 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.docfx/BuildDocfxImage.ps1 b/.docfx/BuildDocfxImage.ps1 index f8c1c88..0463932 100644 --- a/.docfx/BuildDocfxImage.ps1 +++ b/.docfx/BuildDocfxImage.ps1 @@ -1,4 +1,4 @@ -$version = minver -i +$version = minver -i -t v -v w docfx metadata docfx.json -docker buildx build -t sharedkernel-docfx:$version --platform linux/arm64,linux/amd64 --load -f Dockerfile.docfx . # --progress plain +docker buildx build -t sharedkernel-docfx:$version --platform linux/arm64,linux/amd64 --load -f Dockerfile.docfx . get-childItem -recurse -path api -include *.yml, .manifest | remove-item diff --git a/.docfx/Dockerfile.docfx b/.docfx/Dockerfile.docfx index b79cf24..f23354b 100644 --- a/.docfx/Dockerfile.docfx +++ b/.docfx/Dockerfile.docfx @@ -1,7 +1,7 @@ -FROM nginx:1.26.0-alpine AS base +FROM nginx:1.27.0-alpine AS base RUN rm -rf /usr/share/nginx/html/* -FROM codebeltnet/docfx:2.75.3 AS build +FROM codebeltnet/docfx:2.77.0 AS build ADD [".", "docfx"] diff --git a/.docfx/PublishDocfxImage.ps1 b/.docfx/PublishDocfxImage.ps1 index 26da3ba..19a8d58 100644 --- a/.docfx/PublishDocfxImage.ps1 +++ b/.docfx/PublishDocfxImage.ps1 @@ -1,3 +1,3 @@ -$version = minver -i +$version = minver -i -t v -v w docker tag sharedkernel-docfx:$version jcr.codebelt.net/geekle/sharedkernel-docfx:$version docker push jcr.codebelt.net/geekle/sharedkernel-docfx:$version diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 5ace460..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" diff --git a/.github/workflows/pipelines.yml b/.github/workflows/pipelines.yml index 04db8ce..300f402 100644 --- a/.github/workflows/pipelines.yml +++ b/.github/workflows/pipelines.yml @@ -1,14 +1,11 @@ name: Shared Kernel CI/CD Pipeline on: - push: - branches: [main] - paths-ignore: - - .codecov - - .docfx - - .github - - .nuget pull_request: branches: [main] + paths-ignore: + - .github/** + - .nuget/** + - '**.md' workflow_dispatch: inputs: configuration: @@ -24,6 +21,10 @@ jobs: build: name: 🛠️ Build runs-on: ubuntu-22.04 + strategy: + matrix: + configuration: [Debug, Release] + framework: [net8.0] outputs: version: ${{ steps.minver-calculate.outputs.version }} steps: @@ -32,13 +33,15 @@ jobs: - name: Install .NET uses: codebeltnet/install-dotnet@v1 + with: + includePreview: true - name: Install MinVer uses: codebeltnet/dotnet-tool-install-minver@v1 - id: minver-calculate name: Calculate Version - uses: codebeltnet/minver-calculate@v1 + uses: codebeltnet/minver-calculate@v2 - name: Download sharedkernel.snk file uses: codebeltnet/gcp-download-file@v1 @@ -48,17 +51,13 @@ jobs: objectName: sharedkernel.snk - name: Restore Dependencies - uses: codebeltnet/dotnet-restore@v1 - - - name: Build for Preview - uses: codebeltnet/dotnet-build@v1 - with: - configuration: Debug + uses: codebeltnet/dotnet-restore@v2 - - name: Build for Production - uses: codebeltnet/dotnet-build@v1 + - name: Build for ${{ matrix.framework }} (${{ matrix.configuration }}) + uses: codebeltnet/dotnet-build@v2 with: - configuration: Release + configuration: ${{ matrix.configuration }} + framework: ${{ matrix.framework }} pack: name: 📦 Pack @@ -67,9 +66,14 @@ jobs: matrix: configuration: [Debug, Release] needs: [build] - steps: + steps: + - name: Install .NET + uses: codebeltnet/install-dotnet@v1 + with: + includePreview: true + - name: Pack for ${{ matrix.configuration }} - uses: codebeltnet/dotnet-pack@v1 + uses: codebeltnet/dotnet-pack@v2 with: configuration: ${{ matrix.configuration }} uploadPackedArtifact: true @@ -79,8 +83,10 @@ jobs: name: 🧪 Test needs: [build] strategy: + fail-fast: false matrix: os: [ubuntu-22.04, windows-2022] + configuration: [Debug, Release] runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -88,20 +94,16 @@ jobs: - name: Install .NET uses: codebeltnet/install-dotnet@v1 + with: + includePreview: true - name: Install .NET Tool - Report Generator uses: codebeltnet/dotnet-tool-install-reportgenerator@v1 - - name: Test with Debug build - uses: codebeltnet/dotnet-test@v1 + - name: Test with ${{ matrix.configuration }} build + uses: codebeltnet/dotnet-test@v3 with: - configuration: Debug - buildSwitches: -p:SkipSignAssembly=true - - - name: Test with Release build - uses: codebeltnet/dotnet-test@v1 - with: - configuration: Release + configuration: ${{ matrix.configuration }} buildSwitches: -p:SkipSignAssembly=true sonarcloud: @@ -114,12 +116,14 @@ jobs: - name: Install .NET uses: codebeltnet/install-dotnet@v1 + with: + includePreview: true - name: Install .NET Tool - Sonar Scanner uses: codebeltnet/dotnet-tool-install-sonarscanner@v1 - name: Restore Dependencies - uses: codebeltnet/dotnet-restore@v1 + uses: codebeltnet/dotnet-restore@v2 - name: Run SonarCloud Analysis uses: codebeltnet/sonarcloud-scan@v1 @@ -130,7 +134,7 @@ jobs: version: ${{ needs.build.outputs.version }} - name: Build - uses: codebeltnet/dotnet-build@v1 + uses: codebeltnet/dotnet-build@v2 with: buildSwitches: -p:SkipSignAssembly=true uploadBuildArtifact: false @@ -166,13 +170,13 @@ jobs: uses: codebeltnet/install-dotnet@v1 - name: Restore Dependencies - uses: codebeltnet/dotnet-restore@v1 + uses: codebeltnet/dotnet-restore@v2 - name: Prepare CodeQL SAST Analysis uses: codebeltnet/codeql-scan@v1 - name: Build - uses: codebeltnet/dotnet-build@v1 + uses: codebeltnet/dotnet-build@v2 with: buildSwitches: -p:SkipSignAssembly=true uploadBuildArtifact: false diff --git a/Directory.Build.props b/Directory.Build.props index aaac6eb..a80f846 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,7 @@ Copyright © Geekle 2024. All rights reserved. gimlichael Geekle - Codebelt - Shared Kernel (DDD) + Codebelt Shared Kernel (DDD) icon.png README.md https://www.codebelt.net/ @@ -40,7 +40,7 @@ - + @@ -59,10 +59,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -71,7 +71,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Directory.Build.targets b/Directory.Build.targets index 2836c4e..b719a7f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,13 +1,4 @@  - - - <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/> - - - ..\..\.nuget\$(MSBuildProjectName)\PackageReleaseNotes.txt diff --git a/src/Codebelt.SharedKernel/Codebelt.SharedKernel.csproj b/src/Codebelt.SharedKernel/Codebelt.SharedKernel.csproj index e917480..dd2ffde 100644 --- a/src/Codebelt.SharedKernel/Codebelt.SharedKernel.csproj +++ b/src/Codebelt.SharedKernel/Codebelt.SharedKernel.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Codebelt.SharedKernel.Tests/Codebelt.SharedKernel.Tests.csproj b/test/Codebelt.SharedKernel.Tests/Codebelt.SharedKernel.Tests.csproj index db7cfd0..5c6e470 100644 --- a/test/Codebelt.SharedKernel.Tests/Codebelt.SharedKernel.Tests.csproj +++ b/test/Codebelt.SharedKernel.Tests/Codebelt.SharedKernel.Tests.csproj @@ -5,9 +5,9 @@ - - - + + + @@ -15,7 +15,7 @@ - + From 619708feb3ae65c3e60ddfea754a8e336e9b641d Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Sun, 8 Sep 2024 21:06:13 +0200 Subject: [PATCH 2/2] :speech_balloon: updated release notes and changelog --- .nuget/Codebelt.SharedKernel/PackageReleaseNotes.txt | 6 ++++++ CHANGELOG.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.nuget/Codebelt.SharedKernel/PackageReleaseNotes.txt b/.nuget/Codebelt.SharedKernel/PackageReleaseNotes.txt index 55f82bb..5323825 100644 --- a/.nuget/Codebelt.SharedKernel/PackageReleaseNotes.txt +++ b/.nuget/Codebelt.SharedKernel/PackageReleaseNotes.txt @@ -1,3 +1,9 @@ +Version: 0.3.0 +Availability: .NET 8 +  +# ALM +- CHANGED Dependencies to latest and greatest with respect to TFMs +  Version: 0.2.0 Availability: .NET 8   diff --git a/CHANGELOG.md b/CHANGELOG.md index 04093c0..caa4d08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), For more details, please refer to `PackageReleaseNotes.txt` on a per assembly basis in the `.nuget` folder. +## [0.3.0] - 2024-09-08 + +#### Codebelt.SharedKernel + +Purely an ALM release. No changes to the codebase. + ## [0.2.0] - 2024-04-11 ### Added