Merge pull request #2 from joshooaj/joshooaj/fix-issue-1

Use nbgv SimpleVersion for ModuleVersion
joshooaj · Mar 19, 2024 · e1b33bf · e1b33bf
2 parents f51cb79 + dcfba54
commit e1b33bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/psakeFile.ps1 b/psakeFile.ps1
@@ -3,7 +3,7 @@ properties {
     # Set this to $true to create a module with a monolithic PSM1
     $PSBPreference.Build.CompileModule = $true
     $PSBPreference.Docs.RootDir = './docs'
-    $PSBPreference.General.ModuleVersion = (dotnet nbgv get-version -f json | ConvertFrom-Json).NuGetPackageVersion
+    $PSBPreference.General.ModuleVersion = (dotnet nbgv get-version -f json | ConvertFrom-Json).SimpleVersion
     $PSBPreference.Help.DefaultLocale = 'en-US'
     $PSBPreference.Test.OutputFile = 'out/testResults.xml'
     $PSBPreference.Test.ScriptAnalysis.SettingsPath = Join-Path $psake.build_script_dir 'PSScriptAnalyzerSettings.psd1'

diff --git a/version.json b/version.json
@@ -3,7 +3,7 @@
     "version": "0.1",
     "publicReleaseRefSpec": [
         "^refs/heads/main$",
-        "^refs/heads/v\\d+(?:\\.\\d+)?$"
+        "^refs/heads/v\\d+(?:(\\.\\d+){2})?$"
     ],
     "cloudBuild": {
         "buildNumber": {