Реорганизация

src/MonsterMonitor.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32929.386
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonsterMonitor", "MonsterMonitor\MonsterMonitor.csproj", "{7D6104C6-6AEF-4D31-8463-FCEABDF1577A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7D6104C6-6AEF-4D31-8463-FCEABDF1577A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D6104C6-6AEF-4D31-8463-FCEABDF1577A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D6104C6-6AEF-4D31-8463-FCEABDF1577A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D6104C6-6AEF-4D31-8463-FCEABDF1577A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

src/MonsterMonitor/Models/AppSettings.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace SshTunnelMonitor.Models
+namespace MonsterMonitor.Models
 {
     public sealed class AppSettings
     {
@@ -58,7 +58,7 @@ namespace SshTunnelMonitor.Models
         {
             if (string.IsNullOrWhiteSpace(SystemPasswordProtected))
             {
-                return "STerra";
+                return "";
             }
 
             if (!SystemPasswordProtected.StartsWith(ProtectedPrefix, StringComparison.Ordinal))

src/MonsterMonitor/MonsterMonitor.csproj

@@ -1,11 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net472</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>7.3</LangVersion>
-    <RootNamespace>SshTunnelMonitor</RootNamespace>
+    <RootNamespace>MonsterMonitor</RootNamespace>
     <AssemblyName>MonsterMonitor</AssemblyName>
+    <AssemblyVersion>1.0.3</AssemblyVersion>
+    <Version>1.0.3</Version>
+    <FileVersion>1.0.3</FileVersion>
+    <InformationalVersion>1.0.3</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Costura.Fody" Version="6.0.0">
@@ -28,4 +32,4 @@
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
+</Project>

src/MonsterMonitor/Program.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using SshTunnelMonitor.UI;
+using MonsterMonitor.UI;
 
-namespace SshTunnelMonitor
+namespace MonsterMonitor
 {
     internal static class Program
     {

src/MonsterMonitor/Services/AppController.cs

@@ -1,7 +1,7 @@
 using System;
-using SshTunnelMonitor.Models;
+using MonsterMonitor.Models;
 
-namespace SshTunnelMonitor.Services
+namespace MonsterMonitor.Services
 {
     public sealed class AppController : IDisposable
     {

src/MonsterMonitor/Services/AuthMonitor.cs

@@ -4,9 +4,9 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using SshTunnelMonitor.Models;
+using MonsterMonitor.Models;
 
-namespace SshTunnelMonitor.Services
+namespace MonsterMonitor.Services
 {
     public class AuthMonitor: IAuthMonitor
     {
@@ -57,8 +57,12 @@ namespace SshTunnelMonitor.Services
                     var activeWindowTitle = GetActiveWindowTitle();
                     if (activeWindowTitle?.Contains("XAuth request") == true)
                     {
-                        SendKeys.SendWait(_settings.GetSystemPassword());
-                        SendKeys.SendWait("{ENTER}");
+                        var password = _settings.GetSystemPassword();
+                        if (!string.IsNullOrEmpty(password))
+                        {
+                            SendKeys.SendWait(password);
+                            SendKeys.SendWait("{ENTER}");
+                        }
                     }
                 }
                 catch (Exception ex)

src/MonsterMonitor/Services/LogService.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace SshTunnelMonitor.Services
+namespace MonsterMonitor.Services
 {
     public enum LogLevel
     {

src/MonsterMonitor/Services/PowerManagementService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace SshTunnelMonitor.Services
+namespace MonsterMonitor.Services
 {
     public sealed class PowerManagementService
     {

src/MonsterMonitor/Services/ProcessMonitorService.cs

@@ -2,7 +2,7 @@ using System;
 using System.Diagnostics;
 using System.Threading;
 
-namespace SshTunnelMonitor.Services
+namespace MonsterMonitor.Services
 {
     public sealed class ProcessMonitorService : IDisposable
     {

src/MonsterMonitor/Services/SsConfigService.cs

@@ -1,9 +1,9 @@
 using System;
 using System.IO;
 using System.Security.Cryptography;
-using SshTunnelMonitor.Models;
+using MonsterMonitor.Models;
 
-namespace SshTunnelMonitor.Services
+namespace MonsterMonitor.Services
 {
     public sealed class SsConfigService
     {

src/MonsterMonitor/Services/SshTunnelService.cs

@@ -2,11 +2,11 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using MonsterMonitor.Models;
 using Renci.SshNet;
 using Renci.SshNet.Common;
-using SshTunnelMonitor.Models;
 
-namespace SshTunnelMonitor.Services
+namespace MonsterMonitor.Services
 {
     public sealed class SshTunnelService : IDisposable
     {

src/MonsterMonitor/UI/MainForm.cs

@@ -1,10 +1,10 @@
-using SshTunnelMonitor.Models;
-using SshTunnelMonitor.Services;
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using MonsterMonitor.Models;
+using MonsterMonitor.Services;
 
-namespace SshTunnelMonitor.UI
+namespace MonsterMonitor.UI
 {
     public sealed class MainForm : Form
     {
@@ -21,7 +21,7 @@ namespace SshTunnelMonitor.UI
 
         public MainForm()
         {
-            Text = "Monster Monitor";
+            Text = string.Format("Monster Monitor v{0}", Application.ProductVersion);
             Width = 980;
             Height = 620;
             StartPosition = FormStartPosition.CenterScreen;

src/MonsterMonitor/UI/SettingsForm.cs

@@ -1,10 +1,9 @@
-using System;
 using System.Drawing;
 using System.Security.Cryptography;
 using System.Windows.Forms;
-using SshTunnelMonitor.Models;
+using MonsterMonitor.Models;
 
-namespace SshTunnelMonitor.UI
+namespace MonsterMonitor.UI
 {
     public sealed class SettingsForm : Form
     {

src/Properties/AssemblyInfo.cs

@@ -1,31 +0,0 @@
-using System.Reflection;                                                                                      
-using System.Runtime.InteropServices;                                                                                      
-// General Information about an assembly is controlled through the following                                                                                      
-// set of attributes. Change these attribute values to modify the information                                                                                      
-// associated with an assembly.                                                                                      
-[assembly: AssemblyTitle("MonsterMonitor")]                                                                                      
-[assembly: AssemblyDescription("")]                                                                                      
-[assembly: AssemblyConfiguration("")]                                                                                      
-[assembly: AssemblyCompany("")]                                                                                      
-[assembly: AssemblyProduct("MonsterMonitor")]                                                                                      
-[assembly: AssemblyCopyright("Copyright ©  2021")]                                                                                      
-[assembly: AssemblyTrademark("")]                                                                                      
-[assembly: AssemblyCulture("")]                                                                                      
-// Setting ComVisible to false makes the types in this assembly not visible                                                                                      
-// to COM components.  If you need to access a type in this assembly from                                                                                      
-// COM, set the ComVisible attribute to true on that type.                                                                                      
-[assembly: ComVisible(false)]                                                                                      
-// The following GUID is for the ID of the typelib if this project is exposed to COM                                                                                      
-[assembly: Guid("0fb13d01-79ef-4d33-82ee-20f411e173fa")]                                                                                      
-// Version information for an assembly consists of the following four values:                                                                                      
-//                                                                                      
-//      Major Version                                                                                      
-//      Minor Version                                                                                      
-//      Build Number                                                                                      
-//      Revision                                                                                      
-//                                                                                      
-// You can specify all the values or you can default the Build and Revision Numbers                                                                                      
-// by using the '*' as shown below:                                                                                      
-[assembly: AssemblyVersion("1.0.2")] 
-[assembly: AssemblyFileVersion("1.0.2")] 
-[assembly: AssemblyInformationalVersion("1.0.2")]