Fixes #1319 (#1325)

ironmansoftware · Nov 19, 2019 · 1eae7c4 · 1eae7c4
1 parent 0c0907a
commit 1eae7c4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/UniversalDashboard/UniversalDashboardServer.psm1 b/src/UniversalDashboard/UniversalDashboardServer.psm1
@@ -1469,7 +1469,9 @@ function Publish-UDDashboard {
 		[Parameter(Mandatory = $true)]
 		[string]$DashboardFile,
 		[Parameter()]
-		[string]$TargetPath = $PSScriptRoot
+		[string]$TargetPath = $PSScriptRoot,
+		[Parameter(ParameterSetName = 'Service')]
+		[Switch]$DontSetExecutionPolicy
 	)
 
 	$DashboardFile = Resolve-Path $DashboardFile
@@ -1526,7 +1528,13 @@ function Publish-UDDashboard {
 
 		$binPath = [System.IO.Path]::Combine($TargetPath, "net472", "UniversalDashboard.Server.exe")
 
-		sc.exe create UniversalDashboard DisplayName= "PowerShell Universal Dashboard" binPath= "$binPath --run-as-service" start= "$ServiceStart"
+		$args = "$binPath --run-as-service";
+		if ($DontSetExecutionPolicy)
+		{
+			$args += " --dont-set-execution-policy"
+		}
+
+		sc.exe create UniversalDashboard DisplayName= "PowerShell Universal Dashboard" binPath= "$args" start= "$ServiceStart"
 
 		Write-Verbose "Starting service UniversalDashboard"
 		sc.exe start UniversalDashboard