Merge pull request #943 from pascalberger/FixTfsTaskBuild

Fix tfs task build

Author: JakeGinnivan

src/GitVersionExe/GitVersionExe.csproj

@@ -188,7 +188,7 @@
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\task.json" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask" />
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\GitVersion.ps1" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask" />
     <ReplaceFileText InputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" OutputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" MatchExpression="\$version\$" ReplacementText="$(GitVersion_SemVer)" Condition="'$(GitVersion_SemVer)' != ''" />
-    <Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Update-GitVersionTfsTaskVersion.ps1 $(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\task.json $(GitVersion_Major) $(GitVersion_Minor) $(GitVersion_Patch)&quot;" WorkingDirectory="$(BuildDir)" Condition="'$(GitVersion_SemVer)' != ''" />
+    <Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Update-GitVersionTfsTaskVersion.ps1 $(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\task.json $(GitVersion_MajorMinorPatch)&quot;" WorkingDirectory="$(BuildDir)" Condition="'$(GitVersion_MajorMinorPatch)' != ''" />
     <Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Create-Vsix.ps1 $(BuildDir)GitVersionTfsTaskBuild&quot;" Condition="'$(GitVersion_SemVer)' != ''" />
 
     <!-- Gem -->

src/GitVersionTfsTask/Update-GitVersionTfsTaskVersion.ps1

@@ -1,16 +1,26 @@
 param (
 [string] $filePath,
-[string] $major,
-[string] $minor,
-[string] $patch
+[string] $version
 )
 
+if ([string]::IsNullOrWhiteSpace($filePath)) {
+    throw "File path needs to be provided."
+}
+
+if ([string]::IsNullOrWhiteSpace($version)) {
+    throw "Version number needs to be provided."
+}
+
+Write-Host "Set version in '$filePath' to $version"
+
+$ver = [Version]$version
+
 # Get the task.json as a powershell object
 $task = Get-Content -Raw -Path $filePath | ConvertFrom-Json
 
-$task.version.Major = $major
-$task.version.Minor = $minor
-$task.version.Patch = $patch
+$task.version.Major = $ver.Major
+$task.version.Minor = $ver.Minor
+$task.version.Patch = $ver.Build
 
 # get this as a string again