fix: ci workflow

Author: RuntimeRascal

.github/workflows/ci.yml

@@ -26,13 +26,17 @@ jobs:
                   wix --version
 
             - name: Restore dependencies
-              run: dotnet restore GhostDraw.sln
+              run: |
+                  dotnet restore Src/GhostDraw/GhostDraw.csproj
+                  dotnet restore Tests/GhostDraw.Tests/GhostDraw.Tests.csproj
 
             - name: Build application and tests
-              run: dotnet build GhostDraw.sln -c Release --no-restore
+              run: |
+                  dotnet build Src/GhostDraw/GhostDraw.csproj -c Release --no-restore
+                  dotnet build Tests/GhostDraw.Tests/GhostDraw.Tests.csproj -c Release --no-restore
 
             - name: Run tests
-              run: dotnet test GhostDraw.sln -c Release --no-build --verbosity normal
+              run: dotnet test Tests/GhostDraw.Tests/GhostDraw.Tests.csproj -c Release --no-build --verbosity normal
 
             - name: Publish application
               shell: pwsh

Installer/GhostDraw.Installer.wixproj

@@ -1,6 +1,6 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
   <PropertyGroup>
-    <Version Condition="'$(Version)' == ''">1.0.0</Version>
+    <Version Condition="'$(Version)' == ''">1.0.2</Version>
     <OutputName>GhostDrawSetup-$(Version)</OutputName>
     <OutputType>Package</OutputType>
     <Platform>x64</Platform>

Scripts/Update-Version.ps1

@@ -47,10 +47,11 @@ function Get-LatestGitTag {
         Write-Host "Fetching latest tags from remote..." -ForegroundColor Yellow
         git fetch --tags 2>&1 | Out-Null
 
-        # Get the latest tag (sorted by version)
-        $latestTag = git describe --tags --abbrev=0 2>&1
+        # Get the latest tag sorted by version number (descending)
+        # Using -v:refname ensures proper semantic version sorting
+        $latestTag = git tag -l --sort=-v:refname | Select-Object -First 1
 
-        if ($LASTEXITCODE -ne 0) {
+        if (-not $latestTag) {
             throw "No git tags found in repository"
         }
 
@@ -115,7 +116,7 @@ function Update-PackageJson {
     return $true
 }
 
-# Function to update .csproj file
+# Function to update .csproj file (simple <Version> element)
 function Update-CsprojFile {
     param(
         [string]$FilePath,
@@ -157,6 +158,49 @@ function Update-CsprojFile {
     return $true
 }
 
+# Function to update WiX project file (conditional <Version> element)
+function Update-WixProjFile {
+    param(
+        [string]$FilePath,
+        [string]$NewVersion,
+        [switch]$DryRun
+    )
+    
+    if (-not (Test-Path $FilePath)) {
+        Write-Warning "File not found: $FilePath"
+        return $false
+    }
+    
+    $content = Get-Content $FilePath -Raw
+    $fileName = Split-Path $FilePath -Leaf
+    
+    # Match Version element with Condition attribute (WiX default version pattern)
+    # Pattern: <Version Condition="'$(Version)' == ''">X.Y.Z</Version>
+    if ($content -notmatch '<Version\s+Condition="[^"]*">([^<]*)</Version>') {
+        Write-Warning "  $fileName`: No conditional <Version> element found"
+        return $false
+    }
+    
+    $oldVersion = $Matches[1]
+    
+    if ($oldVersion -eq $NewVersion) {
+        Write-Host "  $fileName`: Already at version $NewVersion" -ForegroundColor Green
+        return $true
+    }
+    
+    if ($DryRun) {
+        Write-Host "  $fileName`: Would update $oldVersion -> $NewVersion" -ForegroundColor Yellow
+        return $true
+    }
+    
+    # Update version while preserving the Condition attribute
+    $updatedContent = $content -replace '(<Version\s+Condition="[^"]*">)[^<]*(</Version>)', "`${1}$NewVersion`${2}"
+    
+    Set-Content -Path $FilePath -Value $updatedContent -NoNewline
+    Write-Host "  $fileName`: Updated $oldVersion -> $NewVersion" -ForegroundColor Green
+    return $true
+}
+
 # Main execution
 try {
     Write-Host ""
@@ -192,6 +236,10 @@ try {
         @{
             Path = Join-Path $RepoRoot "Src\GhostDraw\GhostDraw.csproj"
             Type = "Csproj"
+        },
+        @{
+            Path = Join-Path $RepoRoot "Installer\GhostDraw.Installer.wixproj"
+            Type = "WixProj"
         }
     )
 
@@ -206,6 +254,9 @@ try {
             "Csproj" {
                 $result = Update-CsprojFile -FilePath $file.Path -NewVersion $version -DryRun:$DryRun
             }
+            "WixProj" {
+                $result = Update-WixProjFile -FilePath $file.Path -NewVersion $version -DryRun:$DryRun
+            }
         }
         if (-not $result) {
             $success = $false

Src/GhostDraw/GhostDraw.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -8,7 +8,7 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

installer/GhostDraw.Installer.wixproj

@@ -1,6 +1,6 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
   <PropertyGroup>
-    <Version Condition="'$(Version)' == ''">1.0.0</Version>
+    <Version Condition="'$(Version)' == ''">1.0.2</Version>
     <OutputName>GhostDrawSetup-$(Version)</OutputName>
     <OutputType>Package</OutputType>
     <Platform>x64</Platform>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ghost-draw",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Draw directly on your screen with a transparent overlay",
     "repository": {
         "type": "git",