Updated test package versions (#76)

* Updated test package versions

* Added support to PS script to generate correct format of version string if it is a CI build

---------

Co-authored-by: Steven Maillet <smaillet@users.noreply.github.com>

Author: smaillet

Directory.Packages.props

@@ -19,11 +19,11 @@
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.14.8" />
     <PackageVersion Include="MSBuild.ProjectCreation" Version="14.0.5" />
     <!-- Tests all use the same framework versions -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.9.1" />
-    <PackageVersion Include="MSTest.TestFramework" Version="3.9.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.9.3" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.9.3" />
     <PackageVersion Include="PolySharp" Version="1.15.0" />
     <PackageVersion Include="Sprache" Version="2.3.1" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
-</Project>
+</Project>

New-GeneratedVersionProps.ps1

@@ -99,7 +99,7 @@ class PreReleaseVersion
         }
     }
 
-    [string] ToString()
+    [string] ToString($alwaysIncludeZero = $false)
     {
         $hasPreRel = $this.Index -ge 0
 
@@ -108,10 +108,10 @@ class PreReleaseVersion
         {
             $bldr.Append('-').Append( $this.Name)
             $delimFormat = '.{0}'
-            if(($this.Number -gt 0))
+            if(($this.Number -gt 0 -or $alwaysIncludeZero))
             {
                 $bldr.AppendFormat($delimFormat, $this.Number)
-                if(($this.Fix -gt 0))
+                if(($this.Fix -gt 0 -or $alwaysIncludeZero))
                 {
                     $bldr.AppendFormat($delimFormat, $this.Fix)
                 }
@@ -244,11 +244,12 @@ class CSemVer
 
     [string] ToString([bool] $includeMetadata)
     {
+        $isCiBuild = $this.CiBuildIndex -and $this.CiBuildName
         $bldr = [System.Text.StringBuilder]::new()
         $bldr.AppendFormat('{0}.{1}.{2}', $this.Major, $this.Minor, $this.Patch)
         if($this.PreReleaseVersion)
         {
-            $bldr.Append($this.PreReleaseVersion.ToString())
+            $bldr.Append($this.PreReleaseVersion.ToString($isCiBuild))
         }
 
         $hasPreRel = $this.PreReleaseVersion -and $this.PreReleaseVersion.Index -ge 0