diff --git a/Directory.Build.props b/Directory.Build.props
index 2abd3c6..70b80bc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,32 +1,46 @@
-
enable
enable
12
true
-
-
1ef91ee6-7b55-474e-ab2b-2d164b723a56
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+ $([System.Text.RegularExpressions.Regex]::Replace('$(GitTag)', '^v', ''))
+
+
+
+
+ 0.0.0
+
+
+
+
+
+ $(GitVersion)
+ $(GitVersion)
+ $(GitVersion)
+
+
+
+
diff --git a/LD-SysInfo/MainWindow.xaml.cs b/LD-SysInfo/MainWindow.xaml.cs
index 69ea665..3e0f7c1 100644
--- a/LD-SysInfo/MainWindow.xaml.cs
+++ b/LD-SysInfo/MainWindow.xaml.cs
@@ -57,8 +57,24 @@ namespace LD_SysInfo
System.Net.ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
InitializeComponent();
- var fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
- VersionTextBlock.Text = $"v{fvi.ProductVersion}";
+ var exePath = Assembly.GetEntryAssembly()?.Location;
+
+ if (string.IsNullOrEmpty(exePath))
+ {
+ exePath = Process.GetCurrentProcess().MainModule?.FileName;
+ }
+
+ if (!string.IsNullOrEmpty(exePath))
+ {
+ var fvi = FileVersionInfo.GetVersionInfo(exePath);
+ var productVersion = fvi.ProductVersion ?? "0.0.0";
+ var cleanVersion = productVersion.Split('+')[0];
+ VersionTextBlock.Text = $"v{cleanVersion}";
+ }
+ else
+ {
+ VersionTextBlock.Text = "v0.0.0";
+ }
LoadConfig();
DisplaySystemInfo();
AutoLogin();
diff --git a/OversightInstaller/OversightInstaller.wixproj b/OversightInstaller/OversightInstaller.wixproj
index 80a7fef..33511dd 100644
--- a/OversightInstaller/OversightInstaller.wixproj
+++ b/OversightInstaller/OversightInstaller.wixproj
@@ -1,34 +1,56 @@
ο»Ώ
-
-
-
-
-
- true
-
-
- WixToolset.UI.wixext
-
-
- PublishDir=C:\Users\Sonder\source\repos\psg-oversight-app\PublishDir
-
-
-
- Always
-
-
- Always
-
-
-
-
-
-
-
- Always
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+ 0.0.0
+ x64
+ x64
+ true
+ WixToolset.UI.wixext
+
+
+
+
+
+
+
+
+
+ $([System.Text.RegularExpressions.Regex]::Replace('$(GitTag)', '\s', ''))
+ $([System.Text.RegularExpressions.Regex]::Replace('$(GitTagTrimmed)', '^v', ''))
+ $(GitVersion)
+
+
+
+
+ Version=$(Version);
+ PublishDir=C:\Users\Sonder\source\repos\psg-oversight-app\PublishDir
+
+ OversightInstaller_$(Version)_$(Platform)
+
+
+
+
+
+
+
+
+
+ $(OutputPath)OversightInstaller_$(Version)_$(Platform).msi
+ $(OutputPath)OversightInstaller.msi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OversightInstaller/Package.wxs b/OversightInstaller/Package.wxs
index 45c95c3..e5e0001 100644
--- a/OversightInstaller/Package.wxs
+++ b/OversightInstaller/Package.wxs
@@ -1,39 +1,54 @@
ο»Ώ
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+