Implement system theme support and upgrade to .NET 9

.github/workflows/build-ci.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

src/LightQueryProfiler.Highlight/Extensions/XmlExtensions.cs

@@ -14,7 +14,9 @@ public static string GetAttributeValue(this XElement element, XName name)
             var attribute = element.Attribute(name);
             if (attribute == null)
             {
+#pragma warning disable CS8603 // Possible null reference return.
                 return null;
+#pragma warning restore CS8603 // Possible null reference return.
             }
 
             return attribute.Value;

src/LightQueryProfiler.Highlight/LightQueryProfiler.Highlight.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="2.0.1" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.1.2" />
   </ItemGroup>
 
   <ItemGroup>

src/LightQueryProfiler.Shared/Data/ApplicationDbContext.cs

@@ -1,5 +1,5 @@
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace LightQueryProfiler.Shared.Data
 {

src/LightQueryProfiler.Shared/LightQueryProfiler.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.3" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.4" />
   </ItemGroup>
 
 </Project>

src/LightQueryProfiler.Shared/Repositories/ConnectionRepository.cs

@@ -18,7 +18,7 @@ public async Task AddAsync(Connection entity)
             const string sql = @"INSERT INTO Connections (DataSource, InitialCatalog, UserId, Password, IntegratedSecurity, CreationDate)
                                    VALUES (@DataSource, @InitialCatalog, @UserId, @Password, @IntegratedSecurity, @CreationDate)";
 
-            await using var db = _context.GetConnection() as SqliteConnection;
+            await using var db = _context.GetConnection() as SqliteConnection ?? throw new Exception("db cannot be null or empty"); ;
             await using SqliteCommand sqliteCommand = new SqliteCommand(sql, db);
             sqliteCommand.Parameters.AddWithValue("@DataSource", entity.DataSource);
             sqliteCommand.Parameters.AddWithValue("@InitialCatalog", entity.InitialCatalog);
@@ -45,7 +45,7 @@ public async Task AddAsync(Connection entity)
         public async Task Delete(int id)
         {
             const string sql = "DELETE FROM Connections WHERE Id = @Id";
-            await using var db = _context.GetConnection() as SqliteConnection;
+            await using var db = _context.GetConnection() as SqliteConnection ?? throw new Exception("db cannot be null or empty");
             await using SqliteCommand sqliteCommand = new SqliteCommand(sql, db);
             sqliteCommand.Parameters.AddWithValue("@Id", id);
 
@@ -57,7 +57,7 @@ public async Task<IList<Connection>> GetAllAsync()
         {
             const string sql = "SELECT Id, InitialCatalog, CreationDate, DataSource, IntegratedSecurity, Password, UserId FROM Connections";
             List<Connection> connections = new List<Connection>();
-            await using var db = _context.GetConnection() as SqliteConnection;
+            await using var db = _context.GetConnection() as SqliteConnection ?? throw new Exception("db cannot be null or empty");
             await using SqliteCommand sqliteCommand = new SqliteCommand(sql, db);
 
             await db.OpenAsync();
@@ -86,7 +86,7 @@ public async Task<Connection> GetByIdAsync(int id)
         {
             const string sql = "SELECT Id, InitialCatalog, CreationDate, DataSource, IntegratedSecurity, Password, UserId FROM Connections WHERE Id = @Id";
             Connection? connection = null;
-            await using var db = _context.GetConnection() as SqliteConnection;
+            await using var db = _context.GetConnection() as SqliteConnection ?? throw new Exception("db cannot be null or empty");
             await using SqliteCommand sqliteCommand = new SqliteCommand(sql, db);
             sqliteCommand.Parameters.AddWithValue("@Id", id);
 
@@ -117,7 +117,7 @@ public async Task<Connection> GetByIdAsync(int id)
         public async Task UpdateAsync(Connection entity)
         {
             const string sql = "UPDATE Connections SET DataSource=@DataSource, InitialCatalog=@InitialCatalog, UserId=@UserId, Password=@Password, IntegratedSecurity=@IntegratedSecurity WHERE Id = @Id";
-            await using var db = _context.GetConnection() as SqliteConnection;
+            await using var db = _context.GetConnection() as SqliteConnection ?? throw new Exception("db cannot be null or empty");
             await using SqliteCommand sqliteCommand = new SqliteCommand(sql, db);
             sqliteCommand.Parameters.AddWithValue("@Id", entity);
             sqliteCommand.Parameters.AddWithValue("@DataSource", entity.DataSource);

src/LightQueryProfiler.Shared/Repositories/XEventRepository.cs

@@ -2,7 +2,7 @@
 using LightQueryProfiler.Shared.Repositories.Interfaces;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace LightQueryProfiler.Shared.Repositories
 {

src/LightQueryProfiler.WinFormsApp/LightQueryProfiler.WinFormsApp.csproj

@@ -2,17 +2,21 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <AssemblyName>LightQueryProfiler</AssemblyName>
-    <Version>1.0.0-alpha02</Version>
+    <Version>1.0.0</Version>
     <FileVersion>1.0.0</FileVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\LightQueryProfiler.Highlight\LightQueryProfiler.Highlight.csproj" />
     <ProjectReference Include="..\LightQueryProfiler.Shared\LightQueryProfiler.Shared.csproj" />

src/LightQueryProfiler.WinFormsApp/Presenters/MainPresenter.cs

@@ -9,7 +9,7 @@
 using LightQueryProfiler.Shared.Services.Interfaces;
 using LightQueryProfiler.WinFormsApp.Data;
 using LightQueryProfiler.WinFormsApp.Views;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace LightQueryProfiler.WinFormsApp.Presenters
 {

src/LightQueryProfiler.WinFormsApp/Program.cs

@@ -10,6 +10,13 @@ internal static class Program
         [STAThread]
         private static void Main()
         {
+            // Enable modern visual styles
+            Application.EnableVisualStyles();
+            // Optional: Improve text rendering
+            Application.SetCompatibleTextRenderingDefault(false);
+
+            Application.SetHighDpiMode(HighDpiMode.SystemAware);
+
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();

src/LightQueryProfiler.WinFormsApp/Views/AboutView.cs

@@ -1,4 +1,6 @@
-namespace LightQueryProfiler.WinFormsApp.Views
+using System.ComponentModel;
+
+namespace LightQueryProfiler.WinFormsApp.Views
 {
     public partial class AboutView : Form, IAboutView
     {
@@ -16,6 +18,7 @@ public AboutView()
 
         public Form Form => this;
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public string Version { get => lblVersion.Text; set => lblVersion.Text = value; }
 
         private void BtnOK_Click(object? sender, EventArgs e)

src/LightQueryProfiler.WinFormsApp/Views/AboutView.resx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

src/LightQueryProfiler.WinFormsApp/Views/FiltersView.cs

@@ -1,4 +1,5 @@
 using LightQueryProfiler.Shared.Models;
+using System.ComponentModel;
 
 namespace LightQueryProfiler.WinFormsApp.Views
 {
@@ -14,6 +15,7 @@ public FiltersView()
 
         public event EventHandler? OnClose;
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public EventFilter EventFilter { get => GetEventFilter(); set => SetEventFilter(value); }
 
         public Form Form => this;

src/LightQueryProfiler.WinFormsApp/Views/FiltersView.resx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -18,7 +18,7 @@
     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
         <value>[base64 mime encoded serialized .NET Framework object]</value>
     </data>
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

src/LightQueryProfiler.WinFormsApp/Views/MainView.cs

@@ -116,7 +116,7 @@
             }
             set
             {
                 tscAuthentication.ComboBox.SelectedValue = value;
             }
         }
 
@@ -263,6 +263,7 @@
             selectConnectionMenu.Click += SelectConnectionMenu_Click;
             recentMenu.DropDownItems.Add(selectConnectionMenu);
 
+            ms.RenderMode = ToolStripRenderMode.System;
             ms.Items.Add(fileMenu);
             ms.Items.Add(recentMenu);
             ms.Items.Add(helpMenu);
@@ -272,6 +273,7 @@
 
         private void CreateMainToolBar()
         {
+            toolStripMain.RenderMode = ToolStripRenderMode.System;
             toolStripMain.Dock = DockStyle.Top;
             toolStripMain.AutoSize = true;
 

tests/LightQueryProfiler.Shared.UnitTests/LightQueryProfiler.Shared.UnitTests.csproj

@@ -1,22 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="4.0.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>