From f853191c7ab249e1dd0b3ef0c49236270f5ed7bd Mon Sep 17 00:00:00 2001
From: agailloty <mr.clerisaxel@hotmail.fr>
Date: Sat, 1 Feb 2025 10:08:59 +0100
Subject: [PATCH] Keep only Desktop UI project

---
 xpathrunner.sln                               |  6 -----
 .../xpathrunnerui.Desktop/app.manifest        | 18 -------------
 .../xpathrunnerui.Desktop.csproj              | 25 -------------------
 .../Program.cs                                | 13 +++++++---
 .../xpathrunnerui/xpathrunnerui.csproj        |  1 +
 5 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 xpathrunnerui/xpathrunnerui.Desktop/app.manifest
 delete mode 100644 xpathrunnerui/xpathrunnerui.Desktop/xpathrunnerui.Desktop.csproj
 rename xpathrunnerui/{xpathrunnerui.Desktop => xpathrunnerui}/Program.cs (69%)

diff --git a/xpathrunner.sln b/xpathrunner.sln
index 4f42953..4fba413 100644
--- a/xpathrunner.sln
+++ b/xpathrunner.sln
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xpathrunner", "xpathrunner\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xpathrunnerui", "xpathrunnerui\xpathrunnerui\xpathrunnerui.csproj", "{4A6A3B53-39EB-4EC3-A721-86A90A7BC263}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xpathrunnerui.Desktop", "xpathrunnerui\xpathrunnerui.Desktop\xpathrunnerui.Desktop.csproj", "{5D984B3B-FAF0-4B02-BCD4-D2809826C08E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{4A6A3B53-39EB-4EC3-A721-86A90A7BC263}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A6A3B53-39EB-4EC3-A721-86A90A7BC263}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A6A3B53-39EB-4EC3-A721-86A90A7BC263}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D984B3B-FAF0-4B02-BCD4-D2809826C08E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D984B3B-FAF0-4B02-BCD4-D2809826C08E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D984B3B-FAF0-4B02-BCD4-D2809826C08E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D984B3B-FAF0-4B02-BCD4-D2809826C08E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/xpathrunnerui/xpathrunnerui.Desktop/app.manifest b/xpathrunnerui/xpathrunnerui.Desktop/app.manifest
deleted file mode 100644
index d4fda93..0000000
--- a/xpathrunnerui/xpathrunnerui.Desktop/app.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <!-- This manifest is used on Windows only.
-       Don't remove it as it might cause problems with window transparency and embedded controls.
-       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
-  <assemblyIdentity version="1.0.0.0" name="xpathrunnerui.Desktop"/>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of the Windows versions that this application has been tested on
-           and is designed to work with. Uncomment the appropriate elements
-           and Windows will automatically select the most compatible environment. -->
-
-      <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-</assembly>
diff --git a/xpathrunnerui/xpathrunnerui.Desktop/xpathrunnerui.Desktop.csproj b/xpathrunnerui/xpathrunnerui.Desktop/xpathrunnerui.Desktop.csproj
deleted file mode 100644
index 77d7ddd..0000000
--- a/xpathrunnerui/xpathrunnerui.Desktop/xpathrunnerui.Desktop.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <PublishAot>true</PublishAot>
-    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-    <LangVersion>latest</LangVersion>
-    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\xpathrunnerui\xpathrunnerui.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/xpathrunnerui/xpathrunnerui.Desktop/Program.cs b/xpathrunnerui/xpathrunnerui/Program.cs
similarity index 69%
rename from xpathrunnerui/xpathrunnerui.Desktop/Program.cs
rename to xpathrunnerui/xpathrunnerui/Program.cs
index e5c3924..5200205 100644
--- a/xpathrunnerui/xpathrunnerui.Desktop/Program.cs
+++ b/xpathrunnerui/xpathrunnerui/Program.cs
@@ -2,7 +2,7 @@
 
 using Avalonia;
 
-namespace xpathrunnerui.Desktop
+namespace xpathrunnerui
 {
     internal sealed class Program
     {
@@ -10,14 +10,19 @@ internal sealed class Program
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
         [STAThread]
-        public static void Main(string[] args) => BuildAvaloniaApp()
-            .StartWithClassicDesktopLifetime(args);
+        public static void Main(string[] args)
+        {
+            BuildAvaloniaApp()
+                .StartWithClassicDesktopLifetime(args);
+        }
 
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
+        {
+            return AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .WithInterFont()
                 .LogToTrace();
+        }
     }
 }
diff --git a/xpathrunnerui/xpathrunnerui/xpathrunnerui.csproj b/xpathrunnerui/xpathrunnerui/xpathrunnerui.csproj
index 853c2fd..153d438 100644
--- a/xpathrunnerui/xpathrunnerui/xpathrunnerui.csproj
+++ b/xpathrunnerui/xpathrunnerui/xpathrunnerui.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>