Fix Chocolatey packaging (#84)

igoravl · Aug 24, 2019 · 109bdcf · 109bdcf
1 parent b2affee
commit 109bdcf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -10,7 +10,8 @@ Param
     $ModuleAuthor = 'Igor Abade V. Leite',
     $ModuleDescription = 'PowerShell Cmdlets for Azure DevOps and Team Foundation Server',
     $Targets = "Package",
-    $RepoCreationDate = (Get-Date '2014-10-24')
+    $RepoCreationDate = (Get-Date '2014-10-24'),
+    [switch] $SkipTests
 )
 
 Function Install-Dependencies
@@ -187,6 +188,7 @@ try
         BuildName = $BuildName
         SemVer = $SemVerFullVersion
         VersionMetadata = $VersionMetadata 
+        SkipTests = $SkipTests.IsPresent
     }
 
     Write-Verbose "=== END PSAKE ==="

diff --git a/psake.ps1 b/psake.ps1
@@ -227,7 +227,7 @@ Updating module manifest file $ModuleManifestPath with the following content:
         }
 }
 
-Task Test -Depends Build {
+Task Test -Depends Build -PreCondition { -not $SkipTests } {
 
     exec {Invoke-Pester -Path $TestsDir -OutputFile (Join-Path $OutDir TestResults.xml) -OutputFormat NUnitXml `
         -PesterOption (New-PesterOption -IncludeVSCodeMarker ) -Strict}
@@ -283,7 +283,12 @@ Task PackageModule -Depends Build {
 Task PackageNuget -Depends Build, GenerateNuspec {
 
     Copy-Item $ModuleDir $NugetToolsDir\TfsCmdlets -Recurse -Exclude *.ps1 -Force
-    & $NugetExePath @('Pack', $NugetSpecPath, '-OutputDirectory', $NugetDir, '-Verbosity', 'Detailed', '-NonInteractive') *>&1 | Write-Verbose
+
+    $cmdLine = "$NugetExePath Pack $NugetSpecPath -OutputDirectory $NugetDir -Verbosity Detailed -NonInteractive -Version $NugetVersion"
+
+    Write-Verbose "Command line: [$cmdLine]"
+
+    Invoke-Expression $cmdLine *>&1 | Write-Verbose
 }
 
 Task PackageChocolatey -Depends Build {
@@ -296,7 +301,11 @@ Task PackageChocolatey -Depends Build {
     Copy-Item $ModuleDir $ChocolateyToolsDir\TfsCmdlets -Recurse -Force
     Copy-Item $NugetSpecPath -Destination $ChocolateyDir -Force
 
-    & $ChocolateyPath Pack $ChocolateySpecPath -OutputDirectory $ChocolateyDir | Write-Verbose
+    $cmdLine = "$ChocolateyPath Pack $ChocolateySpecPath -OutputDirectory $ChocolateyDir --Version $Version"
+
+    Write-Verbose "Command line: [$cmdLine]"
+
+    Invoke-Expression $cmdLine *>&1 | Write-Verbose
 }
 
 Task PackageMsi -Depends Build {
@@ -468,7 +477,7 @@ Task GenerateNuspec {
     <metadata>
         <id>$($SourceManifest.Name)</id>
         <title>$($SourceManifest.Name)</title>
-        <version>$NugetVersion</version>
+        <version>0.0.0</version>
         <authors>$($SourceManifest.Author)</authors>
         <owners>$($SourceManifest.Author)</owners>
         <licenseUrl>$($SourceManifest.LicenseUri)</licenseUrl>