Merge branch 'dev'

Author: eosfor

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: psgraph-publish
 on:
   release:
     types: [published]
-  
+
   workflow_dispatch:
 
 jobs:
@@ -93,33 +93,12 @@ jobs:
         shell: pwsh
         run: |
           Invoke-Pester -Path ./PsGraph.Pester.Tests/
-          
-      - name: dotnet publish
-        run: dotnet publish -o "./PSQuickGraph"
-        
-      - name: psgallery publish
-        run: |
-          Invoke-Pester -Path ./PsGraph.Pester.Tests/
-
-      - name: dotnet publish PowerShell module
-        run: |
-          if [ "${{ github.event.release.prerelease }}" = "true" ]; then
-            dotnet publish -c Debug -o "./PSQuickGraph"
-          else
-            dotnet publish -c Release -o "./PSQuickGraph"
-          fi
 
-      - name: Publish PowerShell module to PSGallery
-        shell: pwsh
+      - name: psgallery publish
         run: |
           Publish-Module -Path "./PSQuickGraph" -NuGetApiKey ${{ secrets.PS_GALLERY_SECRET }}
 
       # --- NuGet Common Package Build/Publish ---
-      - name: Set Version Suffix for Pre-release (Common)
-        if: github.event.release.prerelease == true
-        run: |
-          echo "VERSION_SUFFIX=${{ steps.set_version.outputs.prerelease }}" >> $GITHUB_ENV
-
       - name: Build PSGraph.Common (Debug on prerelease, Release on release)
         run: |
           if [ "${{ github.event.release.prerelease }}" = "true" ]; then
@@ -131,21 +110,18 @@ jobs:
       - name: Pack PSGraph.Common (Debug/pre-release on prerelease, Release on release)
         shell: bash
         run: |
-          if [ "${{ github.event.release.prerelease }}" = "true" ]; then
+          if [ -n "${{ steps.set_version.outputs.prerelease }}" ]; then
             VERSION="${{ steps.set_version.outputs.version }}-${{ steps.set_version.outputs.prerelease }}"
-            dotnet pack PSGraph.Common/PSGraph.Common.csproj \
-              --configuration Debug \
-              --no-build \
-              --output ./nupkg \
-              /p:PackageVersion="$VERSION"
+            CONFIG=Debug
           else
             VERSION="${{ steps.set_version.outputs.version }}"
-            dotnet pack PSGraph.Common/PSGraph.Common.csproj \
-              --configuration Release \
-              --no-build \
-              --output ./nupkg \
-              /p:PackageVersion="$VERSION"
+            CONFIG=Release
           fi
+          dotnet pack PSGraph.Common/PSGraph.Common.csproj \
+            --configuration $CONFIG \
+            --no-build \
+            --output ./nupkg \
+            /p:PackageVersion="$VERSION"
 
       - name: Publish PSGraph.Common to NuGet
         run: dotnet nuget push ./nupkg/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json