Support service names with $ signs again

jabbera · jabbera · commit d493b973a837 · 2016-11-10T10:57:15.000-05:00
diff --git a/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StartWindowsService/StartWindowsService.ps1 b/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StartWindowsService/StartWindowsService.ps1
@@ -21,7 +21,7 @@ Try
 
 	. $env:CURRENT_TASK_ROOTDIR\Utility.ps1
 
-	$serviceNames = '"' + $serviceNames + '"'
+	$serviceNames = '"' + $serviceNames.Replace('`', '``').Replace('"', '`"').Replace('$', '`$').Replace('&', '`&').Replace('''', '`''') + '"'
 
 	Remote-ServiceStartStop -serviceNames $serviceNames -machinesList $environmentName -adminUserName $adminUserName -adminPassword $adminPassword -startupType $startupType -protocol $protocol -testCertificate $testCertificate -waitTimeoutInSeconds $waitTimeoutInSeconds -internStringFileName "StartWindowsServiceIntern.ps1" -killIfTimedOut "false" -runPowershellInParallel $runPowershellInParallel
 }
diff --git a/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StopWindowsService/StopWindowsService.ps1 b/Extensions/WindowsServiceReleaseTasks/Src/Tasks/StopWindowsService/StopWindowsService.ps1
@@ -22,7 +22,7 @@ Try
 
 	. $env:CURRENT_TASK_ROOTDIR\Utility.ps1
 
-	$serviceNames = '"' + $serviceNames + '"'
+	$serviceNames = '"' + $serviceNames.Replace('`', '``').Replace('"', '`"').Replace('$', '`$').Replace('&', '`&').Replace('''', '`''') + '"'
 
 	Remote-ServiceStartStop -serviceNames $serviceNames -machinesList $environmentName -adminUserName $adminUserName -adminPassword $adminPassword -startupType $startupType -protocol $protocol -testCertificate $testCertificate -waitTimeoutInSeconds $waitTimeoutInSeconds -internStringFileName "StopWindowsServiceIntern.ps1" -killIfTimedOut $killIfTimedOut	 -runPowershellInParallel $runPowershellInParallel
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ Try`
`21`	`21`
`22`	`22`	`. $env:CURRENT_TASK_ROOTDIR\Utility.ps1`
`23`	`23`
`24`		`- $serviceNames = '"' + $serviceNames + '"'`
	`24`	+ $serviceNames = '"' + $serviceNames.Replace('`', '``').Replace('"', '`"').Replace('$', '`$').Replace('&', '`&').Replace('''', '`''') + '"'
`25`	`25`
`26`	`26`	`Remote-ServiceStartStop -serviceNames $serviceNames -machinesList $environmentName -adminUserName $adminUserName -adminPassword $adminPassword -startupType $startupType -protocol $protocol -testCertificate $testCertificate -waitTimeoutInSeconds $waitTimeoutInSeconds -internStringFileName "StartWindowsServiceIntern.ps1" -killIfTimedOut "false" -runPowershellInParallel $runPowershellInParallel`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ Try`
`22`	`22`
`23`	`23`	`. $env:CURRENT_TASK_ROOTDIR\Utility.ps1`
`24`	`24`
`25`		`- $serviceNames = '"' + $serviceNames + '"'`
	`25`	+ $serviceNames = '"' + $serviceNames.Replace('`', '``').Replace('"', '`"').Replace('$', '`$').Replace('&', '`&').Replace('''', '`''') + '"'
`26`	`26`
`27`	`27`	`Remote-ServiceStartStop -serviceNames $serviceNames -machinesList $environmentName -adminUserName $adminUserName -adminPassword $adminPassword -startupType $startupType -protocol $protocol -testCertificate $testCertificate -waitTimeoutInSeconds $waitTimeoutInSeconds -internStringFileName "StopWindowsServiceIntern.ps1" -killIfTimedOut $killIfTimedOut -runPowershellInParallel $runPowershellInParallel`
`28`	`28`	`}`