From 4e2c6293f8745cef95c9a94c335a697f48be70e8 Mon Sep 17 00:00:00 2001
From: lordmilko <lordmilko@users.noreply.github.com>
Date: Wed, 19 Feb 2020 22:54:52 +1100
Subject: [PATCH] Fix Appveyor failing to set preview version after releasing
 additional build version

---
 build/CI/Appveyor/Set-AppveyorVersion.ps1 |  7 ++++++-
 build/CI/Tests/Appveyor.Tests.ps1         | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/build/CI/Appveyor/Set-AppveyorVersion.ps1 b/build/CI/Appveyor/Set-AppveyorVersion.ps1
index 244b9a57..65516bd7 100644
--- a/build/CI/Appveyor/Set-AppveyorVersion.ps1
+++ b/build/CI/Appveyor/Set-AppveyorVersion.ps1
@@ -61,8 +61,13 @@ function IncrementBuild($version)
 
 function IsPreview($assemblyVersion, $lastRelease)
 {
+    if([string]::IsNullOrEmpty($lastRelease))
+    {
+        return $false
+    }
+
     # If this DLL has the same version as the last RELEASE, this should be a preview release
-    return $assemblyVersion -eq $lastRelease
+    return $assemblyVersion -eq (CleanVersion $lastRelease)
 }
 
 function IsFirstPreview($lastBuild)
diff --git a/build/CI/Tests/Appveyor.Tests.ps1 b/build/CI/Tests/Appveyor.Tests.ps1
index e734fe5e..019323ff 100644
--- a/build/CI/Tests/Appveyor.Tests.ps1
+++ b/build/CI/Tests/Appveyor.Tests.ps1
@@ -349,6 +349,17 @@ Describe "Appveyor" {
             Simulate-Build @buildArgs
         }
 
+        It "Release 0.1 (u1) -> Commit (p1) = 0.1.1-preview.1" {
+            $buildArgs = @{
+                Assembly = "0.1.0"
+                LastBuild = "0.1.0-build.1"
+                LastRelease = "0.1.0-build.1"
+                Expected = "0.1.1-preview.1"
+            }
+
+            Simulate-Build @buildArgs
+        }
+
         It "First Build" {
             $buildArgs = @{
                 Assembly = "0.1.0"