Merge branch 'develop1.0'

Author: DanielVanNoord

ASCOM.Alpaca.Razor/ASCOM.Alpaca.Razor.csproj

@@ -20,8 +20,8 @@
     <PackageReference Include="ASCOM.Common.Components" Version="2.0.9" />
     <PackageReference Include="ASCOM.Exception.Library" Version="7.0.1" />
     <PackageReference Include="ASCOM.Tools" Version="2.0.9" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.0.0" />
   </ItemGroup>
 
   <PropertyGroup>

ASCOM.Alpaca.Razor/StartupHelpers.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerUI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -82,6 +83,7 @@ public static void ConfigureSwagger(IApplicationBuilder app)
                     c.SwaggerEndpoint("/swagger/Alpaca/swagger.json",
                                  $"Alpaca Endpoints - v1");
                     c.SwaggerEndpoint("/swagger/OmniSim/swagger.json", "OmniSim Only Endpoints");
+                    c.DocExpansion(DocExpansion.None);
                 });
             }
         }

ASCOM.Alpaca.Simulators/ASCOM.Alpaca.Simulators.csproj

@@ -38,8 +38,9 @@
 		<PackageReference Include="ASCOM.Tools" Version="2.0.9" />
 		<PackageReference Include="Blazored.Toast" Version="4.2.1" />
 		<PackageReference Include="LetsMake.GithubUpdateChecker" Version="0.1.0-rc2" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.3.1" />
+		<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.0.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

ASCOM.Alpaca.Simulators/ConsoleAndTraceLogger.cs

@@ -31,7 +31,7 @@ public LogLevel LoggingLevel
 
         /// <summary>
         /// Gets or sets a value indicating whether the log should write to the console at all.
-        //// </summary>
+        /// </summary>
         internal static bool LogToConsole
         {
             get => ServerSettings.LogToConsole;

ASCOM.Alpaca.Simulators/Controllers/SetupController.cs

@@ -11,10 +11,16 @@
 
     <p>Server Transactions: @DeviceManager.RawTransactionID</p>
 
-    <a href="/swagger" target="_blank">View Swagger docs and interactive queries</a>
-    <p>Please note that the Alpaca API documentation on the ASCOM website is the canonical version. There are several issues with this auto generated version that will be resolved in future versions. This is currently provided only for testing the simulators.</p>
+
 </fieldset>
 
+    <fieldset>
+        <legend>Swagger API Documentation</legend>
+        <p>The OmniSim includes an interactive Swagger document for the Alpaca APIs and the OmniSim specific APIs. This includes json and yaml swagger files.</p>
+        <a href="/swagger" target="_blank" style=" border:3px solid  #003997; border-radius: 5px; padding: 3px; margin-bottom: 15px">View Swagger docs and interactive queries</a>
+        <p>Please note that the Alpaca API documentation on the ASCOM website is the canonical version. There are several issues with this auto generated version that will be resolved in future versions. This is currently provided only for autogenerating clients and testing the simulators.</p>
+    </fieldset>
+
 @if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
     <fieldset>

ASCOM.Alpaca.Simulators/Pages/Index.razor

@@ -9,8 +9,6 @@
 
 
 @code {
-    int currentCount = 0;
-
     [Parameter]
     public OmniSim.BaseDriver.Driver Driver { get; set; }
 

ASCOM.Alpaca.Simulators/Pages/LogLevelControl.razor

@@ -132,6 +132,7 @@ public static void Main(string[] args)
                             }
                             catch (Exception ex)
                             {
+                                WriteAndLog("Error processing external command" + ex.Message);
                             }
                         }
                     });
@@ -161,37 +162,6 @@ public static void Main(string[] args)
                         mutex.ReleaseMutex();
                 }
             }
-
-
-            /*try
-            {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                {
-                    //Already running, start the browser, detects based on port in use
-                    var con1 = IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections().Where(con => con.LocalEndPoint.Port == ServerSettings.ServerPort);
-                    if (IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections().Any(con => con.LocalEndPoint.Port == ServerSettings.ServerPort && (con.State == TcpState.Listen || con.State == TcpState.Established)))
-                    {
-                        WriteAndLog("Detected driver port already open, starting web browser on IP and Port. If this fails something else is using the port");
-                        StartBrowser(ServerSettings.ServerPort);
-                        return;
-                    }
-                }
-                else
-                {
-                    //This was working fine for .Net Core 3.1. Initial tests for .Net 5 show a change in how single file deployments work on Linux
-                    //This should probably be changed to a Mutex or another similar lock
-                    if (System.Diagnostics.Process.GetProcessesByName(System.IO.Path.GetFileNameWithoutExtension(System.Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1)
-                    {
-                        WriteAndLog("Detected driver already running, starting web browser on IP and Port");
-                        StartBrowser(ServerSettings.ServerPort);
-                        return;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.LogError(ex.Message);
-            }*/
         }
 
         private static Task InitServers(string[] args)