From d57cf9a02a0c7d31db9711efdf6c92049cc96ef6 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:36:44 -0700 Subject: [PATCH 01/35] + gray-ish color for event nodes; node size is 8 by default --- .../Assets/vega.force.directed.layout.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json b/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json index e7b36f8..11455cd 100644 --- a/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json +++ b/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json @@ -97,13 +97,13 @@ "type": "symbol", "encode": { "enter": { - "fill": {"scale": "color", "field": "group"}, + "fill": { "signal": "datum.nodeType === 'BaristaLabs.ChromeDevTools.Runtime.Network.RequestWillBeSentEvent'? '#e0e1dd' : scale('color', datum.group)" }, "stroke": {"value": "white"} }, "update": { "cursor": {"value": "pointer"}, "fill": { - "signal": "hoverIndex === datum.index || indata('adjacentIndices', 'adj', datum.index) ? 'red' : scale('color', datum.group)" + "signal": "hoverIndex === datum.index || indata('adjacentIndices', 'adj', datum.index) ? 'red' : datum.nodeType === 'BaristaLabs.ChromeDevTools.Runtime.Network.RequestWillBeSentEvent'? '#e0e1dd' : scale('color', datum.group)" }, "size": { "signal": "(hoverIndex === datum.index || indata('adjacentIndices', 'adj', datum.index)) ? 2.5 * nodeRadius * nodeRadius : 2 * nodeRadius * nodeRadius" @@ -310,7 +310,7 @@ { "name": "nodeRadius", "bind": {"input": "range", "max": 50, "min": 1, "step": 1}, - "value": 5 + "value": 8 }, { "name": "nodeCharge", From ea8d4ba2dbb6fadc72a0725fd4ec503ab9c21562 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:38:59 -0700 Subject: [PATCH 02/35] + pester tests step --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d2ecde..caa2d00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,4 +28,7 @@ jobs: run: dotnet build --configuration Debug - name: Test run: dotnet test --verbosity normal - + - name: Pester tests + shell: pwsh + run: | + Invoke-Pester -Path ./PsGraph.Pester.Tests/ From e6d746b1c9c589942c2a4957eab7fbf4a4792d85 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:40:06 -0700 Subject: [PATCH 03/35] remove some folders from build --- .github/workflows/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index caa2d00..0dfe7c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,20 @@ name: psgraph-dev-build on: push: branches: [ "dev" ] + paths-ignore: + - '**/README.md' + - '**/.gitignore' + - 'docs/**' + - '.devcontainer/**' + - '.github/**' pull_request: branches: [ "dev" ] + paths-ignore: + - '**/README.md' + - '**/.gitignore' + - 'docs/**' + - '.devcontainer/**' + - '.github/**' workflow_dispatch: From 51b320da01dcb683acc1d3dce989e128078d5c87 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:41:38 -0700 Subject: [PATCH 04/35] update publish workflow --- .github/workflows/publish.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c903d52..968dc58 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,16 +1,14 @@ name: psgraph-publish on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] + release: + types: [published] workflow_dispatch: jobs: - build: + publish: runs-on: ubuntu-latest strategy: matrix: @@ -28,6 +26,10 @@ jobs: run: dotnet build - name: Test run: dotnet test --verbosity normal + - name: Pester tests + shell: pwsh + run: | + Invoke-Pester -Path ./PsGraph.Pester.Tests/ - name: dotnet publish run: dotnet publish -o "./PSQuickGraph" - name: psgallery publish From 71b007c763fc87c64afe4cc2d9e3f3b9f13f24b8 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:53:39 -0700 Subject: [PATCH 05/35] troubleshooting pester tests --- PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index 620edca..6aefdf1 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,4 +1,5 @@ BeforeAll { + Get-ChildItem Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" } From 42e607b3e3b491d2ccb9384271132d3a50cd834c Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:06:30 -0700 Subject: [PATCH 06/35] more troubleshooting --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dfe7c8..82dcd28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,4 +43,5 @@ jobs: - name: Pester tests shell: pwsh run: | + Get-ChildItem Invoke-Pester -Path ./PsGraph.Pester.Tests/ From b7e78abdcee1f66fe278b28b28fa22dc41e3a54b Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:15:22 -0700 Subject: [PATCH 07/35] still troubleshooting --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82dcd28..f4fb46f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,7 @@ jobs: - name: Test run: dotnet test --verbosity normal - name: Pester tests + working-directory: '../' shell: pwsh run: | Get-ChildItem From 8120e5cab366e343c7044fa7c9212b5cbdbac6e7 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:25:17 -0700 Subject: [PATCH 08/35] trying to fix tests to run on github actions --- PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index 6aefdf1..db819e9 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,6 +1,15 @@ BeforeAll { - Get-ChildItem - Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + if (Test-Path "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") + { + Write-Host "Importing from ./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + } + + if (Test-Path "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") + { + Write-Host "Importing from ../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + Import-Module "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + } } Describe 'New-Graph' { From 3b9e79d5f5268ca88d08316c3bbc62d3e5ff9744 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:27:09 -0700 Subject: [PATCH 09/35] another test --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4fb46f..82dcd28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,6 @@ jobs: - name: Test run: dotnet test --verbosity normal - name: Pester tests - working-directory: '../' shell: pwsh run: | Get-ChildItem From 7fa9e1af806910f98f8959f0a9772b21d79bb18f Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:37:08 -0700 Subject: [PATCH 10/35] one more test --- .github/workflows/build.yml | 2 ++ PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 12 +++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82dcd28..3e35f11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,8 @@ jobs: run: dotnet restore - name: Build run: dotnet build --configuration Debug + - name: dotnet publish + run: dotnet publish -o "./PSQuickGraph" - name: Test run: dotnet test --verbosity normal - name: Pester tests diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index db819e9..310c116 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,14 +1,8 @@ BeforeAll { - if (Test-Path "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") + if (Test-Path "./PSQuickGraph/PSQuickGraph.psd1") { - Write-Host "Importing from ./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" - Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" - } - - if (Test-Path "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") - { - Write-Host "Importing from ../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" - Import-Module "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + Write-Host "Importing from ./PSQuickGraph/PSQuickGraph.psd1" + Import-Module "./PSQuickGraph" } } From 8a0c01bc876cef57b3f4487c90dbf479c147bb62 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:43:31 -0700 Subject: [PATCH 11/35] few more tests --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e35f11..8196d36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,5 +45,6 @@ jobs: - name: Pester tests shell: pwsh run: | + $PSVersionTable Get-ChildItem Invoke-Pester -Path ./PsGraph.Pester.Tests/ From 1f8c02ac90a622115aed505db2670696e30cc8e3 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:51:45 -0700 Subject: [PATCH 12/35] another attempt --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8196d36..7685ef1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,12 @@ jobs: run: dotnet publish -o "./PSQuickGraph" - name: Test run: dotnet test --verbosity normal + + - name: Install PowerShell + uses: PSModule/install-powershell@v1 + with: + Version: latest + - name: Pester tests shell: pwsh run: | From 2bbca96678b11af320806e714346a63612e51dd5 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 18:01:43 -0700 Subject: [PATCH 13/35] try again --- PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index 310c116..620edca 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,9 +1,5 @@ BeforeAll { - if (Test-Path "./PSQuickGraph/PSQuickGraph.psd1") - { - Write-Host "Importing from ./PSQuickGraph/PSQuickGraph.psd1" - Import-Module "./PSQuickGraph" - } + Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" } Describe 'New-Graph' { From 107803d7fe1622140886be264ee72c127d93f6a5 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 18:06:07 -0700 Subject: [PATCH 14/35] few more updates to the workflow --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7685ef1..f9463ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: - '.devcontainer/**' - '.github/**' pull_request: - branches: [ "dev" ] + branches: [ "master" ] paths-ignore: - '**/README.md' - '**/.gitignore' @@ -47,7 +47,6 @@ jobs: uses: PSModule/install-powershell@v1 with: Version: latest - - name: Pester tests shell: pwsh run: | From 24795020f91507edccfce84cda950f338838d676 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Mon, 28 Jul 2025 23:55:04 -0700 Subject: [PATCH 15/35] + pipeline for publishig common library --- .github/workflows/publishCommon.yml | 57 +++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/publishCommon.yml diff --git a/.github/workflows/publishCommon.yml b/.github/workflows/publishCommon.yml new file mode 100644 index 0000000..8b80cfc --- /dev/null +++ b/.github/workflows/publishCommon.yml @@ -0,0 +1,57 @@ +name: Publish PSGraph.Common NuGet Package + +on: + push: + branches: + - main + - dev + +jobs: + build-and-publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.x' + + - name: Restore dependencies + run: dotnet restore PSGraph.Common/PSGraph.Common.csproj + + - name: Set Version Suffix for Pre-release + if: github.ref == 'refs/heads/dev' + run: | + VERSION_SUFFIX="beta-$(date +%Y%m%d%H%M%S)" + echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV + + - name: Build (Debug on dev, Release on main) + run: | + if [ "${{ github.ref }}" = "refs/heads/dev" ]; then + dotnet build PSGraph.Common/PSGraph.Common.csproj --configuration Debug --no-restore + else + dotnet build PSGraph.Common/PSGraph.Common.csproj --configuration Release --no-restore + fi + + - name: Pack (Debug/pre-release on dev, Release on main) + run: | + if [ "${{ github.ref }}" = "refs/heads/dev" ]; then + dotnet pack PSGraph.Common/PSGraph.Common.csproj \ + --configuration Debug \ + --no-build \ + --output ./nupkg \ + --version-suffix $VERSION_SUFFIX + else + dotnet pack PSGraph.Common/PSGraph.Common.csproj \ + --configuration Release \ + --no-build \ + --output ./nupkg + fi + + - name: Publish to NuGet + run: dotnet nuget push ./nupkg/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json + env: + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} \ No newline at end of file From 54f3405ea06136124c95d5d227d696160b61eb28 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Mon, 28 Jul 2025 23:58:11 -0700 Subject: [PATCH 16/35] bump minor version for testing --- PSGraph.Common/PSGraph.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PSGraph.Common/PSGraph.Common.csproj b/PSGraph.Common/PSGraph.Common.csproj index cdf6839..e529782 100644 --- a/PSGraph.Common/PSGraph.Common.csproj +++ b/PSGraph.Common/PSGraph.Common.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - 1.0.1 + 1.0.2 Andrey Vernigora PSGraph.Common Common types of PSGraph module From 6d21989e6fd45e3413612ce24a0e51412d0ee587 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 00:15:24 -0700 Subject: [PATCH 17/35] fixing version suffix --- PSGraph.Common/PSGraph.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PSGraph.Common/PSGraph.Common.csproj b/PSGraph.Common/PSGraph.Common.csproj index e529782..68e9f09 100644 --- a/PSGraph.Common/PSGraph.Common.csproj +++ b/PSGraph.Common/PSGraph.Common.csproj @@ -4,7 +4,7 @@ net9.0 enable enable - 1.0.2 + 1.0.3 Andrey Vernigora PSGraph.Common Common types of PSGraph module From f19c8046e060ff571f67e918e40ccea8f880f1a1 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:04:33 -0700 Subject: [PATCH 18/35] new publish pipeline --- .github/workflows/publish.yml | 102 ++++++++++++++++++++++++++++++---- 1 file changed, 90 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 968dc58..3f60cf8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,39 +3,117 @@ name: psgraph-publish on: release: types: [published] - workflow_dispatch: jobs: - publish: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ['9.0.x' ] + dotnet-version: ['9.0.x'] steps: - - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v3 + with: + fetch-depth: 0 # требуется для корректной работы с git и ветками + + - name: Ensure release tag exists + id: ensure_tag + run: | + if [ -z "${GITHUB_REF##refs/tags/}" ]; then + echo "Error: Release must have a tag." + exit 1 + fi + + - name: Extract version from tag and update module manifest + id: set_version + shell: pwsh + run: | + $tag = "${env:GITHUB_REF}" -replace '^refs/tags/', '' + if (-not $tag) { + Write-Error "Tag not found. Failing." + exit 1 + } + + $isPrerelease = "${{ github.event.release.prerelease }}" -eq "true" + $dateSuffix = Get-Date -Format "yyyyMMdd-HHmm" + $newVersion = if ($isPrerelease) { "$tag-prerelease-$dateSuffix" } else { $tag } + + $psd1 = Get-ChildItem -Path ./PSQuickGraph -Filter *.psd1 | Select-Object -First 1 + if (-not $psd1) { + Write-Error "Module manifest (.psd1) not found!" + exit 1 + } + + $content = Get-Content $psd1.FullName + $versionPattern = 'ModuleVersion\s*=\s*''[^'']*''' + $newContent = $content -replace $versionPattern, "ModuleVersion = '$newVersion'" + Set-Content -Path $psd1.FullName -Value $newContent + + "version=$newVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Append + - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} uses: actions/setup-dotnet@v3 with: dotnet-version: ${{ matrix.dotnet-version }} + - name: Install dependencies run: dotnet restore + - name: Build - run: dotnet build - - name: Test + run: | + if [ "${{ github.event.release.prerelease }}" = "true" ]; then + dotnet build -c Debug + else + dotnet build -c Release + fi + + - name: Run .NET tests run: dotnet test --verbosity normal - - name: Pester tests + + - name: Run Pester tests shell: pwsh run: | Invoke-Pester -Path ./PsGraph.Pester.Tests/ + - name: dotnet publish - run: dotnet publish -o "./PSQuickGraph" - - name: psgallery publish run: | - $env:GITHUB_WORKSPACE - Publish-Module -Path "./PSQuickGraph" -NuGetApiKey ${{ secrets.PS_GALLERY_SECRET }} + if [ "${{ github.event.release.prerelease }}" = "true" ]; then + dotnet publish -c Debug -o "./PSQuickGraph" + else + dotnet publish -c Release -o "./PSQuickGraph" + fi + + - name: Publish to PSGallery shell: pwsh - + run: | + Publish-Module -Path "./PSQuickGraph" -NuGetApiKey ${{ secrets.PS_GALLERY_SECRET }} + + - name: Commit and push updated manifest + if: success() + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + # Получаем исходную ветку из события релиза + SOURCE_BRANCH="${{ github.event.release.target_commitish }}" + + if [ -z "$SOURCE_BRANCH" ]; then + echo "Could not determine source branch. Exiting." + exit 1 + fi + + if [[ "$SOURCE_BRANCH" =~ ^[0-9a-f]{40}$ ]]; then + echo "Commitish is a SHA, not a branch name. Aborting." + exit 1 + fi + git fetch origin "$SOURCE_BRANCH" + git switch "$SOURCE_BRANCH" + git pull origin "$SOURCE_BRANCH" + git add ./PSQuickGraph/*.psd1 + git commit -m "ci: update module version to ${{ steps.set_version.outputs.version }}" || echo "Nothing to commit" + git push origin "$SOURCE_BRANCH" \ No newline at end of file From c75e83a6d55faef506f89ac41a9a9b015abd14e3 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:13:17 -0700 Subject: [PATCH 19/35] fix some issues with the pipeline --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3f60cf8..b72c59a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -40,7 +40,7 @@ jobs: $dateSuffix = Get-Date -Format "yyyyMMdd-HHmm" $newVersion = if ($isPrerelease) { "$tag-prerelease-$dateSuffix" } else { $tag } - $psd1 = Get-ChildItem -Path ./PSQuickGraph -Filter *.psd1 | Select-Object -First 1 + $psd1 = Get-Item ./PSGraph/PSQuickGraph.psd1 if (-not $psd1) { Write-Error "Module manifest (.psd1) not found!" exit 1 From 597be65d66ffb8570569cb46f2611595b949b0eb Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:23:47 -0700 Subject: [PATCH 20/35] few more fixes as 'v' in front of a version cannot be converted to System.Version --- .github/workflows/publish.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b72c59a..4e847a5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,9 +36,10 @@ jobs: exit 1 } - $isPrerelease = "${{ github.event.release.prerelease }}" -eq "true" - $dateSuffix = Get-Date -Format "yyyyMMdd-HHmm" - $newVersion = if ($isPrerelease) { "$tag-prerelease-$dateSuffix" } else { $tag } + # Удаляем префикс v, если он есть + $tag = $tag -replace '^v', '' + + $newVersion = $tag $psd1 = Get-Item ./PSGraph/PSQuickGraph.psd1 if (-not $psd1) { From 9d58d6a11b935701646d23c6a928dd69f0ab8ec5 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:38:15 -0700 Subject: [PATCH 21/35] keep fixing version processing for PS anifest --- .github/workflows/publish.yml | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4e847a5..c02dae9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -39,7 +39,14 @@ jobs: # Удаляем префикс v, если он есть $tag = $tag -replace '^v', '' - $newVersion = $tag + # Разделяем версию и prerelease-суффикс (если есть) + if ($tag -match '^([0-9]+\.[0-9]+\.[0-9]+)(?:-([A-Za-z0-9\.\-]+))?$') { + $version = $matches[1] + $prerelease = $matches[2] + } else { + Write-Error "Tag format invalid. Should be X.Y.Z or X.Y.Z-suffix" + exit 1 + } $psd1 = Get-Item ./PSGraph/PSQuickGraph.psd1 if (-not $psd1) { @@ -48,11 +55,29 @@ jobs: } $content = Get-Content $psd1.FullName + + # Обновляем ModuleVersion $versionPattern = 'ModuleVersion\s*=\s*''[^'']*''' - $newContent = $content -replace $versionPattern, "ModuleVersion = '$newVersion'" + $newContent = $content -replace $versionPattern, "ModuleVersion = '$version'" + + # Обновляем или добавляем Prerelease + $prPattern = '^\s*Prerelease\s*=\s*''[^'']*''\s*$' + if ($prerelease) { + if ($newContent -match $prPattern) { + $newContent = $newContent -replace $prPattern, "Prerelease = '$prerelease'" + } else { + # Добавляем Prerelease после ModuleVersion + $mvPattern = 'ModuleVersion\s*=\s*''[^'']*''' + $newContent = $newContent -replace $mvPattern, "ModuleVersion = '$version'`nPrerelease = '$prerelease'" + } + } else { + # Удаляем Prerelease если был + $newContent = $newContent -replace $prPattern, '' + } + Set-Content -Path $psd1.FullName -Value $newContent - "version=$newVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Append + "version=$version" | Out-File -FilePath $env:GITHUB_OUTPUT -Append - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} uses: actions/setup-dotnet@v3 From 4ef28244c525243c3cbb153c45d2a43a4b04470e Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:52:34 -0700 Subject: [PATCH 22/35] disable auto-start by now --- .github/workflows/publishCommon.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/publishCommon.yml b/.github/workflows/publishCommon.yml index 8b80cfc..369aac2 100644 --- a/.github/workflows/publishCommon.yml +++ b/.github/workflows/publishCommon.yml @@ -1,10 +1,7 @@ name: Publish PSGraph.Common NuGet Package on: - push: - branches: - - main - - dev + workflow_dispatch: jobs: build-and-publish: From ce9b43f72689231abc9a74b43515aec5509d7221 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:52:52 -0700 Subject: [PATCH 23/35] keep fighting with version --- .github/workflows/publish.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c02dae9..dc6b6cc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -58,24 +58,17 @@ jobs: # Обновляем ModuleVersion $versionPattern = 'ModuleVersion\s*=\s*''[^'']*''' - $newContent = $content -replace $versionPattern, "ModuleVersion = '$version'" + $content = $content -replace $versionPattern, "ModuleVersion = '$version'" - # Обновляем или добавляем Prerelease - $prPattern = '^\s*Prerelease\s*=\s*''[^'']*''\s*$' + # Обработка Prerelease if ($prerelease) { - if ($newContent -match $prPattern) { - $newContent = $newContent -replace $prPattern, "Prerelease = '$prerelease'" - } else { - # Добавляем Prerelease после ModuleVersion - $mvPattern = 'ModuleVersion\s*=\s*''[^'']*''' - $newContent = $newContent -replace $mvPattern, "ModuleVersion = '$version'`nPrerelease = '$prerelease'" - } + # Раскомментируем и задаём значение + $content = $content -replace '^\s*#\s*Prerelease\s*=\s*''[^'']*''', "Prerelease = '$prerelease'" } else { - # Удаляем Prerelease если был - $newContent = $newContent -replace $prPattern, '' + # Оставляем строку закомментированной (ничего не делаем) } - Set-Content -Path $psd1.FullName -Value $newContent + Set-Content -Path $psd1.FullName -Value $content "version=$version" | Out-File -FilePath $env:GITHUB_OUTPUT -Append From f2a3ad348521c6291eb2acc558deeeafca07927f Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 12:04:23 -0700 Subject: [PATCH 24/35] was failing to load .net sdk. setting it up --- .github/workflows/publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dc6b6cc..34c1851 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,6 +18,11 @@ jobs: with: fetch-depth: 0 # требуется для корректной работы с git и ветками + - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} + uses: actions/setup-dotnet@v3 + with: + dotnet-version: ${{ matrix.dotnet-version }} + - name: Ensure release tag exists id: ensure_tag run: | From a08188e331c9a5022f938d702b7ba723e8f4f579 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 12:40:37 -0700 Subject: [PATCH 25/35] update powershell version on the runner --- .github/workflows/publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 34c1851..9e9d575 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,6 +23,11 @@ jobs: with: dotnet-version: ${{ matrix.dotnet-version }} + - name: Install PowerShell + uses: PSModule/install-powershell@v1 + with: + Version: latest + - name: Ensure release tag exists id: ensure_tag run: | From 93c4d29b144a2776a4df96fd47e61d7ad4b01854 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:49:57 -0700 Subject: [PATCH 26/35] make sure we have correct suffix --- .github/workflows/publish.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9e9d575..629663d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -58,6 +58,12 @@ jobs: exit 1 } + # Проверка prerelease-суффикса на допустимые символы + if ($prerelease -and ($prerelease -notmatch '^(?:-)?[a-zA-Z0-9\-]+$')) { + Write-Error "Prerelease string '$prerelease' contains invalid characters. Only a-z, A-Z, 0-9, and hyphen (-) at the beginning are allowed." + exit 1 + } + $psd1 = Get-Item ./PSGraph/PSQuickGraph.psd1 if (-not $psd1) { Write-Error "Module manifest (.psd1) not found!" From 7af9ceaaa7776c4cadde64bd51fb079d900136ba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 29 Jul 2025 21:51:53 +0000 Subject: [PATCH 27/35] ci: update module version to 2.3.1 --- PSQuickGraph/PSQuickGraph.psd1 | 123 +++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 PSQuickGraph/PSQuickGraph.psd1 diff --git a/PSQuickGraph/PSQuickGraph.psd1 b/PSQuickGraph/PSQuickGraph.psd1 new file mode 100644 index 0000000..c0e456f --- /dev/null +++ b/PSQuickGraph/PSQuickGraph.psd1 @@ -0,0 +1,123 @@ +# +# Module manifest for module 'PSGraph' +# +# Generated by: Andrei +# +# Generated on: 07.04.2017 +# + +@{ + +# Script module or binary module file associated with this manifest. +RootModule = "PSGraph.dll" + +# Version number of this module. +ModuleVersion = '2.3.1' + +# Supported PSEditions +# CompatiblePSEditions = @() + +# ID used to uniquely identify this module +GUID = '4bd5a906-8e03-497e-80eb-209e71caae45' + +# Author of this module +Author = 'Andrey Vernigora' + +# Company or vendor of this module +CompanyName = 'Unknown' + +# Copyright statement for this module +Copyright = '(c) 2017 Andrei. All rights reserved.' + +# Description of the functionality provided by this module +Description = 'This module is a wrapper for QuickGraph library.' + +# Minimum version of the Windows PowerShell engine required by this module +# PowerShellVersion = '' + +# Name of the Windows PowerShell host required by this module +# PowerShellHostName = '' + +# Minimum version of the Windows PowerShell host required by this module +# PowerShellHostVersion = '' + +# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only. +# DotNetFrameworkVersion = '' + +# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only. +# CLRVersion = '' + +# Processor architecture (None, X86, Amd64) required by this module +# ProcessorArchitecture = '' + +# Modules that must be imported into the global environment prior to importing this module +RequiredModules = @() + +# Assemblies that must be loaded prior to importing this module +# RequiredAssemblies = @("QuickGraph.dll", "QuickGraph.Data.dll", "QuickGraph.Graphviz.dll", "QuickGraph.Serialization.dll", "GraphSharp.dll", "GraphSharp.Controls.dll") +RequiredAssemblies = @() + +# Script files (.ps1) that are run in the caller's environment prior to importing this module. +# ScriptsToProcess = @() + +# Type files (.ps1xml) to be loaded when importing this module +# TypesToProcess = @() + +# Format files (.ps1xml) to be loaded when importing this module +# FormatsToProcess = @() + +# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess +# NestedModules = @() + +# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. +FunctionsToExport = @() + +# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export. +CmdletsToExport = @("*") + +# Variables to export from this module +VariablesToExport = '*' + +# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export. +AliasesToExport = @() + +# DSC resources to export from this module +# DscResourcesToExport = @() + +# List of all modules packaged with this module +# ModuleList = @() + +# List of all files packaged with this module +# FileList = @() + +# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell. +PrivateData = @{ + + PSData = @{ +Prerelease = 'beta1' + # Tags applied to this module. These help with module discovery in online galleries. + # Tags = @() + + # A URL to the license for this module. + # LicenseUri = '' + + # A URL to the main website for this project. + ProjectUri = 'https://github.com/eosfor/PSGraph' + + # A URL to an icon representing this module. + # IconUri = '' + + # ReleaseNotes of this module + # ReleaseNotes = '' + + } # End of PSData hashtable + +} # End of PrivateData hashtable + +# HelpInfo URI of this module +# HelpInfoURI = '' + +# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix. +# DefaultCommandPrefix = '' + +} From 6858d3648e707876cd5addf4ea8de975af56f863 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:00:57 -0700 Subject: [PATCH 28/35] combining common package and module publishing --- .github/workflows/publish.yml | 75 ++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 629663d..a983162 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: - fetch-depth: 0 # требуется для корректной работы с git и ветками + fetch-depth: 0 - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} uses: actions/setup-dotnet@v3 @@ -28,6 +28,7 @@ jobs: with: Version: latest + # --- PowerShell Module Versioning --- - name: Ensure release tag exists id: ensure_tag run: | @@ -45,58 +46,37 @@ jobs: Write-Error "Tag not found. Failing." exit 1 } - - # Удаляем префикс v, если он есть $tag = $tag -replace '^v', '' - - # Разделяем версию и prerelease-суффикс (если есть) - if ($tag -match '^([0-9]+\.[0-9]+\.[0-9]+)(?:-([A-Za-z0-9\.\-]+))?$') { + if ($tag -match '^([0-9]+\.[0-9]+\.[0-9]+)(?:-([A-Za-z0-9\-]+))?$') { $version = $matches[1] $prerelease = $matches[2] } else { Write-Error "Tag format invalid. Should be X.Y.Z or X.Y.Z-suffix" exit 1 } - - # Проверка prerelease-суффикса на допустимые символы if ($prerelease -and ($prerelease -notmatch '^(?:-)?[a-zA-Z0-9\-]+$')) { Write-Error "Prerelease string '$prerelease' contains invalid characters. Only a-z, A-Z, 0-9, and hyphen (-) at the beginning are allowed." exit 1 } - $psd1 = Get-Item ./PSGraph/PSQuickGraph.psd1 if (-not $psd1) { Write-Error "Module manifest (.psd1) not found!" exit 1 } - $content = Get-Content $psd1.FullName - - # Обновляем ModuleVersion $versionPattern = 'ModuleVersion\s*=\s*''[^'']*''' $content = $content -replace $versionPattern, "ModuleVersion = '$version'" - - # Обработка Prerelease if ($prerelease) { - # Раскомментируем и задаём значение $content = $content -replace '^\s*#\s*Prerelease\s*=\s*''[^'']*''', "Prerelease = '$prerelease'" - } else { - # Оставляем строку закомментированной (ничего не делаем) } - Set-Content -Path $psd1.FullName -Value $content - "version=$version" | Out-File -FilePath $env:GITHUB_OUTPUT -Append - - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} - uses: actions/setup-dotnet@v3 - with: - dotnet-version: ${{ matrix.dotnet-version }} - + # --- PowerShell Module Build/Test/Publish --- - name: Install dependencies run: dotnet restore - - name: Build + - name: Build PowerShell module run: | if [ "${{ github.event.release.prerelease }}" = "true" ]; then dotnet build -c Debug @@ -112,7 +92,7 @@ jobs: run: | Invoke-Pester -Path ./PsGraph.Pester.Tests/ - - name: dotnet publish + - name: dotnet publish PowerShell module run: | if [ "${{ github.event.release.prerelease }}" = "true" ]; then dotnet publish -c Debug -o "./PSQuickGraph" @@ -120,11 +100,47 @@ jobs: dotnet publish -c Release -o "./PSQuickGraph" fi - - name: Publish to PSGallery + - name: Publish PowerShell module to PSGallery shell: pwsh 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: | + VERSION_SUFFIX="${{ steps.set_version.outputs.version }}" + echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV + + - name: Build PSGraph.Common (Debug on prerelease, Release on release) + run: | + if [ "${{ github.event.release.prerelease }}" = "true" ]; then + dotnet build PSGraph.Common/PSGraph.Common.csproj --configuration Debug --no-restore + else + dotnet build PSGraph.Common/PSGraph.Common.csproj --configuration Release --no-restore + fi + + - name: Pack PSGraph.Common (Debug/pre-release on prerelease, Release on release) + run: | + if [ "${{ github.event.release.prerelease }}" = "true" ]; then + dotnet pack PSGraph.Common/PSGraph.Common.csproj \ + --configuration Debug \ + --no-build \ + --output ./nupkg \ + --version-suffix $VERSION_SUFFIX + else + dotnet pack PSGraph.Common/PSGraph.Common.csproj \ + --configuration Release \ + --no-build \ + --output ./nupkg + fi + + - 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 + env: + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} + + # --- Commit manifest changes --- - name: Commit and push updated manifest if: success() env: @@ -132,20 +148,15 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - - # Получаем исходную ветку из события релиза SOURCE_BRANCH="${{ github.event.release.target_commitish }}" - if [ -z "$SOURCE_BRANCH" ]; then echo "Could not determine source branch. Exiting." exit 1 fi - if [[ "$SOURCE_BRANCH" =~ ^[0-9a-f]{40}$ ]]; then echo "Commitish is a SHA, not a branch name. Aborting." exit 1 fi - git fetch origin "$SOURCE_BRANCH" git switch "$SOURCE_BRANCH" git pull origin "$SOURCE_BRANCH" From 9ca5a6b7e8ce94c4ac8cba206760d1d33c21b1c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 29 Jul 2025 22:03:24 +0000 Subject: [PATCH 29/35] ci: update module version to 2.3.1 --- PSQuickGraph/PSQuickGraph.psd1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PSQuickGraph/PSQuickGraph.psd1 b/PSQuickGraph/PSQuickGraph.psd1 index c0e456f..5ace7dc 100644 --- a/PSQuickGraph/PSQuickGraph.psd1 +++ b/PSQuickGraph/PSQuickGraph.psd1 @@ -94,7 +94,7 @@ AliasesToExport = @() PrivateData = @{ PSData = @{ -Prerelease = 'beta1' +Prerelease = 'beta2' # Tags applied to this module. These help with module discovery in online galleries. # Tags = @() From a8bfbb06a2630d9e13ea4196c300410a864ed946 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:07:33 -0700 Subject: [PATCH 30/35] fixing issues with wrong suffux of a .net package --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a983162..f59b842 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -71,6 +71,7 @@ jobs: } Set-Content -Path $psd1.FullName -Value $content "version=$version" | Out-File -FilePath $env:GITHUB_OUTPUT -Append + "prerelease=$prerelease" | Out-File -FilePath $env:GITHUB_OUTPUT -Append # --- PowerShell Module Build/Test/Publish --- - name: Install dependencies @@ -109,8 +110,7 @@ jobs: - name: Set Version Suffix for Pre-release (Common) if: github.event.release.prerelease == true run: | - VERSION_SUFFIX="${{ steps.set_version.outputs.version }}" - echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV + echo "VERSION_SUFFIX=${{ steps.set_version.outputs.prerelease }}" >> $GITHUB_ENV - name: Build PSGraph.Common (Debug on prerelease, Release on release) run: | From eed3b9e2676dbc2384ce9c87b357d98b11d9e541 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 29 Jul 2025 22:10:55 +0000 Subject: [PATCH 31/35] ci: update module version to 2.3.1 --- PSQuickGraph/PSQuickGraph.psd1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PSQuickGraph/PSQuickGraph.psd1 b/PSQuickGraph/PSQuickGraph.psd1 index 5ace7dc..650cd6b 100644 --- a/PSQuickGraph/PSQuickGraph.psd1 +++ b/PSQuickGraph/PSQuickGraph.psd1 @@ -94,7 +94,7 @@ AliasesToExport = @() PrivateData = @{ PSData = @{ -Prerelease = 'beta2' +Prerelease = 'beta3' # Tags applied to this module. These help with module discovery in online galleries. # Tags = @() From db4105ee2cc0d3be91f14d22ccb87c72456fc6ed Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:16:35 -0700 Subject: [PATCH 32/35] sync module version and common package version for simplicity --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f59b842..d57eb86 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -127,12 +127,13 @@ jobs: --configuration Debug \ --no-build \ --output ./nupkg \ - --version-suffix $VERSION_SUFFIX + --version ${{ steps.set_version.outputs.version }}${{ steps.set_version.outputs.prerelease && format('-{0}', steps.set_version.outputs.prerelease) }} else dotnet pack PSGraph.Common/PSGraph.Common.csproj \ --configuration Release \ --no-build \ - --output ./nupkg + --output ./nupkg \ + --version ${{ steps.set_version.outputs.version }} fi - name: Publish PSGraph.Common to NuGet From b9daa2a44f77cef4b0e0317d00f6c821559d41cc Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:24:42 -0700 Subject: [PATCH 33/35] another attempt --- .github/workflows/publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d57eb86..297ae10 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -121,19 +121,21 @@ jobs: fi - name: Pack PSGraph.Common (Debug/pre-release on prerelease, Release on release) + shell: bash run: | if [ "${{ github.event.release.prerelease }}" = "true" ]; 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 \ - --version ${{ steps.set_version.outputs.version }}${{ steps.set_version.outputs.prerelease && format('-{0}', steps.set_version.outputs.prerelease) }} + --version "$VERSION" else dotnet pack PSGraph.Common/PSGraph.Common.csproj \ --configuration Release \ --no-build \ --output ./nupkg \ - --version ${{ steps.set_version.outputs.version }} + --version "${{ steps.set_version.outputs.version }}" fi - name: Publish PSGraph.Common to NuGet From 886417e4e4a0574dab7faafc6d6d86e45a23e14f Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:38:08 -0700 Subject: [PATCH 34/35] fix syntax --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 297ae10..c537425 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -129,13 +129,14 @@ jobs: --configuration Debug \ --no-build \ --output ./nupkg \ - --version "$VERSION" + /p:PackageVersion="$VERSION" else + VERSION="${{ steps.set_version.outputs.version }}" dotnet pack PSGraph.Common/PSGraph.Common.csproj \ --configuration Release \ --no-build \ --output ./nupkg \ - --version "${{ steps.set_version.outputs.version }}" + /p:PackageVersion="$VERSION" fi - name: Publish PSGraph.Common to NuGet From 4be7c52eeece3870778907e8cd7cb593ddb2efe6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 29 Jul 2025 22:56:35 +0000 Subject: [PATCH 35/35] ci: update module version to 2.3.1 --- PSQuickGraph/PSQuickGraph.psd1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PSQuickGraph/PSQuickGraph.psd1 b/PSQuickGraph/PSQuickGraph.psd1 index 650cd6b..b64a33d 100644 --- a/PSQuickGraph/PSQuickGraph.psd1 +++ b/PSQuickGraph/PSQuickGraph.psd1 @@ -94,7 +94,7 @@ AliasesToExport = @() PrivateData = @{ PSData = @{ -Prerelease = 'beta3' +Prerelease = 'beta6' # Tags applied to this module. These help with module discovery in online galleries. # Tags = @()