Merge pull request #64 from micahmo/release/v2.0.3

Release/v2.0.3
micahmo · Oct 31, 2022 · 1dcfbd0 · 1dcfbd0
2 parents 17b6bc2 + e822ed5
commit 1dcfbd0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <!-- Keep in sync with WS4WSetupScript.iss and VersionInfo.xml -->
-        <AssemblyVersion>2.0.2.0</AssemblyVersion>
-        <FileVersion>2.0.2.0</FileVersion>
-        <InformationalVersion>2.0.2.0</InformationalVersion>
+        <AssemblyVersion>2.0.3.0</AssemblyVersion>
+        <FileVersion>2.0.3.0</FileVersion>
+        <InformationalVersion>2.0.3.0</InformationalVersion>
         <Authors>Micah Morrison</Authors>
         <Product>WS4W</Product>
     </PropertyGroup>

diff --git 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.0.2"
+#define MyAppVersion "2.0.3"
 #define MyAppPublisher "Micah Morrison"
 #define MyAppURL "https://github.com/micahmo/WgServerforWindows"
 #define MyAppExeName "WgServerforWindows.exe"

diff --git a/WgServerforWindows/Models/NewNetNatPrerequisite.cs b/WgServerforWindows/Models/NewNetNatPrerequisite.cs
@@ -203,9 +203,21 @@ public bool IsSupported
             {
                 new WireGuardExe().ExecuteCommand(new WireGuardCommand(string.Empty, WhichExe.Custom,
                         "powershell.exe",
-                        "-NoProfile Get-Help New-NetNat -Parameter InternalIPInterfaceAddressPrefix"),
+                        "-NoProfile if ((Get-Command New-NetNat).Parameters.ContainsKey('InternalIPInterfaceAddressPrefix')) { exit 0 } else { exit 1 }"),
                     out int exitCode);
 
+                if (exitCode == 0)
+                {
+                    return true;
+                }
+
+                // In case the Get-Command fails, fall back to the old check: Get-Help
+
+                new WireGuardExe().ExecuteCommand(new WireGuardCommand(string.Empty, WhichExe.Custom,
+                        "powershell.exe",
+                        "-NoProfile Get-Help New-NetNat -Parameter InternalIPInterfaceAddressPrefix"),
+                    out exitCode);
+
                 return exitCode == 0;
             }
         }

diff --git a/WireGuardServerForWindows/VersionInfo2.xml b/WireGuardServerForWindows/VersionInfo2.xml
@@ -2,13 +2,12 @@
 <!-- Things to update: Version, Date, Release Notes -->
 <AppUpdate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/micahmo/WgServerforWindows/master/WireGuardServerForWindows/AppUpdate.xsd">
-  <Version>2.0.2.0</Version>
-  <ReleaseDate>2022-09-27</ReleaseDate>
+  <Version>2.0.3.0</Version>
+  <ReleaseDate>2022-10-31</ReleaseDate>
   <!-- Default download -->
-  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.2/WS4WSetup-2.0.2.exe</DownloadLink>
-  <DownloadFileName>WS4WSetup-2.0.2.exe</DownloadFileName>
+  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.3/WS4WSetup-2.0.3.exe</DownloadLink>
+  <DownloadFileName>WS4WSetup-2.0.3.exe</DownloadFileName>
   <!-- Release notes -->
-  <VersionNotes> - Support client IP address generation in IPv6 range (#54)
- - Allow mutliple client IPs (#54)</VersionNotes>
+  <VersionNotes> - Fix New-NetNat feature check (#62)</VersionNotes>
   <ReleaseNotes></ReleaseNotes>
 </AppUpdate>