- Finished adding unit tests.

- Made sure the Build number is rolled down when using the BuildSystemsBuildId parameter.

Author: deadlydog

Set-ProjectFilesClickOnceVersion.ps1

@@ -75,6 +75,7 @@ Param
 	[int]$BuildSystemsBuildId = -1,
 
 	[Parameter(Mandatory=$false,HelpMessage="Use and increment the Revision part of the version number stored in the project file.",ParameterSetName="UseFilesRevision")]
+	[Alias("IncrementRevision")]
 	[switch]$IncrementProjectFilesRevision = $false,
 
 	[Parameter(Mandatory=$false,HelpMessage="When the switch is provided, the ClickOnce Minimum Required Version will be updated to this new version.")]
@@ -230,20 +231,20 @@ foreach ($clickOncePropertyGroup in $clickOncePropertyGroups)
 		throw "The version number '$appVersion' does not seem to have valid Major.Minor.Build version parts."
 	}
 	$majorMinor = $majorMinorBuildMatch.Groups["MajorMinor"].Value
-	$build = $majorMinorBuildMatch.Groups["Build"].Value
-	$revision = -1
+	[int]$build = $majorMinorBuildMatch.Groups["Build"].Value
+	[int]$revision = -1
 
 	# If a Revision was specified in the Version, get it.
 	if (![string]::IsNullOrWhiteSpace($majorMinorBuildMatch.Groups["Revision"]))
 	{
-		$revision = $majorMinorBuildMatch.Groups["Revision"]
+		$revision = [int]::Parse($majorMinorBuildMatch.Groups["Revision"])
 	}
 
 	# If we should be using the BuildSystemsBuildId for the Build and Revision.
 	if ($BuildSystemsBuildId -gt -1)
 	{
 		# Use a calculation for the Build and Revision to prevent the Revision value from being too large, and to increment the Build value as the BuildSystemsBuildId continues to grow larger.
-		$build = [int]($BuildSystemsBuildId / $maxVersionPartValueAllowed)
+		$build = [int][Math]::Floor($BuildSystemsBuildId / $maxVersionPartValueAllowed)
 		$revision = $BuildSystemsBuildId % $maxVersionPartValueAllowed
 	}
 
@@ -287,6 +288,7 @@ foreach ($clickOncePropertyGroup in $clickOncePropertyGroups)
 	Set-XmlNodesElementTextValue -xml $xml -node $clickOncePropertyGroup -elementName 'ApplicationRevision' -textValue $revision.ToString()
 	if ($UpdateMinimumRequiredVersionToCurrentVersion)
 	{
+		Write-Output "Updating minimum required version to be '$newVersionNumber'."
 		Set-XmlNodesElementTextValue -xml $xml -node $clickOncePropertyGroup -elementName 'MinimumRequiredVersion' -textValue "$newVersionNumber"
 		Set-XmlNodesElementTextValue -xml $xml -node $clickOncePropertyGroup -elementName 'UpdateRequired' -textValue 'true'
 		Set-XmlNodesElementTextValue -xml $xml -node $clickOncePropertyGroup -elementName 'UpdateEnabled' -textValue 'true'

Tests/RunTests.ps1

@@ -28,17 +28,35 @@ function RunScriptWithParameters($parameters)
 	$output = Invoke-Expression -Command "$($global:runScriptExpression) $parameters"
 	if ($output -imatch $global:versionNumberAtEndOfOutputRegex)
 	{
-		return $matches["Version"]
+		try
+		{
+			return $matches["Version"]
+		}
+		# If $output contains multiple lines, it will be treated as a collection instead of a string and $matches will not be defined, so catch that case.
+		catch { return $output }		
 	}
 	return $output
 }
 
 $testNumber = 0
+# Some tests are dependent on the order in which they are ran, which isn't ideal, but good enough for now.
 
-Write-Host ("{0}. Explicitly set version number..." -f ++$testNumber)
+Write-Host ("{0}. Use version number parameter..." -f ++$testNumber)
 $output = RunScriptWithParameters "-Version '1.2.3.4'"
 if ($output -eq '1.2.3.4') { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
 
-Write-Host ("{0}. Explicitly set version number..." -f ++$testNumber)
+Write-Host ("{0}. Use Build Id parameter..." -f ++$testNumber)
 $output = RunScriptWithParameters "-BuildSystemsBuildId 1234"
-if ($output -eq '1.2.0.1234') { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
+if ($output -eq '1.2.0.1234') { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
+
+Write-Host ("{0}. Use Build Id parameter greater than the max value to make sure build is set properly..." -f ++$testNumber)
+$output = RunScriptWithParameters "-BuildSystemsBuildId 123456"
+if ($output -eq '1.2.1.57921') { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
+
+Write-Host ("{0}. Use IncrementProjectFilesRevision parameter..." -f ++$testNumber)
+$output = RunScriptWithParameters "-IncrementProjectFilesRevision"
+if ($output -eq '1.2.1.57922') { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
+
+Write-Host ("{0}. Use version number parameter and update minimum required version..." -f ++$testNumber)
+$output = RunScriptWithParameters "-Version '5.6.7.8' -UpdateMinimumRequiredVersionToCurrentVersion"
+if ($output.Contains("Updating minimum required version to be '5.6.7.8'.")) { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }