Merge pull request #883 from Romanitho/hotfix/versionning

Fix versioning with the latest changes regarding GitFlow

Author: Romanitho

.github/workflows/GitFlow_Make-Release-and-Sync-to-Dev.yml

@@ -57,8 +57,8 @@ jobs:
           commit_count_mod=$((commit_count % 65535))
           NEW_VERSION="$VERSION.$commit_count_mod"
           echo "Final version: $NEW_VERSION"
-          echo "newversion=$NEW_VERSION" >> $GITHUB_OUTPUT
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "MsiVersion=$NEW_VERSION" >> $GITHUB_OUTPUT
+          echo "NextSemVer=$VERSION" >> $GITHUB_OUTPUT
 
       # Step 3: Build all project artifacts for the stable release
       - name: Build project
@@ -85,7 +85,7 @@ jobs:
           # Build MSI package with STABLE flag
           echo "### Create WAU msi ###"
           cd .\Sources\Wix\
-          wix build -src build.wxs -ext WixToolset.Util.wixext -ext WixToolset.UI.wixext -out ..\..\WAU.msi -arch x64 -d Version=${{ steps.release_version.outputs.newversion }} -d NextSemVer=${{ steps.release_version.outputs.newversion }} -d Comment="STABLE" -d PreRelease=0
+          wix build -src build.wxs -ext WixToolset.Util.wixext -ext WixToolset.UI.wixext -out ..\..\WAU.msi -arch x64 -d Version=${{ steps.release_version.outputs.MsiVersion }} -d NextSemVer=${{ steps.release_version.outputs.NextSemVer }} -d Comment="STABLE" -d PreRelease=0
           cd ..\..
           Get-Item .\WAU.msi
 
@@ -114,19 +114,19 @@ jobs:
       - name: Create release
         uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1.16.0
         with:
-          tag: v${{ steps.release_version.outputs.version }}
+          tag: v${{ steps.release_version.outputs.NextSemVer }}
           prerelease: false  # This is a stable release
           generateReleaseNotes: true
-          name: WAU ${{ steps.release_version.outputs.version }}
+          name: WAU ${{ steps.release_version.outputs.NextSemVer }}
           artifacts: "WAU.msi,WAU_ADMX.zip,WAU_InstallCounter"
           body: |
             ## Files
             |Files|Hash (SHA256)|Downloads|
             |---|---|---|
-            |[WAU.msi](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.release_version.outputs.version }}/WAU.msi) (x64)|`${{ steps.build_project.outputs.msi_sha }}`|<picture>![WAU.msi](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.version }}/WAU.msi?style=flat-square&label=&color=blue)</picture>|
-            |[WAU_ADMX.zip](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.release_version.outputs.version }}/WAU_ADMX.zip)|`${{ steps.build_project.outputs.admx_sha }}`|<picture>![WAU_ADMX.zip](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.version }}/WAU_ADMX.zip?style=flat-square&label=&color=blue)</picture>|
+            |[WAU.msi](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.release_version.outputs.NextSemVer }}/WAU.msi) (x64)|`${{ steps.build_project.outputs.msi_sha }}`|<picture>![WAU.msi](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/WAU.msi?style=flat-square&label=&color=blue)</picture>|
+            |[WAU_ADMX.zip](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.release_version.outputs.NextSemVer }}/WAU_ADMX.zip)|`${{ steps.build_project.outputs.admx_sha }}`|<picture>![WAU_ADMX.zip](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/WAU_ADMX.zip?style=flat-square&label=&color=blue)</picture>|
 
-            <picture>![Install counter](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.version }}/WAU_InstallCounter?style=flat-square&label=Total%20reported%20installations%20for%20this%20release&color=blue)</picture>
+            <picture>![Install counter](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/WAU_InstallCounter?style=flat-square&label=Total%20reported%20installations%20for%20this%20release&color=blue)</picture>
 
       # Step 5: Configure Git for merge back to develop
       - name: Configure Git
@@ -144,7 +144,7 @@ jobs:
           git pull origin develop
 
           # Merge main into develop with no fast-forward to preserve history
-          git merge --no-ff origin/main -m "Merge main into develop after the creation of release v${{ steps.release_version.outputs.version }}"
+          git merge --no-ff origin/main -m "Merge main into develop after the creation of release v${{ steps.release_version.outputs.NextSemVer }}"
 
           # Push changes to develop branch
           git push origin develop

Sources/Winget-AutoUpdate/Winget-Upgrade.ps1

@@ -208,7 +208,7 @@ if (Test-Network) {
                 #Get Available Version
                 $Script:WAUAvailableVersion = Get-WAUAvailableVersion;
                 #Compare
-                if ([version]$WAUAvailableVersion.replace("-n", "") -gt [version]$WAUCurrentVersion.replace("-n", "")) {
+                if ((Compare-SemVer -Version1 $WAUCurrentVersion -Version2 $WAUAvailableVersion) -lt 0) {
                     #If new version is available, update it
                     Write-ToLog "WAU Available version: $WAUAvailableVersion" "Yellow";
                     Update-WAU;

Sources/Winget-AutoUpdate/functions/Install-Prerequisites.ps1

@@ -91,8 +91,8 @@ function Install-Prerequisites {
             $WinGetAvailableVersion = ((Invoke-WebRequest $WinGeturl -UseBasicParsing | ConvertFrom-Json)[0].tag_name).TrimStart("v")
         }
         catch {
-            #if fail set version to the latest version as of 2024-04-29
-            $WinGetAvailableVersion = "1.7.11132"
+            #If fail set version to the latest version as of 2025-03-14
+            $WinGetAvailableVersion = "1.10.340"
         }
         try {
             #Get Admin Context Winget Location
@@ -104,6 +104,7 @@ function Install-Prerequisites {
         }
         catch {
             Write-ToLog "WinGet is not installed" "Red"
+            $WinGetInstalledVersion = "0.0.0"
         }
         Write-ToLog "WinGet installed version: $WinGetInstalledVersion | WinGet available version: $WinGetAvailableVersion"
         #Check if the currently installed version is less than the available version