About dialog and install scripts.

NTDLS · Jun 21, 2024 · e665f4a · e665f4a
1 parent 5bf3a0a
commit e665f4a
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 116 deletions.
diff --git a/...tallers/Service and Management Bundle.Iss → @Installers/Installer.Iss b/...tallers/Service and Management Bundle.Iss → @Installers/Installer.Iss
@@ -1,4 +1,4 @@
-#define AppVersion "2.2.0"
+#define AppVersion "3.0.0"
 
 [Setup]
 ;-- Main Setup Information
@@ -21,26 +21,32 @@
  AppPublisherURL                  = http://www.NetworkDLS.com/
  AppUpdatesURL                    = http://www.NetworkDLS.com/
 
+[Components]
+ Name: Base;            Description: "Base Install";       Types: full compact custom;  Flags: Fixed;
+ Name: Base\Management; Description: "Management Console"; Types: full compact custom;
+ Name: Base\Service;    Description: "Tunnel Service";     Types: full compact custom;
+
+
 [Files]
- Source: "..\NetTunnel.Service\bin\Release\net8.0\runtimes\*.*"; DestDir: "{app}\runtimes";  Flags: IgnoreVersion recursesubdirs;
- Source: "..\NetTunnel.Service\bin\Release\net8.0\*.exe";        DestDir: "{app}";           Flags: IgnoreVersion;
- Source: "..\NetTunnel.Service\bin\Release\net8.0\*.dll";        DestDir: "{app}";           Flags: IgnoreVersion;
- Source: "..\NetTunnel.Service\bin\Release\net8.0\*.json";       DestDir: "{app}";           Flags: IgnoreVersion;
-
- Source: "..\NetTunnel.UI\bin\Release\net8.0-windows\*.exe";     DestDir: "{app}";           Flags: IgnoreVersion;
- Source: "..\NetTunnel.UI\bin\Release\net8.0-windows\*.dll";     DestDir: "{app}";           Flags: IgnoreVersion;
- Source: "..\NetTunnel.UI\bin\Release\net8.0-windows\*.json";    DestDir: "{app}";           Flags: IgnoreVersion;
+ Source: "..\NetTunnel.Service\bin\Release\net8.0\runtimes\*.*"; DestDir: "{app}\runtimes";  Flags: IgnoreVersion recursesubdirs;  Components: Base\Management;
+ Source: "..\NetTunnel.Service\bin\Release\net8.0\*.exe";        DestDir: "{app}";           Flags: IgnoreVersion;                 Components: Base\Management;
+ Source: "..\NetTunnel.Service\bin\Release\net8.0\*.dll";        DestDir: "{app}";           Flags: IgnoreVersion;                 Components: Base\Management;
+ Source: "..\NetTunnel.Service\bin\Release\net8.0\*.json";       DestDir: "{app}";           Flags: IgnoreVersion;                 Components: Base\Management;
+
+ Source: "..\NetTunnel.UI\bin\Release\net8.0-windows\*.exe";     DestDir: "{app}";           Flags: IgnoreVersion;                 Components: Base\Service;
+ Source: "..\NetTunnel.UI\bin\Release\net8.0-windows\*.dll";     DestDir: "{app}";           Flags: IgnoreVersion;                 Components: Base\Service;
+ Source: "..\NetTunnel.UI\bin\Release\net8.0-windows\*.json";    DestDir: "{app}";           Flags: IgnoreVersion;                 Components: Base\Service;
 
 [Icons]
- Name: "{commondesktop}\NetTunnel Manager"; Filename: "{app}\NetTunnel.UI.exe";
- Name: "{group}\NetTunnel Manager";         Filename: "{app}\NetTunnel.UI.exe";
+ Name: "{commondesktop}\NetTunnel Manager"; Filename: "{app}\NetTunnel.UI.exe";                                                    Components: Base\Management;
+ Name: "{group}\NetTunnel Manager";         Filename: "{app}\NetTunnel.UI.exe";                                                    Components: Base\Management;
 
 [Run]
- Filename: "{app}\NetTunnel.Service.exe"; Parameters: "install"; Flags: runhidden; StatusMsg: "Installing service..."
- Filename: "{app}\NetTunnel.Service.exe"; Parameters: "start"; Flags: runhidden; StatusMsg: "Starting service..."
- Filename: "{app}\NetTunnel.UI.exe"; Description: "Run NetTunnel Manager now?"; Flags: postinstall nowait skipifsilent shellexec;
+ Filename: "{app}\NetTunnel.Service.exe"; Parameters: "install"; Flags: runhidden; StatusMsg: "Installing service...";             Components: Base\Service;
+ Filename: "{app}\NetTunnel.Service.exe"; Parameters: "start"; Flags: runhidden; StatusMsg: "Starting service...";                 Components: Base\Service;
+ Filename: "{app}\NetTunnel.UI.exe"; Description: "Run NetTunnel Manager now?"; Flags: postinstall nowait skipifsilent shellexec;  Components: Base\Management;
 
 [UninstallRun]
- Filename: "{app}\NetTunnel.Service.exe"; Parameters: "uninstall"; Flags: runhidden; StatusMsg: "Installing service..."; RunOnceId: "ServiceRemoval"
+ Filename: "{app}\NetTunnel.Service.exe"; Parameters: "uninstall"; Flags: runhidden; StatusMsg: "Installing service..."; RunOnceId: "ServiceRemoval"; Components: Base\Service;
 
 
diff --git a/@Installers/Standalone Management.Iss b/@Installers/Standalone Management.Iss
diff --git a/NetTunnel.Service/NetTunnel.Service.csproj b/NetTunnel.Service/NetTunnel.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ApplicationIcon>Multi.ico</ApplicationIcon>

diff --git a/NetTunnel.UI/Forms/FormAbout.Designer.cs b/NetTunnel.UI/Forms/FormAbout.Designer.cs
diff --git a/NetTunnel.UI/Forms/FormAbout.resx b/NetTunnel.UI/Forms/FormAbout.resx
@@ -120,63 +120,31 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

diff --git a/NetTunnel.sln b/NetTunnel.sln
@@ -11,8 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetTunnel.Service", "NetTun
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F927DF22-97CB-409B-9B79-1B2C77DE1952}"
 	ProjectSection(SolutionItems) = preProject
-		@Installers\Service and Management Bundle.Iss = @Installers\Service and Management Bundle.Iss
-		@Installers\Standalone Management.Iss = @Installers\Standalone Management.Iss
+		@Installers\Installer.Iss = @Installers\Installer.Iss
 	EndProjectSection
 EndProject
 Global