Merge pull request #607 from TomGrobbe/development

vMenu v3.8.8

Author: cm8263

.github/workflows/build.yml

@@ -3,7 +3,8 @@ name: CI/CD
 on:
   push:
     branches:
-      - '**'
+      - "**"
+  pull_request:
 
 permissions:
   contents: write
@@ -29,10 +30,11 @@ jobs:
     runs-on: windows-latest
 
     outputs:
-      semver:       ${{ steps.version.outputs.semver }}
-      tag:          ${{ steps.version.outputs.tag }}
+      semver:        ${{ steps.version.outputs.semver }}
+      assembly_ver:  ${{ steps.version.outputs.assembly_ver }}
+      tag:           ${{ steps.version.outputs.tag }}
       is_prerelease: ${{ steps.version.outputs.is_prerelease }}
-      zip_name:     ${{ steps.version.outputs.zip_name }}
+      zip_name:      ${{ steps.version.outputs.zip_name }}
 
     steps:
       - name: Checkout
@@ -44,7 +46,7 @@ jobs:
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/development'
         uses: gittools/actions/gitversion/setup@v3.0.0
         with:
-          versionSpec: '5.x'
+          versionSpec: "5.x"
 
       - name: Execute GitVersion
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/development'
@@ -57,24 +59,28 @@ jobs:
         run: |
           if [ "$GITHUB_REF" = "refs/heads/master" ]; then
             SEMVER="${{ steps.gitversion.outputs.semVer }}"
+            ASSEMBLY_VER="${{ steps.gitversion.outputs.assemblySemVer }}"
             TAG="v$SEMVER"
             IS_PRERELEASE="false"
           elif [ "$GITHUB_REF" = "refs/heads/development" ]; then
             MMP="${{ steps.gitversion.outputs.majorMinorPatch }}"
             SHORT_SHA="${{ steps.gitversion.outputs.shortSha }}"
-            SEMVER="${MMP}-dev-${SHORT_SHA}"
+            SEMVER="${MMP}-dev-${{ github.run_number }}-${SHORT_SHA}"
+            ASSEMBLY_VER="${{ steps.gitversion.outputs.assemblySemVer }}"
             TAG="dev-v${SEMVER}"
             IS_PRERELEASE="true"
           else
             SEMVER=""
+            ASSEMBLY_VER=""
             TAG=""
             IS_PRERELEASE="false"
           fi
           ZIP_NAME="vMenu-${SEMVER:-dev-${{ github.run_number }}}.zip"
-          echo "semver=$SEMVER"             >> "$GITHUB_OUTPUT"
-          echo "tag=$TAG"                   >> "$GITHUB_OUTPUT"
+          echo "semver=$SEMVER"               >> "$GITHUB_OUTPUT"
+          echo "assembly_ver=$ASSEMBLY_VER"   >> "$GITHUB_OUTPUT"
+          echo "tag=$TAG"                     >> "$GITHUB_OUTPUT"
           echo "is_prerelease=$IS_PRERELEASE" >> "$GITHUB_OUTPUT"
-          echo "zip_name=$ZIP_NAME"         >> "$GITHUB_OUTPUT"
+          echo "zip_name=$ZIP_NAME"           >> "$GITHUB_OUTPUT"
 
   # ============================================================
   # BUILD — runs on every branch
@@ -94,12 +100,22 @@ jobs:
         run: dotnet restore vMenu.sln
 
       - name: Build
-        run: dotnet build vMenu.sln -c Release --no-restore
+        shell: bash
+        run: |
+          SEMVER="${{ needs.version.outputs.semver }}"
+          ASSEMBLY_VER="${{ needs.version.outputs.assembly_ver }}"
+          if [ -n "$SEMVER" ] && [ -n "$ASSEMBLY_VER" ]; then
+            dotnet build vMenu.sln -c Release --no-restore \
+              -p:Version="$SEMVER" \
+              -p:AssemblyVersion="$ASSEMBLY_VER" \
+              -p:FileVersion="$ASSEMBLY_VER"
+          else
+            dotnet build vMenu.sln -c Release --no-restore
+          fi
 
-      - name: Download fxmanifest.lua
+      - name: Copy fxmanifest.lua
         shell: pwsh
-        run: |
-          Invoke-WebRequest -OutFile 'build/vMenu/fxmanifest.lua' 'https://vespura.com/vmenu/fxmanifest.lua'
+        run: Copy-Item 'assets/fxmanifest.lua' 'build/vMenu/fxmanifest.lua' -Force
 
       - name: Inject version into fxmanifest.lua
         shell: pwsh
@@ -157,9 +173,9 @@ jobs:
         run: |
           LAST_TAG=$(git tag --sort=-version:refname | grep -v '^dev-' | head -n 1)
           if [ -n "$LAST_TAG" ]; then
-            git log "$LAST_TAG..HEAD" --pretty=format:"- %s" --no-merges > changelog.txt
+            git log "$LAST_TAG..HEAD" --pretty=format:'- `%h` (%an) %s' > changelog.txt
           else
-            git log --pretty=format:"- %s" --no-merges > changelog.txt
+            git log --pretty=format:'- `%h` (%an) %s' > changelog.txt
           fi
           echo "Changelog since: ${LAST_TAG:-<beginning>}"
           cat changelog.txt
@@ -184,22 +200,34 @@ jobs:
           TAG="${{ needs.version.outputs.tag }}"
           IS_PRERELEASE="${{ needs.version.outputs.is_prerelease }}"
 
-          {
-            echo "vMenu release v${VERSION}."
-            echo ""
-            echo "## Changes"
-            cat changelog.txt
-          } > release_notes.md
+          if [ "$IS_PRERELEASE" = "true" ]; then
+            {
+              echo "vMenu pre-release v${VERSION}."
+              echo ""
+              echo "<details><summary>Changes since last full version release</summary>"
+              echo ""
+              cat changelog.txt
+              echo ""
+              echo "</details>"
+            } > release_notes.md
+          else
+            {
+              echo "vMenu release v${VERSION}."
+              echo ""
+              echo "## Changes"
+              cat changelog.txt
+            } > release_notes.md
+          fi
 
-          PRERELEASE_FLAG=""
+          EXTRA_FLAGS=""
           if [ "$IS_PRERELEASE" = "true" ]; then
-            PRERELEASE_FLAG="--prerelease"
+            EXTRA_FLAGS="--prerelease --draft"
           fi
 
           RELEASE_URL=$(gh release create "$TAG" \
             --title "vMenu $VERSION" \
             --notes-file release_notes.md \
-            $PRERELEASE_FLAG \
+            $EXTRA_FLAGS \
             "release-assets/${{ needs.version.outputs.zip_name }}")
 
           echo "release_url=$RELEASE_URL" >> "$GITHUB_OUTPUT"

SharedClasses/PermissionsManager.cs

@@ -331,6 +331,8 @@ public enum Permission
             WPHackingDevice,
             // MP2024_01 DLC (V 3258)
             WPStunRod,
+            // MP2025_02 DLC (V 3717)
+            WPNewspaper,
             #endregion
 
             // Weapon Loadouts Menu

assets/fxmanifest.lua

@@ -0,0 +1,27 @@
+-- Manifest data
+fx_version 'cerulean'
+games {'gta5'}
+
+-- Resource stuff
+name 'vMenu'
+description 'Server sided trainer for FiveM with custom permissions, using a custom MenuAPI. More info can be found at www.vespura.com/fivem'
+version 'versiongoeshere'
+author 'Tom Grobbe'
+url 'https://github.com/TomGrobbe/vMenu/'
+
+-- Adds additional logging, useful when debugging issues.
+client_debug_mode 'false'
+server_debug_mode 'false'
+
+-- Adds extra commands for testing and development
+experimental_features_enabled '0'
+
+-- Files & scripts
+files {
+    'Newtonsoft.Json.dll',
+    'MenuAPI.dll',
+    'config/*.json'
+}
+
+client_script 'vMenuClient.net.dll'
+server_script 'vMenuServer.net.dll'