From bde4d5eb0f15b8d1a784cbedfa4520489b6fa0b7 Mon Sep 17 00:00:00 2001 From: Micah Morrison Date: Mon, 17 Mar 2025 13:31:38 -0400 Subject: [PATCH 1/2] Put quotes around path to server config file for boot task --- WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs b/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs index f52f627..460a369 100644 --- a/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs +++ b/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs @@ -44,7 +44,7 @@ public void Resolve(string serverDataPath) // Create/update a Scheduled Task that sets the NetIPAddress on boot. TaskDefinition td = TaskService.Instance.NewTask(); - td.Actions.Add(new ExecAction(Path.Combine(AppContext.BaseDirectory, "ws4w.exe"), $"{typeof(SetNetIpAddressCommand).GetVerb()} --{typeof(SetNetIpAddressCommand).GetOption(nameof(SetNetIpAddressCommand.ServerDataPath))} {serverDataPath ?? ServerConfigurationPrerequisite.ServerDataPath}")); + td.Actions.Add(new ExecAction(Path.Combine(AppContext.BaseDirectory, "ws4w.exe"), $"{typeof(SetNetIpAddressCommand).GetVerb()} --{typeof(SetNetIpAddressCommand).GetOption(nameof(SetNetIpAddressCommand.ServerDataPath))} \"{serverDataPath ?? ServerConfigurationPrerequisite.ServerDataPath}\"")); td.Triggers.Add(new BootTrigger { Delay = GlobalAppSettings.Instance.BootTaskDelay + TimeSpan.FromSeconds(15) }); TaskService.Instance.RootFolder.RegisterTaskDefinition(_netIpAddressTaskUniqueName, td, TaskCreation.CreateOrUpdate, "SYSTEM", null, TaskLogonType.ServiceAccount); From 5dac365a32f4a8ecbd0de1897c26ffac9acfc24f Mon Sep 17 00:00:00 2001 From: micahmo <7417301+micahmo@users.noreply.github.com> Date: Mon, 17 Mar 2025 17:32:40 +0000 Subject: [PATCH 2/2] Bump version to 2.1.4 --- Directory.Build.props | 6 +++--- Installer/WS4WSetupScript.iss | 2 +- WireGuardServerForWindows/VersionInfo2.xml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 234478b..88c4250 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,9 +1,9 @@ - 2.1.3.0 - 2.1.3.0 - 2.1.3.0 + 2.1.4.0 + 2.1.4.0 + 2.1.4.0 Micah Morrison WS4W diff --git a/Installer/WS4WSetupScript.iss b/Installer/WS4WSetupScript.iss index 4082dff..dae45de 100644 --- a/Installer/WS4WSetupScript.iss +++ b/Installer/WS4WSetupScript.iss @@ -1,6 +1,6 @@ #define MyAppNameOld "WireGuard Server For Windows" #define MyAppName "Wg Server for Windows" -#define MyAppVersion "2.1.3" +#define MyAppVersion "2.1.4" #define MyAppPublisher "Micah Morrison" #define MyAppURL "https://github.com/micahmo/WgServerforWindows" #define MyAppExeName "WgServerforWindows.exe" diff --git a/WireGuardServerForWindows/VersionInfo2.xml b/WireGuardServerForWindows/VersionInfo2.xml index 79475c9..9257c26 100644 --- a/WireGuardServerForWindows/VersionInfo2.xml +++ b/WireGuardServerForWindows/VersionInfo2.xml @@ -2,12 +2,12 @@ - 2.1.3.0 - 2025-03-05 + 2.1.4.0 + 2025-03-17 - https://github.com/micahmo/WgServerforWindows/releases/download/v2.1.3/WS4WSetup-2.1.3.exe - WS4WSetup-2.1.3.exe + https://github.com/micahmo/WgServerforWindows/releases/download/v2.1.4/WS4WSetup-2.1.4.exe + WS4WSetup-2.1.4.exe - - Show warning if another process is listening on the configured WireGuard server port (#138 and #188) + - Fix issue where NAT boot task could fail (#139)