Adds support for pre-release info to git tag parser.

Author: jcasale

.github/workflows/main.yml

@@ -31,10 +31,16 @@ jobs:
       - name: Generate version property
         id: version
         run: |
+          $pattern = '^v(((\d+\.\d+\.\d+\.\d+)(?:-[a-z]+\.\d+)?)-(\d+-g.+))'
           $tag = git.exe describe --tags --long
-          $version = [version]::new($tag.Split('-')[0].TrimStart('v'))
+          $version = [System.Text.RegularExpressions.Regex]::Match($tag, $pattern).Groups[3].Value
+          $fullVersion = [System.Text.RegularExpressions.Regex]::Match($tag, $pattern).Groups[2].Value
+          $gitCommitInfo = [System.Text.RegularExpressions.Regex]::Match($tag, $pattern).Groups[4].Value
+          $informationalVersion = '{0}+{1}' -f $fullVersion,$gitCommitInfo
 
           echo "version=$version" >> $env:GITHUB_OUTPUT
+          echo "fullVersion=$fullVersion" >> $env:GITHUB_OUTPUT
+          echo "informationalVersion=$informationalVersion" >> $env:GITHUB_OUTPUT
 
       - name: Run tests
         run: dotnet.exe test .\src\PSDataProtection.sln --configuration Release --runtime win-x64
@@ -100,7 +106,7 @@ jobs:
 
       - name: Publish release
         if: github.ref_type == 'tag'
-        run: gh.exe release create v${{ steps.version.outputs.version }} --title v${{ steps.version.outputs.version }} --notes 'PowerShell data protection module.' ps-data-protection.msi
+        run: gh.exe release create v${{ steps.version.outputs.fullVersion }} --title v${{ steps.version.outputs.fullVersion }} --notes 'PowerShell data protection module.' ps-data-protection.msi
         env:
             # Requires a personal access token with a fine-grained permission of contents:read/write.
             GH_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}

src/PSDataProtection/PSDataProtection.csproj

@@ -27,16 +27,18 @@
   </ItemGroup>
 
   <Target Name="GetVersionFromGit">
-    <Exec Command="git.exe describe --tags --long" WorkingDirectory="$(MSBuildProjectDirectory)" ConsoleToMSBuild="true" StandardOutputImportance="Low">
+    <Exec Command="git.exe describe --tags --long" WorkingDirectory="$(MSBuildProjectDirectory)" ConsoleToMsBuild="true" StandardOutputImportance="Low">
       <Output TaskParameter="ConsoleOutput" PropertyName="GitTag" />
     </Exec>
 
     <PropertyGroup>
-      <PatternGitTag>^v((.+)-(\d+)-g(.+))</PatternGitTag>
-      <AssemblyVersion>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[2].Value)</AssemblyVersion>
-      <FileVersion>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[2].Value)</FileVersion>
-      <Version>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[2].Value)</Version>
-      <InformationalVersion>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[1].Value)</InformationalVersion>
+      <PatternGitTag>^v(((\d+\.\d+\.\d+\.\d+)(?:-[a-z]+\.\d+)?)-(\d+-g.+))</PatternGitTag>
+      <AssemblyVersion>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[3].Value)</AssemblyVersion>
+      <FileVersion>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[3].Value)</FileVersion>
+      <Version>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[3].Value)</Version>
+      <FullVersion>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[2].Value)</FullVersion>
+      <GitCommitInfo>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(PatternGitTag)).Groups[4].Value)</GitCommitInfo>
+      <InformationalVersion>$(FullVersion)+$(GitCommitInfo)</InformationalVersion>
     </PropertyGroup>
 
     <Message Text="*** InformationalVersion $(InformationalVersion)" Importance="high" />