Merge branch 'master' into 838

ironmansoftware · Jun 18, 2019 · 8ec077b · 8ec077b
2 parents 3b26f3b + a0717dc
commit 8ec077b
Show file tree

Hide file tree

Showing 146 changed files with 4,238 additions and 299 deletions.
diff --git a/src/UniversalDashboard/Cmdlets/StartDashboardCommand.cs b/src/UniversalDashboard/Cmdlets/StartDashboardCommand.cs
@@ -55,11 +55,20 @@ public class StartDashboardCommand : PSCmdlet
 		[Parameter]
 		public PublishedFolder[] PublishedFolder { get; set; }
 
+		[Parameter()]
+		public SwitchParameter Force { get; set; }
+
         protected override void EndProcessing()
 	    {
             var assemblyBasePath = Path.GetDirectoryName(this.GetType().GetTypeInfo().Assembly.Location);
             var tempPath = Path.Combine(assemblyBasePath, "..", Constants.ModuleManifest);
 
+			if (Force) {
+				var existingServer = Server.Servers.FirstOrDefault(m => m.Port == Port || m.Name == m.Name);
+				existingServer.Stop();
+				Server.Servers.Remove(existingServer);
+			}
+
             // Cache dashboard
             if (Content == null && Dashboard == null && FilePath == null && File.Exists(Constants.CachedDashboardPath)) {
 				using(var powershell = PowerShell.Create()) {

diff --git a/src/UniversalDashboard/Cmdlets/StartRestApiCommand.cs b/src/UniversalDashboard/Cmdlets/StartRestApiCommand.cs
@@ -5,6 +5,7 @@
 using System.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Management.Automation.Runspaces;
+using System.Linq;
 
 namespace UniversalDashboard.Cmdlets
 {
@@ -41,6 +42,10 @@ public class StartRestApiCommand : PSCmdlet
 		public SwitchParameter AutoReload { get; set; }
 		[Parameter]
 		public PublishedFolder[] PublishedFolder { get; set; }
+
+		[Parameter()]
+		public SwitchParameter Force { get; set; }
+
 
         protected override void EndProcessing()
 		{
@@ -51,6 +56,12 @@ protected override void EndProcessing()
 				WriteWarning("AutoReload does not work on the command line. You must save your file as a script.");
 			}
 
+			if (Force) {
+				var existingServer = Server.Servers.FirstOrDefault(m => m.Port == Port || m.Name == m.Name);
+				existingServer.Stop();
+				Server.Servers.Remove(existingServer);
+			}
+
 			var server = new Server(Name, MyInvocation.ScriptName, AutoReload, Host, Port);
 
             var options = new DashboardOptions();

diff --git a/src/UniversalDashboard/Help/Add-UDElement.md b/src/UniversalDashboard/Help/Add-UDElement.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Clear-UDElement.md b/src/UniversalDashboard/Help/Clear-UDElement.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/ConvertTo-JsonEx.md b/src/UniversalDashboard/Help/ConvertTo-JsonEx.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: https://go.microsoft.com/fwlink/?LinkID=217032
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Disable-UDLogging.md b/src/UniversalDashboard/Help/Disable-UDLogging.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Enable-UDLogging.md b/src/UniversalDashboard/Help/Enable-UDLogging.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Get-UDContentType.md b/src/UniversalDashboard/Help/Get-UDContentType.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard-help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Get-UDCookie.md b/src/UniversalDashboard/Help/Get-UDCookie.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard-help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Get-UDDashboard.md b/src/UniversalDashboard/Help/Get-UDDashboard.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Get-UDElement.md b/src/UniversalDashboard/Help/Get-UDElement.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Get-UDLicense.md b/src/UniversalDashboard/Help/Get-UDLicense.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Get-UDRestApi.md b/src/UniversalDashboard/Help/Get-UDRestApi.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Get-UDTheme.md b/src/UniversalDashboard/Help/Get-UDTheme.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Grant-UDJsonWebToken.md b/src/UniversalDashboard/Help/Grant-UDJsonWebToken.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Hide-UDModal.md b/src/UniversalDashboard/Help/Hide-UDModal.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: https://go.microsoft.com/fwlink/?LinkID=217032
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Hide-UDToast.md b/src/UniversalDashboard/Help/Hide-UDToast.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: https://go.microsoft.com/fwlink/?LinkID=217032
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/Invoke-UDRedirect.md b/src/UniversalDashboard/Help/Invoke-UDRedirect.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: https://go.microsoft.com/fwlink/?LinkID=217032
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/New-UDAuthenticationMethod.md b/src/UniversalDashboard/Help/New-UDAuthenticationMethod.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/New-UDAuthenticationResult.md b/src/UniversalDashboard/Help/New-UDAuthenticationResult.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard.dll-Help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/New-UDBarChartDataset.md b/src/UniversalDashboard/Help/New-UDBarChartDataset.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard-help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0

diff --git a/src/UniversalDashboard/Help/New-UDBarChartOptions.md b/src/UniversalDashboard/Help/New-UDBarChartOptions.md
@@ -1,5 +1,5 @@
 ---
-external help file: UniversalDashboard-help.xml
+external help file: UniversalDashboard.Community-help.xml
 Module Name: UniversalDashboard.Community
 online version: 
 schema: 2.0.0