diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml
index 9919d5ab..bc2f18fc 100644
--- a/.github/workflows/PullRequest.yml
+++ b/.github/workflows/PullRequest.yml
@@ -25,13 +25,8 @@ jobs:
       run: dotnet workload restore EventLogExpert.slnx
     - name: Restore dependencies
       run: dotnet restore EventLogExpert.slnx
-    # Build the MAUI app in its own step (after the tests), NOT as one solution build.
-    # Building the app together with the test projects makes MSBuild compile the shared
-    # libraries twice concurrently - the app resolves a Windows RID (win-x64) while the tests
-    # are AnyCPU - which races on the libs' obj/bin (CS2012 / MSB3030). The old -m:1 flag masked
-    # this by serializing; this split fixes the root cause. Don't recombine into one slnx build.
-    - name: Build libraries and tests
-      run: dotnet build LibrariesAndTests.slnf --no-restore -c Release -p:PublishReadyToRun=false
+    - name: Build
+      run: dotnet build EventLogExpert.slnx --no-restore -c Release -p:PublishReadyToRun=false -p:WindowsPackageType=None
     - name: Test (unit)
       shell: pwsh
       run: |
@@ -56,5 +51,3 @@ jobs:
           if ($LASTEXITCODE -ne 0) { $failed = $true }
         }
         if ($failed) { throw 'One or more integration test projects failed.' }
-    - name: Build app
-      run: dotnet build src/EventLogExpert/EventLogExpert.csproj --no-restore -c Release -p:PublishReadyToRun=false
diff --git a/Directory.Build.props b/Directory.Build.props
index 64a91cc3..37a2d833 100644
--- a/Directory.Build.props
+++ b/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>
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 00000000..b7fb0e0b
--- /dev/null
+++ b/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>
diff --git a/LibrariesAndTests.slnf b/LibrariesAndTests.slnf
deleted file mode 100644
index 4a8714da..00000000
--- a/LibrariesAndTests.slnf
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "solution": {
-    "path": "EventLogExpert.slnx",
-    "projects": [
-      "src\\EventLogExpert.DatabaseTools\\EventLogExpert.DatabaseTools.csproj",
-      "src\\EventLogExpert.ElevationHelper\\EventLogExpert.ElevationHelper.csproj",
-      "src\\EventLogExpert.EventDbTool\\EventLogExpert.EventDbTool.csproj",
-      "src\\EventLogExpert.Eventing\\EventLogExpert.Eventing.csproj",
-      "src\\EventLogExpert.Filtering\\EventLogExpert.Filtering.csproj",
-      "src\\EventLogExpert.Logging\\EventLogExpert.Logging.csproj",
-      "src\\EventLogExpert.Provider\\EventLogExpert.Provider.csproj",
-      "src\\EventLogExpert.Provider.Database\\EventLogExpert.Provider.Database.csproj",
-      "src\\EventLogExpert.Runtime\\EventLogExpert.Runtime.csproj",
-      "src\\EventLogExpert.Scenarios\\EventLogExpert.Scenarios.csproj",
-      "src\\EventLogExpert.UI\\EventLogExpert.UI.csproj",
-      "src\\EventLogExpert.WindowsPlatform\\EventLogExpert.WindowsPlatform.csproj",
-      "tests\\Integration\\EventLogExpert.DatabaseTools.IntegrationTests\\EventLogExpert.DatabaseTools.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.ElevationHelper.IntegrationTests\\EventLogExpert.ElevationHelper.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.Eventing.IntegrationTests\\EventLogExpert.Eventing.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.Provider.Database.IntegrationTests\\EventLogExpert.Provider.Database.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.Runtime.IntegrationTests\\EventLogExpert.Runtime.IntegrationTests.csproj",
-      "tests\\Shared\\EventLogExpert.Eventing.TestUtils\\EventLogExpert.Eventing.TestUtils.csproj",
-      "tests\\Shared\\EventLogExpert.Filtering.TestUtils\\EventLogExpert.Filtering.TestUtils.csproj",
-      "tests\\Unit\\EventLogExpert.DatabaseTools.Tests\\EventLogExpert.DatabaseTools.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.EventDbTool.Tests\\EventLogExpert.EventDbTool.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Eventing.Tests\\EventLogExpert.Eventing.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Filtering.Tests\\EventLogExpert.Filtering.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Logging.Tests\\EventLogExpert.Logging.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Provider.Database.Tests\\EventLogExpert.Provider.Database.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Provider.Tests\\EventLogExpert.Provider.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Runtime.Tests\\EventLogExpert.Runtime.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Scenarios.Tests\\EventLogExpert.Scenarios.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.UI.Tests\\EventLogExpert.UI.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Windows.Tests\\EventLogExpert.Windows.Tests.csproj"
-    ]
-  }
-}