Updated to include new dir, inclusion of tags. Version appears in Control Panel now. Also appears in TItlebar of AppWindow.

.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(dotnet build:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

Directory.Build.props

@@ -1,32 +1,46 @@
 <!-- 
-This file allow for customizing your build process.
+This file allows for customizing your build process.
 See: https://learn.microsoft.com/visualstudio/msbuild/customize-your-build
 -->
 <Project>
-  <!--
-  Uncomment if you need to enable inclusion of another Directory.Build.props file from a parent directory
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  -->
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>12</LangVersion>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
-    <!-- 
-    If you you like to see source generated files saved to disk you can enable the following:
-    https://learn.microsoft.com/dotnet/csharp/roslyn-sdk/source-generators-overview?WT.mc_id=DT-MVP-5003472
-    -->
     <!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>-->
   </PropertyGroup>
 
-  <!--
-  This allows all projects to share the same user secrets file. 
-  If you want project to have their own, set it to a different GUID on each project.
-  See: https://learn.microsoft.com/dotnet/architecture/microservices/secure-net-microservices-web-applications/developer-app-secrets-storage
-  -->
   <PropertyGroup Label="User Secrets">
     <UserSecretsId>1ef91ee6-7b55-474e-ab2b-2d164b723a56</UserSecretsId>
   </PropertyGroup>
 
+
+  <!-- 🔹 Automatically derive version from latest Git tag -->
+  <Target Name="GetVersionFromGit" BeforeTargets="GetAssemblyVersion">
+    <!-- Get the most recent tag (like v1.1.1) -->
+    <Exec Command="git describe --tags --abbrev=0" ConsoleToMSBuild="true" IgnoreExitCode="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="GitTag" />
+    </Exec>
+
+    <!-- Strip leading 'v' if present -->
+    <PropertyGroup>
+      <GitVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(GitTag)', '^v', ''))</GitVersion>
+    </PropertyGroup>
+
+    <!-- Fallback if no tags exist yet -->
+    <PropertyGroup Condition="'$(GitVersion)' == ''">
+      <GitVersion>0.0.0</GitVersion>
+    </PropertyGroup>
+
+    <!-- Apply to assembly and file versions -->
+    <Message Text="🔖 Using version: $(GitVersion)" Importance="High" />
+    <PropertyGroup>
+      <Version>$(GitVersion)</Version>
+      <FileVersion>$(GitVersion)</FileVersion>
+      <AssemblyVersion>$(GitVersion)</AssemblyVersion>
+    </PropertyGroup>
+  </Target>
+
 </Project>

LD-SysInfo/LD_SysInfo.csproj

@@ -12,6 +12,17 @@
     <OutputPath>C:\Users\Sonder\source\repos\psg-oversight-app\BuildDir\bin\Debug\net8.0-windows\</OutputPath>
     <IncludeSatelliteAssembliesForPublish>false</IncludeSatelliteAssembliesForPublish>
 
+    <!-- 🔢 Version Info -->
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.3.0</FileVersion>
+    <Version>1.0.3</Version>
+
+    <!-- ✅ Enables source metadata and Git info -->
+    <Deterministic>true</Deterministic>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <RepositoryUrl>https://gitea.psg.net.au/your-repo</RepositoryUrl>
+    <IncludeSourceRevisionInInformationalVersion>true</IncludeSourceRevisionInInformationalVersion>
+
   </PropertyGroup>
 
   <!--

LD-SysInfo/MainWindow.xaml

@@ -174,15 +174,23 @@
             <!-- 🔹 Titlebar -->
       <Border Grid.Row="0"
         CornerRadius="12,12,0,0"
-                    
+        Background="{DynamicResource BackgroundDarkBrush}" 
-                    Background="{DynamicResource BackgroundDarkBrush}" Margin="0,0,2,2">
+        Margin="0,0,2,2">
         <Grid MouseDown="TitleBar_MouseDown">
+          <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="10,0,0,0">
             <TextBlock Text="PSG - Oversight"
-                               VerticalAlignment="Center"
-                               Margin="10,0,0,0"
                        FontSize="22"
                        FontWeight="Bold"
                        Foreground="{DynamicResource TitleBrush}" />
+            <TextBlock x:Name="VersionTextBlock"
+                       Text="v0.0.0"
+                       FontSize="12"
+                       VerticalAlignment="Bottom"
+                       Margin="8,0,0,3"
+                       Foreground="{DynamicResource TitleBrush}" 
+                       Opacity="0.7" />
+          </StackPanel>
+
           <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width="30" Height="30" Click="MinimizeWindow_Click" Style="{StaticResource WindowButtonStyle}">
               <materialDesign:PackIcon Kind="WindowMinimize" Width="20" Height="20" />
@@ -193,11 +201,11 @@
             <Button Width="30" Height="30" Click="CloseWindow_Click" Style="{StaticResource CloseButtonStyle}">
               <materialDesign:PackIcon Kind="WindowClose" Width="20" Height="20" />
             </Button>
-
           </StackPanel>
         </Grid>
       </Border>
 
+
       <!-- 🔹 Tabs + Theme Toggle -->
             <Grid Grid.Row="1" Background="{DynamicResource BackgroundDarkBrush}">
                 <Grid.ColumnDefinitions>

LD-SysInfo/MainWindow.xaml.cs

@@ -1,24 +1,33 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Net.Http;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using Microsoft.Win32;
-using System.IO;
-using System.Windows.Threading;
 using System.Windows.Forms;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Threading;
+
 using Hardcodet.Wpf.TaskbarNotification;
+
+using LD_SysInfo.Models;
 using LD_SysInfo.Services;
+
+using MaterialDesignColors;
+
+using MaterialDesignThemes.Wpf;
+
+using Microsoft.Win32;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Windows.Media.Animation;
+
-using LD_SysInfo.Models;
-using MaterialDesignColors;
-using MaterialDesignThemes.Wpf;
-using System.Windows.Input;
 using Application = System.Windows.Application;
-using System.Windows.Media;
 
 
 
@@ -34,6 +43,7 @@ namespace LD_SysInfo
         private readonly DispatcherTimer messageClearTimer;
         private readonly DispatcherTimer postTimer;
         private readonly DispatcherTimer keepAliveTimer;
+        private readonly DispatcherTimer tokenRefreshTimer;
         private readonly Uri LightThemeUri = new Uri("pack://application:,,,/Themes/LightTheme.xaml", UriKind.Absolute);
         private readonly Uri DarkThemeUri = new Uri("pack://application:,,,/Themes/DarkTheme.xaml", UriKind.Absolute);
         private bool isDarkTheme = false;
@@ -47,6 +57,24 @@ namespace LD_SysInfo
             System.Net.ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
 
             InitializeComponent();
+            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();
@@ -74,7 +102,12 @@ namespace LD_SysInfo
             keepAliveTimer.Tick += KeepAliveTimer_Tick;
             keepAliveTimer.Start();
 
-
+            // 🔄 Initialize the Token Refresh timer to refresh token proactively before expiration
+            // Tokens expire in 60 minutes, so refresh at 50 minutes to be safe
+            tokenRefreshTimer = new DispatcherTimer();
+            tokenRefreshTimer.Interval = TimeSpan.FromMinutes(50);
+            tokenRefreshTimer.Tick += TokenRefreshTimer_Tick;
+            tokenRefreshTimer.Start();
 
 
         }
@@ -252,6 +285,41 @@ namespace LD_SysInfo
                     });
                 }
 
+                var formattedUserApplications = new List<object>();
+                foreach (var app in sysInfo.UserInstalledApplications)
+                {
+                    formattedUserApplications.Add(new
+                    {
+                        app_name = app.Name,
+                        app_version = app.Version,
+                        publisher = app.Publisher
+                    });
+                }
+
+                var formattedWindowsUpdates = new List<object>();
+                foreach (var update in sysInfo.WindowsUpdates)
+                {
+                    formattedWindowsUpdates.Add(new
+                    {
+                        hotFixID = update.HotFixID,
+                        description = update.Description,
+                        installedOn = update.InstalledOn,
+                        installedBy = update.InstalledBy
+                    });
+                }
+
+                var formattedAppXPackages = new List<object>();
+                foreach (var pkg in sysInfo.AppXPackages)
+                {
+                    formattedAppXPackages.Add(new
+                    {
+                        name = pkg.Name,
+                        version = pkg.Version,
+                        publisher = pkg.Publisher,
+                        packageFullName = pkg.PackageFullName
+                    });
+                }
+
                 var payload = new
                 {
                     clientIdentifier = _config.ClientIdentifier,
@@ -268,7 +336,10 @@ namespace LD_SysInfo
                     ipAddresses = sysInfo.IpAddresses,
                     lastBootTime = sysInfo.LastBootTime,
                     drives = sysInfo.Drives,
-                    installedApplications = formattedApplications
+                    installedApplications = formattedApplications,
+                    userInstalledApplications = formattedUserApplications,
+                    windowsUpdates = formattedWindowsUpdates,
+                    appXPackages = formattedAppXPackages
                 };
 
 
@@ -519,6 +590,41 @@ namespace LD_SysInfo
                 });
             }
 
+            var formattedUserApplications = new List<object>();
+            foreach (var app in sysInfo.UserInstalledApplications)
+            {
+                formattedUserApplications.Add(new
+                {
+                    app_name = app.Name,
+                    app_version = app.Version,
+                    publisher = app.Publisher
+                });
+            }
+
+            var formattedWindowsUpdates = new List<object>();
+            foreach (var update in sysInfo.WindowsUpdates)
+            {
+                formattedWindowsUpdates.Add(new
+                {
+                    hotFixID = update.HotFixID,
+                    description = update.Description,
+                    installedOn = update.InstalledOn,
+                    installedBy = update.InstalledBy
+                });
+            }
+
+            var formattedAppXPackages = new List<object>();
+            foreach (var pkg in sysInfo.AppXPackages)
+            {
+                formattedAppXPackages.Add(new
+                {
+                    name = pkg.Name,
+                    version = pkg.Version,
+                    publisher = pkg.Publisher,
+                    packageFullName = pkg.PackageFullName
+                });
+            }
+
             var payload = new
             {
                 clientIdentifier = _config.ClientIdentifier,
@@ -535,7 +641,10 @@ namespace LD_SysInfo
                 ipAddresses = sysInfo.IpAddresses,
                 lastBootTime = sysInfo.LastBootTime,
                 drives = sysInfo.Drives,
-                installedApplications = formattedApplications
+                installedApplications = formattedApplications,
+                userInstalledApplications = formattedUserApplications,
+                windowsUpdates = formattedWindowsUpdates,
+                appXPackages = formattedAppXPackages
             };
 
 
@@ -590,6 +699,27 @@ namespace LD_SysInfo
             FadeOutStatusMessage();  // Trigger the fade-out effect
         }
 
+        private async void TokenRefreshTimer_Tick(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(ApiClient.GetJwtToken()))
+            {
+                Console.WriteLine("⚠️ No token to refresh - skipping proactive refresh.");
+                return;
+            }
+
+            var apiClient = new ApiClient(_config);
+            bool refreshed = await apiClient.RefreshTokenAsync();
+
+            if (refreshed)
+            {
+                Console.WriteLine("✅ Proactive token refresh successful.");
+            }
+            else
+            {
+                Console.WriteLine("⚠️ Proactive token refresh failed - will retry on next request.");
+            }
+        }
+
         private void TrayIcon_DoubleClick(object sender, RoutedEventArgs e)
         {
             ShowWindow();

LD-SysInfo/Services/ApiClient.cs

@@ -177,7 +177,54 @@ namespace LD_SysInfo.Services
 
 
         /// <summary>
-        /// Sends the collected data to the server.
+        /// Refreshes the current JWT token without requiring username/password.
+        /// </summary>
+        public async Task<bool> RefreshTokenAsync()
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(jwtToken))
+                {
+                    Console.WriteLine("⚠️ No token to refresh.");
+                    return false;
+                }
+
+                HttpResponseMessage response = await httpClient.PostAsync(BuildUrl("/api/auth/refresh"), null);
+                string rawResponse = await response.Content.ReadAsStringAsync();
+
+                if (!response.IsSuccessStatusCode)
+                {
+                    Console.WriteLine($"❌ Token refresh failed: {response.StatusCode} - {rawResponse}");
+                    return false;
+                }
+
+                // Parse the response to get the new token if provided in body
+                // Note: Your server sets it via cookie, but may also return it in response
+                try
+                {
+                    var refreshResponse = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawResponse);
+                    if (refreshResponse?.ContainsKey("token") == true)
+                    {
+                        SetJwtToken(refreshResponse["token"]);
+                    }
+                }
+                catch
+                {
+                    // Token might only be in cookie, which is fine
+                }
+
+                Console.WriteLine("✅ Token refreshed successfully.");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"❌ Exception during token refresh: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Sends the collected data to the server with automatic token refresh and re-auth.
         /// </summary>
         private async Task<HttpResponseMessage> SendWithAutoReauthAsync(Func<Task<HttpResponseMessage>> requestFunc)
         {
@@ -185,8 +232,24 @@ namespace LD_SysInfo.Services
 
             if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
             {
-                Console.WriteLine("⚠️ Token expired or invalid. Attempting re-auth...");
+                Console.WriteLine("⚠️ Token expired or invalid. Attempting token refresh...");
 
+                // Try refreshing the token first (faster than full re-auth)
+                bool refreshed = await RefreshTokenAsync();
+
+                if (refreshed)
+                {
+                    // Retry original request after refresh
+                    response = await requestFunc();
+
+                    if (response.IsSuccessStatusCode)
+                    {
+                        return response;
+                    }
+                }
+
+                // If refresh failed or didn't work, fall back to full re-authentication
+                Console.WriteLine("⚠️ Token refresh failed. Attempting full re-auth...");
                 var loginResponse = await AuthenticateAsync(_config.Auth.Username, _config.Auth.Password);
                 if (loginResponse == null || string.IsNullOrEmpty(loginResponse.Token))
                 {

LD-SysInfo/SystemInfo.cs

@@ -68,6 +68,36 @@ namespace LD_SysInfo
         public string Publisher { get; set; }
     }
 
+    public class WindowsUpdate
+    {
+        [JsonProperty("hotFixID")]
+        public string HotFixID { get; set; }
+
+        [JsonProperty("description")]
+        public string Description { get; set; }
+
+        [JsonProperty("installedOn")]
+        public string InstalledOn { get; set; }
+
+        [JsonProperty("installedBy")]
+        public string InstalledBy { get; set; }
+    }
+
+    public class AppXPackage
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("version")]
+        public string Version { get; set; }
+
+        [JsonProperty("publisher")]
+        public string Publisher { get; set; }
+
+        [JsonProperty("packageFullName")]
+        public string PackageFullName { get; set; }
+    }
+
     public class DriveInfoSummary
     {
         [JsonProperty("name")]
@@ -134,9 +164,21 @@ namespace LD_SysInfo
         [JsonProperty("lastBootTime")]
         public string LastBootTime { get; set; }
 
+        [JsonProperty("collectedAt")]
+        public string CollectedAt { get; set; }
+
         [JsonProperty("installedApplications")]
         public List<InstalledApplication> InstalledApplications { get; set; }
 
+        [JsonProperty("userInstalledApplications")]
+        public List<InstalledApplication> UserInstalledApplications { get; set; } = new();
+
+        [JsonProperty("windowsUpdates")]
+        public List<WindowsUpdate> WindowsUpdates { get; set; } = new();
+
+        [JsonProperty("appXPackages")]
+        public List<AppXPackage> AppXPackages { get; set; } = new();
+
         [JsonProperty("drives")]
         public List<DriveInfoSummary> Drives { get; set; } = new();
 
@@ -149,6 +191,9 @@ namespace LD_SysInfo
 
             try
             {
+                // Capture collection timestamp with timezone info
+                sysInfo.CollectedAt = DateTimeOffset.Now.ToString("o");
+
                 sysInfo.Hostname = Environment.MachineName;
                 sysInfo.OSName = GetOSFriendlyName();
                 sysInfo.OSVersion = Environment.OSVersion.Version.ToString();
@@ -166,6 +211,11 @@ namespace LD_SysInfo
                 sysInfo.LastBootTime = GetLastBootTime();
 
                 PopulateDriveInfo(sysInfo);
+
+                // Populate new collections for comprehensive system information
+                sysInfo.UserInstalledApplications = GetUserInstalledApplications();
+                sysInfo.WindowsUpdates = GetInstalledPatches();
+                sysInfo.AppXPackages = GetAppXPackages();
             }
             catch (Exception ex)
             {
@@ -303,7 +353,11 @@ namespace LD_SysInfo
                 foreach (var obj in searcher.Get())
                 {
                     string lastBoot = obj["LastBootUpTime"]?.ToString();
-                    return ManagementDateTimeConverter.ToDateTime(lastBoot).ToString("o");
+                    // Convert to local time and ensure timezone info is preserved
+                    DateTime localBootTime = ManagementDateTimeConverter.ToDateTime(lastBoot);
+                    // Use DateTimeOffset to ensure timezone information is included
+                    DateTimeOffset bootTimeWithZone = new DateTimeOffset(localBootTime, TimeZoneInfo.Local.GetUtcOffset(localBootTime));
+                    return bootTimeWithZone.ToString("o");
                 }
             }
             catch { }
@@ -341,5 +395,138 @@ namespace LD_SysInfo
 
             return applications;
         }
+
+        /// <summary>
+        /// Gets user-context installed applications from HKEY_CURRENT_USER registry.
+        /// </summary>
+        public static List<InstalledApplication> GetUserInstalledApplications()
+        {
+            var applications = new List<InstalledApplication>();
+            string registryKey = @"Software\Microsoft\Windows\CurrentVersion\Uninstall";
+
+            try
+            {
+                using var regKey = Registry.CurrentUser.OpenSubKey(registryKey);
+                if (regKey == null) return applications;
+
+                foreach (string subKeyName in regKey.GetSubKeyNames())
+                {
+                    using var subKey = regKey.OpenSubKey(subKeyName);
+                    string name = subKey?.GetValue("DisplayName")?.ToString();
+                    if (!string.IsNullOrWhiteSpace(name))
+                    {
+                        applications.Add(new InstalledApplication
+                        {
+                            Name = name,
+                            Version = subKey?.GetValue("DisplayVersion")?.ToString(),
+                            Publisher = subKey?.GetValue("Publisher")?.ToString()
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"❌ Failed to gather user-installed applications: {ex.Message}");
+            }
+
+            return applications;
+        }
+
+        /// <summary>
+        /// Gets Windows Updates and patches installed on the system using WMI.
+        /// </summary>
+        public static List<WindowsUpdate> GetInstalledPatches()
+        {
+            var patches = new List<WindowsUpdate>();
+
+            try
+            {
+                using var searcher = new ManagementObjectSearcher(
+                    "SELECT HotFixID, Description, InstalledOn, InstalledBy FROM Win32_QuickFixEngineering");
+
+                foreach (var obj in searcher.Get())
+                {
+                    patches.Add(new WindowsUpdate
+                    {
+                        HotFixID = obj["HotFixID"]?.ToString(),
+                        Description = obj["Description"]?.ToString(),
+                        InstalledOn = obj["InstalledOn"]?.ToString(),
+                        InstalledBy = obj["InstalledBy"]?.ToString()
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"❌ Failed to gather Windows Updates: {ex.Message}");
+            }
+
+            return patches;
+        }
+
+        /// <summary>
+        /// Gets Windows Store (AppX) packages installed on the system using WMI.
+        /// Note: This may require elevated permissions for complete results.
+        /// </summary>
+        public static List<AppXPackage> GetAppXPackages()
+        {
+            var packages = new List<AppXPackage>();
+
+            try
+            {
+                // Try using Win32_InstalledStoreProgram (Windows 10+)
+                using var searcher = new ManagementObjectSearcher(
+                    "SELECT Name, Version, Publisher FROM Win32_InstalledStoreProgram");
+
+                foreach (var obj in searcher.Get())
+                {
+                    var name = obj["Name"]?.ToString();
+                    if (!string.IsNullOrWhiteSpace(name))
+                    {
+                        packages.Add(new AppXPackage
+                        {
+                            Name = name,
+                            Version = obj["Version"]?.ToString(),
+                            Publisher = obj["Publisher"]?.ToString(),
+                            PackageFullName = name // Win32_InstalledStoreProgram doesn't provide PackageFullName
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"❌ Failed to gather AppX packages: {ex.Message}");
+            }
+
+            return packages;
+        }
+
+        /// <summary>
+        /// Checks if a specific Windows Update patch is installed on the system.
+        /// </summary>
+        /// <param name="kbNumber">The KB number to check (e.g., "KB5034441")</param>
+        /// <returns>True if the patch is installed, false otherwise</returns>
+        public static bool IsPatchInstalled(string kbNumber)
+        {
+            if (string.IsNullOrWhiteSpace(kbNumber))
+                return false;
+
+            try
+            {
+                // Normalize KB number format
+                string normalizedKB = kbNumber.ToUpper().Trim();
+                if (!normalizedKB.StartsWith("KB"))
+                    normalizedKB = "KB" + normalizedKB;
+
+                using var searcher = new ManagementObjectSearcher(
+                    $"SELECT HotFixID FROM Win32_QuickFixEngineering WHERE HotFixID = '{normalizedKB}'");
+
+                return searcher.Get().Count > 0;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"❌ Failed to check patch {kbNumber}: {ex.Message}");
+                return false;
+            }
+        }
     }
 }

LD-SysInfo/config.json

@@ -1,5 +1,5 @@
 {
-  "ServerUrl": "https://sys.psg.net.au:8443",
+  "ServerUrl": "https://sys.psg.net.au:11443",
   "EnableLogging": true,
   "KeepAlivePeriod": 30,
   "SystemInfoInterval": 600,

LD_SysInfo.sln

@@ -28,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LD_SysInfo", "LD-SysInfo\LD
 EndProject
 Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "OversightInstaller", "OversightInstaller\OversightInstaller.wixproj", "{99BFBED9-D563-375C-FBD6-E11D0770B009}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OversightService", "OversightService\OversightService.csproj", "{A8149609-CF69-4268-B985-B68444319344}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +74,22 @@ Global
 		{99BFBED9-D563-375C-FBD6-E11D0770B009}.Release|x64.Build.0 = Release|x64
 		{99BFBED9-D563-375C-FBD6-E11D0770B009}.Release|x86.ActiveCfg = Release|x86
 		{99BFBED9-D563-375C-FBD6-E11D0770B009}.Release|x86.Build.0 = Release|x86
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|x64.Build.0 = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Debug|x86.Build.0 = Debug|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|ARM64.Build.0 = Release|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|x64.ActiveCfg = Release|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|x64.Build.0 = Release|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8149609-CF69-4268-B985-B68444319344}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OversightInstaller/OversightInstaller.wixproj

@@ -1,34 +1,56 @@
 <Project Sdk="WixToolset.Sdk/6.0.0">
-  <ItemGroup>
+
-    <PackageReference Include="WixToolset.UI.wixext" />
+    <!-- ✅ Defaults -->
-  </ItemGroup>
     <PropertyGroup>
-    <!-- Force embedding files into the MSI (no external .cab file) -->
+        <Version>0.0.0</Version>
+        <Platform>x64</Platform>
+        <InstallerPlatform>x64</InstallerPlatform>
         <EmbedCab>true</EmbedCab>
-  </PropertyGroup>
-  <PropertyGroup>
         <WixExtensionInclude>WixToolset.UI.wixext</WixExtensionInclude>
     </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+
-    <DefineConstants>PublishDir=C:\Users\Sonder\source\repos\psg-oversight-app\PublishDir</DefineConstants>
+    <!-- ✅ STEP 1: Run Git BEFORE WiX compilation -->
+    <Target Name="SetVersionFromGit" BeforeTargets="BeforeBuild">
+        <Exec Command="git describe --tags --abbrev=0" ConsoleToMSBuild="true" IgnoreExitCode="true">
+            <Output TaskParameter="ConsoleOutput" PropertyName="GitTag" />
+        </Exec>
+
+        <PropertyGroup Condition="'$(GitTag)' != ''">
+            <GitTagTrimmed>$([System.Text.RegularExpressions.Regex]::Replace('$(GitTag)', '\s', ''))</GitTagTrimmed>
+            <GitVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(GitTagTrimmed)', '^v', ''))</GitVersion>
+            <Version>$(GitVersion)</Version>
         </PropertyGroup>
+
+        <PropertyGroup>
+            <DefineConstants>
+                Version=$(Version);
+                PublishDir=C:\Users\Sonder\source\repos\psg-oversight-app\PublishDir
+            </DefineConstants>
+            <OutputName>OversightInstaller_$(Version)_$(Platform)</OutputName>
+        </PropertyGroup>
+
+        <Message Text="📦 Building OversightInstaller version $(Version)" Importance="high" />
+        <Message Text="📦 WiX DefineConstants=$(DefineConstants)" Importance="high" />
+    </Target>
+
+    <!-- ✅ STEP 2: Rename the MSI after build -->
+    <Target Name="RenameMsi" AfterTargets="Build">
+        <PropertyGroup>
+            <BuiltMsi>$(OutputPath)OversightInstaller_$(Version)_$(Platform).msi</BuiltMsi>
+            <ActualMsi>$(OutputPath)OversightInstaller.msi</ActualMsi>
+        </PropertyGroup>
+
+        <Message Text="📦 Renaming $(ActualMsi) → $(BuiltMsi)" Importance="high" />
+        <Exec Command="move /Y &quot;$(ActualMsi)&quot; &quot;$(BuiltMsi)&quot;" />
+    </Target>
+
     <ItemGroup>
-    <Content Include="Assets\DLShortcut.ico">
+        <PackageReference Include="WixToolset.UI.wixext" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\trayicon.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
         <WixSource Include="HarvestedFiles.wxs" />
-  </ItemGroup>
+        <Content Include="Assets\DLShortcut.ico" CopyToOutputDirectory="Always" />
-  <ItemGroup>
+        <Content Include="Assets\trayicon.ico" CopyToOutputDirectory="Always" />
-    <Content Include="bpl.rtf">
+        <Content Include="bpl.rtf" CopyToOutputDirectory="Always" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
         <None Include="Assets\windowsdesktop-runtime-8.0.13-win-x64.exe" />
     </ItemGroup>
+
 </Project>

OversightInstaller/Package.wxs

@@ -1,18 +1,34 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
 
-	<Package Name="Oversight" Manufacturer="Paragon Systems Group" Version="1.0.0.0" UpgradeCode="e0e26d46-ed26-425e-a1bb-9bc76523ae6b">
+    <!-- ✅ Safe default in case $(var.Version) is undefined -->
+    <?ifndef Version?>
+    <?define Version="0.0.0"?>
+    <?endif?>
+
+    <Package
+        Name="Oversight"
+        Manufacturer="Paragon Systems Group"
+        Version="$(var.Version)"
+        UpgradeCode="e0e26d46-ed26-425e-a1bb-9bc76523ae6b">
+
+        <Property Id="DisplayVersion" Value="$(var.Version)" />
+
+        <!-- 🔁 Automatic major-upgrade behavior -->
         <MajorUpgrade DowngradeErrorMessage="A newer version of this application is already installed." />
 
-		<WixVariable
+        <!-- ✅ Only define custom ARP metadata that isn’t built-in -->
-  Id="WixUILicenseRtf"
-  Value="bpl.rtf"
-  />
-		<!-- 🔍 Properties -->
         <Property Id="ARPPRODUCTICON" Value="DLShortcutIcon" />
+        <Property Id="ARPHELPLINK" Value="https://psg.net.au/" />
+        <Property Id="ARPCONTACT" Value="support@psg.net.au" />
+        <Property Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" />
+
+        <!-- Optional custom properties -->
         <Property Id="SERVER_URL" Value="http://your-default-server/api/register" />
         <Property Id="APP_EXECUTABLE" Value="PSG-Oversight.exe" />
 
+        <!-- 💬 EULA -->
+        <WixVariable Id="WixUILicenseRtf" Value="bpl.rtf" />
 
         <!-- 🔧 UI -->
         <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
@@ -22,15 +38,14 @@
 
         <!-- 📂 Installation Directory -->
         <StandardDirectory Id="ProgramFiles64Folder">
+            <Directory Id="PSGROOT" Name="PSG">
                 <Directory Id="INSTALLFOLDER" Name="Oversight">
-
+                    <!-- Your files and harvested components go here -->
-				
+                </Directory>
-				
-
-				<!-- 📁 Assets Folder -->
-				
             </Directory>
         </StandardDirectory>
+
+        <!-- 📦 Application Files -->
         <ComponentGroupRef Id="AppFiles" />
 
         <!-- 📁 Start Menu Shortcut -->
@@ -46,17 +61,37 @@
                               IconIndex="0" />
                     <RemoveFile Id="RemoveStartMenuShortcut" Name="Oversight.lnk" On="uninstall" />
                     <RemoveFolder Id="RemoveStartMenuFolder" On="uninstall" />
-                    <RegistryValue Root="HKCU" Key="Software\Oversight" Name="StartMenuShortcut" Type="integer" Value="1" KeyPath="yes"/>
+                    <RegistryValue Root="HKCU" Key="Software\Oversight"
+                                   Name="StartMenuShortcut" Type="integer" Value="1" KeyPath="yes"/>
                 </Component>
             </Directory>
         </StandardDirectory>
 
 
-        <!-- 📦 Feature References -->
+        <!-- 64-bit component so ARP keys go to HKLM\Software (not Wow6432Node) -->
+        <Component Id="AppMetadata" Guid="E62354E8-3C7B-4B13-AFE2-A1E65A7F2E77" Bitness="always64">
+            <RegistryKey
+                Root="HKLM"
+                Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]">
+                <!-- Nice, branded ARP entry -->
+                <RegistryValue Name="DisplayName"    Value="Oversight"                   Type="string" />
+                <RegistryValue Name="Publisher"      Value="Paragon Systems Group"       Type="string" />
+                <!-- Make version show in Control Panel; compile-time value from your wixproj -->
+                <RegistryValue Name="DisplayVersion" Value="$(var.Version)"              Type="string" KeyPath="yes" />
+            </RegistryKey>
+        </Component>
+        
+        
+
+
+
+        <!-- 🧱 Primary Feature -->
         <Feature Id="Main" Title="DL SysInfo" Level="1">
             <ComponentGroupRef Id="AppFiles" />
             <ComponentRef Id="StartMenuShortcutComponent" />
+            <ComponentRef Id="AppMetadata" />
         </Feature>
+
         <!-- 💿 Media -->
         <Media Id="1" Cabinet="embedded.cab" EmbedCab="yes" />
 

OversightService/OversightService.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>dotnet-OversightService-9352272b-722c-4a12-acc2-8c9b146e5292</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+  </ItemGroup>
+</Project>

OversightService/Program.cs

@@ -0,0 +1,7 @@
+using OversightService;
+
+var builder = Host.CreateApplicationBuilder(args);
+builder.Services.AddHostedService<Worker>();
+
+var host = builder.Build();
+host.Run();

OversightService/Properties/launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "OversightService": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

OversightService/Worker.cs

@@ -0,0 +1,24 @@
+namespace OversightService
+{
+    public class Worker : BackgroundService
+    {
+        private readonly ILogger<Worker> _logger;
+
+        public Worker(ILogger<Worker> logger)
+        {
+            _logger = logger;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (!stoppingToken.IsCancellationRequested)
+            {
+                if (_logger.IsEnabled(LogLevel.Information))
+                {
+                    _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+                }
+                await Task.Delay(1000, stoppingToken);
+            }
+        }
+    }
+}

OversightService/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

OversightService/appsettings.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}