Build the app separately from libraries and tests to drop the -m:1 build workaround

.github/workflows/PullRequest.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore EventLogExpert.slnx
     - name: Build
-      run: dotnet build EventLogExpert.slnx --no-restore -c Release -p:PublishReadyToRun=false -m:1
+      run: dotnet build EventLogExpert.slnx --no-restore -c Release -p:PublishReadyToRun=false -p:WindowsPackageType=None
     - name: Test (unit)
       shell: pwsh
       run: |

Directory.Build.props

@@ -3,6 +3,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <DebugType>embedded</DebugType>
         <!-- CsWinRT1030 fires for List<T> of any public type because IT could theoretically cross the WinRT ABI in AOT/trimmed scenarios. We never marshal these collections across the ABI, so the warning is benign. -->
         <NoWarn>$(NoWarn);CsWinRT1030</NoWarn>
     </PropertyGroup>

Directory.Build.targets

@@ -0,0 +1,7 @@
+<Project>
+    <ItemGroup Condition="'$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe'">
+        <ProjectReference Update="@(ProjectReference)">
+            <GlobalPropertiesToRemove>$(GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier;SelfContained</GlobalPropertiesToRemove>
+        </ProjectReference>
+    </ItemGroup>
+</Project>

EventLogExpert.slnx

@@ -48,14 +48,11 @@
     <Project Path="tests/Unit/EventLogExpert.Provider.Tests/EventLogExpert.Provider.Tests.csproj" />
   </Folder>
   <Folder Name="/tests/Integration/">
-    <Project Path="tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.Eventing.IntegrationTests/EventLogExpert.Eventing.IntegrationTests.csproj" />
-    <Project Path="tests/Integration/EventLogExpert.Filtering.IntegrationTests/EventLogExpert.Filtering.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.Runtime.IntegrationTests/EventLogExpert.Runtime.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.Provider.Database.IntegrationTests/EventLogExpert.Provider.Database.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.DatabaseTools.IntegrationTests/EventLogExpert.DatabaseTools.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.ElevationHelper.IntegrationTests/EventLogExpert.ElevationHelper.IntegrationTests.csproj" />
-    <Project Path="tests/Integration/EventLogExpert.UI.IntegrationTests/EventLogExpert.UI.IntegrationTests.csproj" />
   </Folder>
   <Folder Name="/tests/Shared/">
     <Project Path="tests/Shared/EventLogExpert.Eventing.TestUtils/EventLogExpert.Eventing.TestUtils.csproj" />

compose.yml

@@ -39,13 +39,6 @@ services:
       - --logger
       - "trx;LogFileName=runtime.trx"
 
-  eventdbtool:
-    <<: *base
-    command:
-      - tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj
-      - --logger
-      - "trx;LogFileName=eventdbtool.trx"
-
   elevationhelper:
     <<: *base
     command:

docs/Explorer-Context-Menu.md

@@ -29,7 +29,7 @@ The MAUI receiving side:
 
 ## Build prerequisites
 
-The native shell extension requires the **MSVC C++ workload** to build. The **Windows 10/11 SDK (10.0.26100+)** it compiles against is delivered as NuGet packages (`Microsoft.Windows.SDK.CPP` + `Microsoft.Windows.SDK.CPP.x64`, restored to `src/packages`), so a machine-installed Windows SDK is **not** required on build agents — the OneBranch release container ships the C++ toolset but no SDK, and the packages supply the headers, import libs, winmd, and SDK tools (`rc.exe`, `mt.exe`, `midlrt.exe`). Specifically:
+The native shell extension requires the **MSVC C++ workload** to build. The **Windows 10/11 SDK (10.0.26100+)** it compiles against is delivered as NuGet packages (`Microsoft.Windows.SDK.CPP` + the per-architecture `Microsoft.Windows.SDK.CPP.x64` / `Microsoft.Windows.SDK.CPP.arm64`, restored to `src/packages`), so a machine-installed Windows SDK is **not** required on build agents - the OneBranch release container ships the C++ toolset but no SDK, and the packages supply the headers, import libs, winmd, and SDK tools (`rc.exe`, `mt.exe`, `midlrt.exe`). Specifically:
 
 - Visual Studio 2026 (or 2022) with the **Desktop development with C++** workload
 - The Windows SDK NuGet packages above (restored automatically by the `BuildExplorerExtensionNative` target; see below). A locally-installed Windows SDK 10.0.26100+ is still honored as a fallback when those packages are not restored — the vcxproj's `WindowsTargetPlatformVersion` then stays a bare `10.0` (latest installed SDK).
@@ -46,7 +46,7 @@ cd src/EventLogExpert.ExplorerExtensionNative
 nuget restore packages.config -PackagesDirectory ..\packages
 ```
 
-This populates `src/packages/` with `Microsoft.Windows.CppWinRT.*`, `Microsoft.Windows.ImplementationLibrary.*` (WIL), and the Windows SDK packages `Microsoft.Windows.SDK.CPP.*` + `Microsoft.Windows.SDK.CPP.x64.*` (the SDK packages are large — several hundred MB extracted). All are gitignored.
+This populates `src/packages/` with `Microsoft.Windows.CppWinRT.*`, `Microsoft.Windows.ImplementationLibrary.*` (WIL), and the Windows SDK packages `Microsoft.Windows.SDK.CPP.*` + the per-architecture `Microsoft.Windows.SDK.CPP.x64.*` / `Microsoft.Windows.SDK.CPP.arm64.*` (the SDK packages are large - several hundred MB extracted). All are gitignored.
 
 ## Local dev install (signed MSIX)
 

scripts/run-tests.ps1

@@ -19,7 +19,7 @@
 .EXAMPLE
     ./scripts/run-tests.ps1
     ./scripts/run-tests.ps1 -Suite eventing
-    ./scripts/run-tests.ps1 -Suite runtime,eventdbtool
+    ./scripts/run-tests.ps1 -Suite runtime,elevationhelper
 #>
 [CmdletBinding()]
 param(

src/EventLogExpert.EventDbTool/Properties/AssemblyInfo.cs

@@ -3,5 +3,4 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("EventLogExpert.EventDbTool.IntegrationTests")]
 [assembly: InternalsVisibleTo("EventLogExpert.EventDbTool.Tests")]

src/EventLogExpert.Eventing/Interop/EvtVariant.cs

@@ -8,28 +8,46 @@ namespace EventLogExpert.Eventing.Interop;
 [StructLayout(LayoutKind.Explicit)]
 internal readonly record struct EvtVariant
 {
-    [FieldOffset(0)] internal readonly uint UInteger;
-    [FieldOffset(0)] internal readonly int Integer;
-    [FieldOffset(0)] internal readonly byte UInt8;
-    [FieldOffset(0)] internal readonly short Short;
-    [FieldOffset(0)] internal readonly ushort UShort;
-    [FieldOffset(0)] internal readonly uint Bool;
+    [FieldOffset(0)] internal readonly int BooleanVal;
+    [FieldOffset(0)] internal readonly sbyte SByteVal;
+    [FieldOffset(0)] internal readonly short Int16Val;
+    [FieldOffset(0)] internal readonly int Int32Val;
+    [FieldOffset(0)] internal readonly long Int64Val;
     [FieldOffset(0)] internal readonly byte ByteVal;
-    [FieldOffset(0)] internal readonly byte SByte;
-    [FieldOffset(0)] internal readonly ulong ULong;
-    [FieldOffset(0)] internal readonly long Long;
-    [FieldOffset(0)] internal readonly float Single;
-    [FieldOffset(0)] internal readonly double Double;
+    [FieldOffset(0)] internal readonly ushort UInt16Val;
+    [FieldOffset(0)] internal readonly uint UInt32Val;
+    [FieldOffset(0)] internal readonly ulong UInt64Val;
+    [FieldOffset(0)] internal readonly float SingleVal;
+    [FieldOffset(0)] internal readonly double DoubleVal;
+    [FieldOffset(0)] internal readonly ulong FileTimeVal;
+    [FieldOffset(0)] internal readonly nint SysTimeVal;
+    [FieldOffset(0)] internal readonly nint GuidVal;
     [FieldOffset(0)] internal readonly nint StringVal;
-    [FieldOffset(0)] internal readonly nint AnsiString;
+    [FieldOffset(0)] internal readonly nint AnsiStringVal;
+    [FieldOffset(0)] internal readonly nint BinaryVal;
     [FieldOffset(0)] internal readonly nint SidVal;
-    [FieldOffset(0)] internal readonly nint Binary;
-    [FieldOffset(0)] internal readonly nint Reference;
-    [FieldOffset(0)] internal readonly nint Handle;
-    [FieldOffset(0)] internal readonly nint GuidReference;
-    [FieldOffset(0)] internal readonly ulong FileTime;
-    [FieldOffset(0)] internal readonly nint SystemTime;
-    [FieldOffset(0)] internal readonly nint SizeT;
+    [FieldOffset(0)] internal readonly nuint SizeTVal;
+    [FieldOffset(0)] internal readonly nint BooleanArr;
+    [FieldOffset(0)] internal readonly nint SByteArr;
+    [FieldOffset(0)] internal readonly nint Int16Arr;
+    [FieldOffset(0)] internal readonly nint Int32Arr;
+    [FieldOffset(0)] internal readonly nint Int64Arr;
+    [FieldOffset(0)] internal readonly nint ByteArr;
+    [FieldOffset(0)] internal readonly nint UInt16Arr;
+    [FieldOffset(0)] internal readonly nint UInt32Arr;
+    [FieldOffset(0)] internal readonly nint UInt64Arr;
+    [FieldOffset(0)] internal readonly nint SingleArr;
+    [FieldOffset(0)] internal readonly nint DoubleArr;
+    [FieldOffset(0)] internal readonly nint FileTimeArr;
+    [FieldOffset(0)] internal readonly nint SysTimeArr;
+    [FieldOffset(0)] internal readonly nint GuidArr;
+    [FieldOffset(0)] internal readonly nint StringArr;
+    [FieldOffset(0)] internal readonly nint AnsiStringArr;
+    [FieldOffset(0)] internal readonly nint SidArr;
+    [FieldOffset(0)] internal readonly nint SizeTArr;
+    [FieldOffset(0)] internal readonly nint EvtHandleVal;
+    [FieldOffset(0)] internal readonly nint XmlVal;
+    [FieldOffset(0)] internal readonly nint XmlValArr;
     [FieldOffset(8)] internal readonly uint Count;
     [FieldOffset(12)] internal readonly uint Type;
 }