Reverse install and publish url values

- Noticed that I had the values for install and publish url's reversed
so I fixed it. Publish url format is like a fileshare (\\fileshare\folder)
and install url format is like a web url (http://fileshare/folder)

- Updated the tests to reflect the reversal of values

- Updated csproj file to reflect the reversal of values

- Updated readme with parameter names and example. Note I had
the example in the script file correct but it was wrong every where
else!

Author: Brett Groff

ReadMe.md

@@ -8,15 +8,18 @@ Setting the MinimumRequiredVersion property forces the ClickOnce application to
 
 # Script Parameters
 * **ProjectFilePath** (required) - Path of the .csproj and .vbproj file to process.
-	
+
 * **Version** - The Version to update the ClickOnce version number to. This version must be of the format Major.Minor.Build or Major.Minor.Build.Revision. The Build and Revision parts will be overridden by the BuildSystemsBuildId parameter, if it is provided. The Revision parts will be overriden by the IncrementProjectFilesRevision parameter, if it is provided.
 
 * **BuildSystemsBuildId** - The build system's unique and auto-incrementing Build ID. This will be used to generate the Build and Revision parts of the new Version number. This will override the Build and Revision specified in the Version parameter, if it was provided. This parameter cannot be used with the IncrementProjectFilesRevision parameter.
-	
+
 * **IncrementProjectFilesRevision** - If this switch is provided, the Revision from the project file will be incremented and used in the new ClickOnce Version. This will override the Revision specified in the Version parameter, if it was provided. This parameter cannot be used with the BuildSystemsBuildId parameter.
-	
+
 * **UpdateMinimumRequiredVersionToCurrentVersion** - If this switch is provided, the ClickOnce MinimumRequiredVersion will be updated to match the new Version. Setting the MinimumRequiredVersion property forces the ClickOnce application to update automatically without prompting the user.
 
+* **PublishUrl** - If this switch is provided, the ClickOnce PublishUrl will be updated. The publish url format is \\fileshare\foldername
+
+* **InstallUrl** - If this switch is provided, the ClickOnce InstallUrl will be updated. The install url format is http://fileshare/foldername
 
 # Examples
 Update a project file's ClickOnce version to the specified version.
@@ -52,4 +55,11 @@ Update a project file's ClickOnce version, ignoring the Revision part and increm
 & .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -Version '1.2.3' -IncrementProjectFilesRevision -UpdateMinimumRequiredVersionToCurrentVersion
 ```
 
-[AutoUpdateProjectsMinimumRequiredClickOnceVersionNugetPackageWebpage]: https://www.nuget.org/packages/AutoUpdateProjectsMinimumRequiredClickOnceVersion
+---
+
+Update a project file's ClickOnce version and its install and publish url values.
+```
+& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -Version 1.0.1.9 -PublishUrl "\\fileshare\foldername" -InstallUrl "http://fileshare/foldername"
+```
+
+[AutoUpdateProjectsMinimumRequiredClickOnceVersionNugetPackageWebpage]: https://www.nuget.org/packages/AutoUpdateProjectsMinimumRequiredClickOnceVersion

Set-ProjectFilesClickOnceVersion.ps1

@@ -2,14 +2,14 @@
 <#
 .SYNOPSIS
    This script updates the ClickOnce version in a project file (.csproj or .vbproj), and may update the MinimumRequiredVersion to be this same version.
-   
+
 .DESCRIPTION
    This script updates the current ClickOnce version in a project file (.csproj or .vbproj), and may update the MinimumRequiredVersion to be this same version.
    Setting the MinimumRequiredVersion property forces the ClickOnce application to update automatically without prompting the user.
-   
+
 .PARAMETER ProjectFilePath
 	(required) Path of the .csproj and .vbproj file to process.
-	
+
 .PARAMETER Version
 	The Version to update the ClickOnce version number to. This version must be of the format Major.Minor.Build or Major.Minor.Build.Revision.
 	The Build and Revision parts will be overridden by the BuildSystemsBuildId parameter, if it is provided.
@@ -19,12 +19,12 @@
 	The build system's unique and auto-incrementing Build ID. This will be used to generate the Build and Revision parts of the new Version number.
 	This will override the Build and Revision specified in the Version parameter, if it was provided.
 	This parameter cannot be used with the IncrementProjectFilesRevision parameter.
-	
+
 .PARAMETER IncrementProjectFilesRevision
 	If this switch is provided, the Revision from the project file will be incremented and used in the new ClickOnce Version.
 	This will override the Revision specified in the Version parameter, if it was provided.
 	This parameter cannot be used with the BuildSystemsBuildId parameter.
-	
+
 .PARAMETER UpdateMinimumRequiredVersionToCurrentVersion
 	If this switch is provided, the ClickOnce MinimumRequiredVersion will be updated to match the new Version.
 	Setting the MinimumRequiredVersion property forces the ClickOnce application to update automatically without prompting the user.
@@ -37,29 +37,29 @@
 
 .EXAMPLE
 	Update a project file's ClickOnce version to the specified version.
-	
+
 	& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -Version '1.2.3.4'
 
 .EXAMPLE
 	Update the Build and Revision parts of a project file's ClickOnce version, based on a unique, auto-incrementing integer, such as a build system's Build ID.
-	
+
 	& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -BuildSystemsBuildId 123456
 
 .EXAMPLE
 	Increment the Revision of a project file's ClickOnce version.
-	
+
 	& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -IncrementProjectFilesRevision
 
 .EXAMPLE
 	Update a project file's ClickOnce Minimum Required Version to match its current version.
-	
+
 	& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -UpdateMinimumRequiredVersionToCurrentVersion
-	
+
 .EXAMPLE
 	Update a project file's ClickOnce version, ignoring the Revision part and incrementing the Revision stored in the file, and update the Minimum Required Version to be this new version.
-	
+
 	& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -Version '1.2.3' -IncrementProjectFilesRevision -UpdateMinimumRequiredVersionToCurrentVersion
-	
+
 .EXAMPLE
 	Update a project file's ClickOnce version using both Version and a unique, auto-incrementing integer, such as a build system's Build ID. This will keep the major and minor versions you specify but update the build and revision (e.g. 1.0.1.5745)
 
@@ -68,12 +68,12 @@
 .EXAMPLE
 	Update a project file's ClickOnce version and its install and publish url values.
 
-	& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -Version 1.0.1.9 -PublishUrl "\\servername\foldername" -InstallUrl "http://servername/foldername"
+	& .\Set-ProjectFilesClickOnceVersion.ps1 -ProjectFilePath "C:\SomeProject.csproj" -Version 1.0.1.9 -PublishUrl "\\fileshare\foldername" -InstallUrl "http://fileshare/foldername"
 
 
 .LINK
 	Project Home: https://github.com/deadlydog/Set-ProjectFilesClickOnceVersion
-	
+
 .NOTES
 	Author: Daniel Schroeder
 	Version: 2.0.0
@@ -125,7 +125,7 @@ function Get-XmlNamespaceManager([xml]$XmlDocument, [string]$NamespaceURI = "")
 {
     # If a Namespace URI was not given, use the Xml document's default namespace.
 	if ([string]::IsNullOrEmpty($NamespaceURI)) { $NamespaceURI = $XmlDocument.DocumentElement.NamespaceURI }
-	
+
 	# In order for SelectSingleNode() to actually work, we need to use the fully qualified node path along with an Xml Namespace Manager, so set them up.
 	[System.Xml.XmlNamespaceManager]$xmlNsManager = New-Object System.Xml.XmlNamespaceManager($XmlDocument.NameTable)
 	$xmlNsManager.AddNamespace("ns", $NamespaceURI)
@@ -141,7 +141,7 @@ function Get-XmlNode([xml]$XmlDocument, [string]$NodePath, [string]$NamespaceURI
 {
 	$xmlNsManager = Get-XmlNamespaceManager -XmlDocument $XmlDocument -NamespaceURI $NamespaceURI
 	[string]$fullyQualifiedNodePath = Get-FullyQualifiedXmlNodePath -NodePath $NodePath -NodeSeparatorCharacter $NodeSeparatorCharacter
-	
+
 	# Try and get the node, then return it. Returns $null if the node was not found.
 	$node = $XmlDocument.SelectSingleNode($fullyQualifiedNodePath, $xmlNsManager)
 	return $node
@@ -159,36 +159,36 @@ function Get-XmlNodes([xml]$XmlDocument, [string]$NodePath, [string]$NamespaceUR
 
 function Get-XmlElementsTextValue([xml]$XmlDocument, [string]$ElementPath, [string]$NamespaceURI = "", [string]$NodeSeparatorCharacter = '.')
 {
-	# Try and get the node.	
+	# Try and get the node.
 	$node = Get-XmlNode -XmlDocument $XmlDocument -NodePath $ElementPath -NamespaceURI $NamespaceURI -NodeSeparatorCharacter $NodeSeparatorCharacter
-	
+
 	# If the node already exists, return its value, otherwise return null.
 	if ($node) { return $node.InnerText } else { return $null }
 }
 
 function Set-XmlElementsTextValue([xml]$XmlDocument, [string]$ElementPath, [string]$TextValue, [string]$NamespaceURI = "", [string]$NodeSeparatorCharacter = '.')
 {
-	# Try and get the node.	
+	# Try and get the node.
 	$node = Get-XmlNode -XmlDocument $XmlDocument -NodePath $ElementPath -NamespaceURI $NamespaceURI -NodeSeparatorCharacter $NodeSeparatorCharacter
-	
+
 	# If the node already exists, update its value.
 	if ($node)
-	{ 
+	{
 		$node.InnerText = $TextValue
 	}
 	# Else the node doesn't exist yet, so create it with the given value.
 	else
 	{
 		# Create the new element with the given value.
 		$elementName = $ElementPath.Substring($ElementPath.LastIndexOf($NodeSeparatorCharacter) + 1)
- 		$element = $XmlDocument.CreateElement($elementName, $XmlDocument.DocumentElement.NamespaceURI)		
+ 		$element = $XmlDocument.CreateElement($elementName, $XmlDocument.DocumentElement.NamespaceURI)
 		$textNode = $XmlDocument.CreateTextNode($TextValue)
 		$element.AppendChild($textNode) > $null
-		
+
 		# Try and get the parent node.
 		$parentNodePath = $ElementPath.Substring(0, $ElementPath.LastIndexOf($NodeSeparatorCharacter))
 		$parentNode = Get-XmlNode -XmlDocument $XmlDocument -NodePath $parentNodePath -NamespaceURI $NamespaceURI -NodeSeparatorCharacter $NodeSeparatorCharacter
-		
+
 		if ($parentNode)
 		{
 			$parentNode.AppendChild($element) > $null
@@ -204,7 +204,7 @@ function Set-XmlNodesElementTextValue([xml]$xml, $node, $elementName, $textValue
 {
 	if ($null -eq $node.($elementName))
 	{
-		$element = $xml.CreateElement($elementName, $xml.DocumentElement.NamespaceURI)		
+		$element = $xml.CreateElement($elementName, $xml.DocumentElement.NamespaceURI)
 		$textNode = $xml.CreateTextNode($textValue)
 		$element.AppendChild($textNode) > $null
 		$node.AppendChild($element) > $null
@@ -224,7 +224,7 @@ $versionNumberRegex = New-Object System.Text.RegularExpressions.Regex "(?<MajorM
 # Open the Xml file and get the <PropertyGroup> elements with the ClickOnce properties in it.
 [xml]$xml = Get-Content -Path $ProjectFilePath
 $propertyGroups = Get-XmlNodes -XmlDocument $xml -NodePath 'Project.PropertyGroup'
-[Array]$clickOncePropertyGroups = $propertyGroups | Where-Object { 
+[Array]$clickOncePropertyGroups = $propertyGroups | Where-Object {
 	try
 	{
 		return ($_.ApplicationVersion -ne $null)
@@ -270,7 +270,7 @@ foreach ($clickOncePropertyGroup in $clickOncePropertyGroups)
 	{
 		$appVersion = $clickOncePropertyGroup.ApplicationVersion
 	}
-	
+
 	# Get the Major, Minor, and Build parts of the version number.
 	$majorMinorBuildMatch = $versionNumberRegex.Match($appVersion)
 	if (!$majorMinorBuildMatch.Success)
@@ -280,20 +280,20 @@ foreach ($clickOncePropertyGroup in $clickOncePropertyGroups)
 	$majorMinor = $majorMinorBuildMatch.Groups["MajorMinor"].Value
 	[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 = [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][Math]::Floor($BuildSystemsBuildId / $maxVersionPartValueAllowed)
 		$revision = $BuildSystemsBuildId % $maxVersionPartValueAllowed
-		
+
 		Write-Verbose "Translated BuildSystemsBuildId '$BuildSystemsBuildId' into Build.Revision '$build.$revision'."
 	}
 
@@ -305,19 +305,19 @@ foreach ($clickOncePropertyGroup in $clickOncePropertyGroups)
 		if ($null -eq $applicationRevisionString)
 		{
 			throw "Could not find the <ApplicationRevision> element in the project file '$ProjectFilePath'."
-		}		
+		}
 		if (!($applicationRevisionString -imatch '^\d+$'))
 		{
 			throw "The <ApplicationRevision> elements value '$applicationRevisionString' in the file '$ProjectFilePath' does not appear to be a valid integer."
 		}
-		
+
 		$revision = [int]::Parse($applicationRevisionString)
-		
+
 		# If the Revision should be incremented, do it.
 		if ($IncrementProjectFilesRevision)
 		{
 			$revision = $revision + 1
-			
+
 			# Make sure the Revision version part is not greater than the max allowed value.
 			if ($revision -gt $maxVersionPartValueAllowed)
 			{
@@ -326,12 +326,12 @@ foreach ($clickOncePropertyGroup in $clickOncePropertyGroups)
 			}
 		}
 	}
-	
+
 	# Create the version number to use for the ClickOnce version.
 	$newMajorMinorBuild = "$majorMinor.$build"
 	$newVersionNumber = "$newMajorMinorBuild.$revision"
 	Write-Output "Updating version number to be '$newVersionNumber'."
-	
+
 	# Write the new values to the file.
 	Set-XmlNodesElementTextValue -xml $xml -node $clickOncePropertyGroup -elementName 'ApplicationVersion' -textValue "$newMajorMinorBuild.%2a"
 	Set-XmlNodesElementTextValue -xml $xml -node $clickOncePropertyGroup -elementName 'ApplicationRevision' -textValue $revision.ToString()

Tests/RunTests.ps1

@@ -33,11 +33,11 @@ function RunScriptWithParameters($parameters)
 			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 }		
+		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.
 
@@ -66,11 +66,11 @@ $output = RunScriptWithParameters "-Version '1.1.0.0' -BuildSystemsBuildId 12345
 if ($output -eq '1.1.1.57921') { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
 
 Write-Host ("{0}. Use version and publish url parameter...." -f ++$testNumber)
-$output = RunScriptWithParameters "-Version '1.0.5.9' -PublishUrl 'http://testserver/folder'"
+$output = RunScriptWithParameters "-Version '1.0.5.9' -PublishUrl '\\fileshare\foldername'"
 # Multiple output statements are objects in an array in the order they are outputted
-if ($output[0].Contains('http://testserver/folder') -AND $output[1].Contains('1.0.5.9')) { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
+if ($output[0].Contains('\\fileshare\foldername') -AND $output[1].Contains('1.0.5.9')) { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
 
 Write-Host ("{0}. Use BuildId parameter, publish url parameter and install url parameter...." -f ++$testNumber)
-$output = RunScriptWithParameters "-BuildSystemsBuildId 123456 -PublishUrl 'http://testserver/folder' -InstallUrl '\\fileshare\folder'"
+$output = RunScriptWithParameters "-BuildSystemsBuildId 123456 -PublishUrl '\\fileshare\foldername' -InstallUrl 'http://fileshare/foldername'"
 # Multiple output statements are objects in an array in the order they are outputted
-if ($output[0].Contains('http://testserver/folder') -AND $output[1].Contains('\\fileshare\folder') -AND $output[2].Contains('1.0.1.57921')) { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }
+if ($output[0].Contains('\\fileshare\foldername') -AND $output[1].Contains('http://fileshare/foldername') -AND $output[2].Contains('1.0.1.57921')) { Write-Host "Passed" } else { throw "Test $testNumber failed. Output was '$output'." }

Tests/TestFiles/TestProject.csproj

@@ -14,7 +14,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
+    <PublishUrl>\\fileshare\foldername</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -24,7 +24,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>\\publish\app</InstallUrl>
+    <InstallUrl>http://fileshare/foldername</InstallUrl>
     <MinimumRequiredVersion>1.0.0.1</MinimumRequiredVersion>
     <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
@@ -128,7 +128,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>