Support for more runtime versions (#6)

andreaslampe · web-flow · commit d3287dd9a2bf · 2025-10-27T22:46:37.000+01:00
* Fix workflows (cherry picked from commit 5c3f4ea) * Try to fix extract licenses (cherry picked from commit ca41de7) * Try again * and again * Added mor runtime targets * Added more runtime targets
diff --git a/.github/actions/collect-licenses/action.yml b/.github/actions/collect-licenses/action.yml
@@ -0,0 +1,58 @@
+name: 'Collect NuGet Licenses'
+description: 'Generates a Markdown file containing license information for used NuGet packages.'
+author: 'maintainers'
+inputs:
+  project:
+    description: 'Path to the project file (.csproj) or solution (.sln)'
+    required: true
+  output-file:
+    description: 'Output file for the license list'
+    required: false
+    default: 'licenses.md'
+  nuget-license-version:
+    description: 'Version of the nuget-license tool'
+    required: false
+    default: '4.0.0'
+outputs:
+  license_file:
+    description: 'Path to the generated license file'
+runs:
+  using: 'composite'
+  steps:
+    - name: Ensure .NET SDK is available
+      shell: bash
+      run: |
+        if ! command -v dotnet >/dev/null 2>&1; then
+          echo 'Dotnet SDK not found. Please run actions/setup-dotnet earlier in the workflow.' >&2
+          exit 1
+        fi
+    - name: Install nuget-license tool
+      shell: bash
+      run: |
+        set -euo pipefail
+        TOOL_PATH=".tools"
+        mkdir -p "$TOOL_PATH"
+        VERSION="${{ inputs.nuget-license-version }}"
+        dotnet tool install --tool-path "$TOOL_PATH" nuget-license --version "$VERSION" \
+          || dotnet tool update --tool-path "$TOOL_PATH" nuget-license --version "$VERSION"
+    - name: Generate license file
+      id: gen
+      shell: bash
+      run: |
+        set -euo pipefail
+        EXE=".tools/nuget-license"
+        if [ ! -x "$EXE" ] && [ -f ".tools/nuget-license.exe" ]; then EXE=".tools/nuget-license.exe"; fi
+        if [ ! -f "$EXE" ]; then echo 'nuget-license tool not found' >&2; exit 1; fi
+        PROJECT="${{ inputs.project }}"
+        OUT_FILE="${{ inputs.output-file }}"
+        echo "Starting license collection for $PROJECT -> $OUT_FILE"
+        set +e
+        "$EXE" -i "$PROJECT" -fo "$OUT_FILE" -o Markdown
+        EXIT_CODE=$?
+        set -e
+        if [ ! -f "$OUT_FILE" ]; then echo 'License file was not generated' >&2; exit 1; fi
+        if [ $EXIT_CODE -ne 0 ]; then
+          echo "Warning: nuget-license exited with code $EXIT_CODE (possibly missing license info)." >&2
+        fi
+        echo "license_file=$OUT_FILE" >> "$GITHUB_OUTPUT"
+        echo "Licenses collected at $OUT_FILE"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,7 @@
 name: CI
+  
+permissions:
+  contents: read
 
 on:
   pull_request:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,7 +1,6 @@
 name: Release
 
 on:
-  workflow_dispatch: {}
   push:
     tags:
       - 'v*'
@@ -22,33 +21,43 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Ensure tag commit is on main
+        shell: bash
+        run: |
+          set -euo pipefail
+          git fetch origin main --quiet
+          if ! git merge-base --is-ancestor "$GITHUB_SHA" origin/main; then
+            echo "Tag commit is not part of main. Aborting." >&2
+            exit 1
+          fi
+            echo "Tag commit is on main."
       - name: Validate tag and set version
         id: set_version
         shell: bash
         run: |
           set -euo pipefail
           if [[ "${GITHUB_REF}" != refs/tags/v* ]]; then
-            echo "Error: Workflow muss durch einen Tag 'v*' gestartet werden." >&2
+            echo "Error: Workflow must be triggered by a tag 'v*'." >&2
             exit 1
           fi
           ver="${GITHUB_REF#refs/tags/v}"
-          echo "Release-Version: $ver"
+          echo "Release version: $ver"
           echo "release_version=$ver" >> "$GITHUB_OUTPUT"
-      - name: Show previous tag diff (informativ)
+      - name: Show previous tag diff (informational)
         shell: bash
         run: |
           git fetch --tags --quiet
           current="${GITHUB_REF#refs/tags/}"
-          prev=$(git tag --sort=-creatordate | grep -v "^${current}$" | head -n1 || true)
+            prev=$(git tag --sort=-creatordate | grep -v "^${current}$" | head -n1 || true)
           if [[ -z "$prev" ]]; then
-            echo "Erster Release-Tag (kein vorheriger Tag gefunden)."
+            echo "First release tag (no previous tag found)."
             exit 0
           fi
           diffCount=$(git diff --name-only "$prev" "$current" | wc -l | tr -d ' ')
           if [[ "$diffCount" == "0" ]]; then
-            echo "Warnung: Keine Änderungen zwischen $prev und $current." >&2
+            echo "Warning: No changes between $prev and $current." >&2
           else
-            echo "Geänderte Dateien seit $prev: $diffCount"
+            echo "Changed files since $prev: $diffCount"
           fi
 
   build_and_package:
@@ -60,6 +69,16 @@ jobs:
         include:
           - os: windows-latest
             rid: win-x86
+          - os: windows-latest
+            rid: win-x64
+          - os: ubuntu-latest
+            rid: linux-x64
+          - os: ubuntu-latest
+            rid: linux-arm64
+          - os: macos-13
+            rid: osx-x64
+          - os: macos-latest
+            rid: osx-arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -84,20 +103,12 @@ jobs:
           $outDir = Join-Path $workspace (Join-Path 'publish' $rid)
           Write-Host "Publishing for $rid (ReleaseVersion=${{ needs.version.outputs.release_version }})"
           dotnet publish MailAgent/MailAgent.csproj -c Release -r $rid /p:PublishSingleFile=true /p:PublishTrimmed=false /p:SelfContained=true -o $outDir
-#      - name: Collect licenses
-#        shell: pwsh
-#        run: |
-#          $workspace='${{ github.workspace }}'
-#          $toolPath = Join-Path $workspace '.tools'
-#          if (-Not (Test-Path $toolPath)) { New-Item -ItemType Directory -Path $toolPath | Out-Null }
-#          dotnet tool install --tool-path $toolPath nuget-license --version 4.0.0 || dotnet tool update --tool-path $toolPath nuget-license --version 4.0.0
-#          $exe = Join-Path $toolPath 'nuget-license.exe'
-#          if (-Not (Test-Path $exe)) { $exe = Join-Path $toolPath 'nuget-license' }
-#          if (-Not (Test-Path $exe)) { Write-Error "nuget-license not found at $toolPath"; exit 1 }
-#          $outFile = Join-Path $toolPath 'licenses.md'
-#          & $exe -i MailAgent/MailAgent.csproj -fo $outFile -o Markdown
-#          if (-Not (Test-Path $outFile)) { Write-Error "License file not generated"; exit 1 }
-#          Write-Host "Licenses collected at $outFile"
+      - name: Collect licenses
+        id: collect_licenses
+        uses: ./.github/actions/collect-licenses
+        with:
+          project: MailAgent/MailAgent.csproj
+          output-file: licenses.md
       - name: Prepare artifact folder
         shell: pwsh
         run: |
@@ -114,8 +125,9 @@ jobs:
           Copy-Item -Path (Join-Path $publishDir '*') -Destination $artifactDir -Recurse -Force
           $extras = @('MailAgent/readme.md','MailAgent/install.bat','MailAgent/uninstall.bat')
           foreach ($e in $extras) { $full = Join-Path $workspace $e; if (Test-Path $full) { Copy-Item -Path $full -Destination $artifactDir -Force } }
-#          $toolLic = Join-Path $workspace '.tools/licenses.md'
-#          if (Test-Path $toolLic) { Copy-Item -Path $toolLic -Destination (Join-Path $artifactDir 'licenses.md') -Force }
+          # Copy collected license file (composite action output)
+          $licenseFile = Join-Path $workspace 'licenses.md'
+          if (Test-Path $licenseFile) { Copy-Item -Path $licenseFile -Destination (Join-Path $artifactDir 'licenses.md') -Force }
       - name: Create ZIP package
         shell: pwsh
         run: |
@@ -191,7 +203,7 @@ jobs:
             log=$(git log "$prev".."$currentCommit" --pretty=format:'* %h %s' | head -n200)
             if [[ -z "$log" ]]; then notes="No commit differences from $prev."; else notes="Changes since $prev:\n$log"; fi
           fi
-          safe=$(echo "$notes" | sed ':a;N;$!ba;s/\r//g' | sed 's/$/%0A/'); safe=${safe%"%0A"}
+          safe=$(echo "$notes" | sed ':a;N;$!ba;s/\r//g' | sed 's/$/%0A/'); safe=${safe%%%0A}
           echo "changelog=$safe" >> $GITHUB_OUTPUT
       - name: Create release
         env:
diff --git a/MailAgent/MailAgent.csproj b/MailAgent/MailAgent.csproj
@@ -16,7 +16,8 @@
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
     <Version>2.2.3</Version>
     <UserSecretsId>8eae55bd-49a1-4a01-953b-c7fe16dd357b</UserSecretsId>
-    <PlatformTarget>x86</PlatformTarget>
+    <Platforms>AnyCPU;x86;x64</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <LangVersion>latestmajor</LangVersion>
     <AssemblyVersion>3.0.0</AssemblyVersion>
     <FileVersion>3.0.0</FileVersion>
@@ -80,6 +81,7 @@
     </None>
     <None Remove="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Remove="obj\**" />
+    <None Remove="publish_multi\**" />
   </ItemGroup>
 
   <ItemGroup>
