From f112f369a72821955af41fedbee211ce41732184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Kaan=20K=C3=B6se?= <bkaankose@outlook.com>
Date: Sun, 21 Jul 2024 02:17:11 +0200
Subject: [PATCH] Add server projects. Packaging with WinUI server doesn't
 work. `Payload contains two or more files etc.`

---
 Wino.Mail.sln                                 |  32 +++++
 Wino.Server.NET8/Wino.Server.NET8.csproj      | 105 --------------
 {Wino.Server => Wino.Server.WPF}/App.xaml     |   0
 {Wino.Server => Wino.Server.WPF}/App.xaml.cs  |   0
 .../Images}/Wino_Icon.ico                     | Bin
 .../ServerContext.cs                          |   6 +-
 .../ServerViewModel.cs                        |   3 +
 .../TrayIconResources.xaml                    |   0
 .../Wino.Server.NET8.csproj                   |   0
 Wino.Server.WPF/Wino.Server.csproj            |  35 +++++
 .../Assets/LockScreenLogo.scale-200.png       | Bin
 .../Assets/SplashScreen.scale-200.png         | Bin
 .../Assets/Square150x150Logo.scale-200.png    | Bin
 .../Assets/Square44x44Logo.scale-200.png      | Bin
 ...x44Logo.targetsize-24_altform-unplated.png | Bin
 .../Assets/StoreLogo.png                      | Bin
 .../Assets/Wide310x150Logo.scale-200.png      | Bin
 Wino.Server/{Images => Assets}/Wino_Icon.ico  | Bin
 .../Package.appxmanifest                      |   0
 {Wino.Server.NET8 => Wino.Server}/Program.cs  |   2 +-
 .../Properties/launchSettings.json            |   0
 .../App.xaml => Wino.Server/ServerApp.xaml    |   2 +-
 .../ServerApp.xaml.cs                         |   6 +-
 Wino.Server/ServerContext.cs                  |  12 +-
 Wino.Server/ServerViewModel.cs                |   3 -
 .../Styles/TrayIconResources.xaml             |   0
 .../Styles/TrayIconResources.xaml.cs          |   0
 Wino.Server/Wino.Server.csproj                | 133 ++++++++++++++----
 .../app.manifest                              |   0
 29 files changed, 186 insertions(+), 153 deletions(-)
 delete mode 100644 Wino.Server.NET8/Wino.Server.NET8.csproj
 rename {Wino.Server => Wino.Server.WPF}/App.xaml (100%)
 rename {Wino.Server => Wino.Server.WPF}/App.xaml.cs (100%)
 rename {Wino.Server.NET8/Assets => Wino.Server.WPF/Images}/Wino_Icon.ico (100%)
 rename {Wino.Server.NET8 => Wino.Server.WPF}/ServerContext.cs (99%)
 rename {Wino.Server.NET8 => Wino.Server.WPF}/ServerViewModel.cs (94%)
 rename {Wino.Server => Wino.Server.WPF}/TrayIconResources.xaml (100%)
 rename {Wino.Server => Wino.Server.WPF}/Wino.Server.NET8.csproj (100%)
 create mode 100644 Wino.Server.WPF/Wino.Server.csproj
 rename {Wino.Server.NET8 => Wino.Server}/Assets/LockScreenLogo.scale-200.png (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Assets/SplashScreen.scale-200.png (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Assets/Square150x150Logo.scale-200.png (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Assets/Square44x44Logo.scale-200.png (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Assets/StoreLogo.png (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Assets/Wide310x150Logo.scale-200.png (100%)
 rename Wino.Server/{Images => Assets}/Wino_Icon.ico (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Package.appxmanifest (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Program.cs (98%)
 rename {Wino.Server.NET8 => Wino.Server}/Properties/launchSettings.json (100%)
 rename Wino.Server.NET8/App.xaml => Wino.Server/ServerApp.xaml (93%)
 rename Wino.Server.NET8/App.xaml.cs => Wino.Server/ServerApp.xaml.cs (95%)
 rename {Wino.Server.NET8 => Wino.Server}/Styles/TrayIconResources.xaml (100%)
 rename {Wino.Server.NET8 => Wino.Server}/Styles/TrayIconResources.xaml.cs (100%)
 rename {Wino.Server.NET8 => Wino.Server}/app.manifest (100%)

diff --git a/Wino.Mail.sln b/Wino.Mail.sln
index c631f1cf..ada84a49 100644
--- a/Wino.Mail.sln
+++ b/Wino.Mail.sln
@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Mail", "Wino.Mail\Wino
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Wino.Packaging", "Wino.Packaging\Wino.Packaging.wapproj", "{FD8CEA2F-7741-426A-934F-4A20465A79F6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Server", "Wino.Server\Wino.Server.csproj", "{C4D62168-8A08-425B-A650-536F6FFF1FE5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -183,6 +185,36 @@ Global
 		{FD8CEA2F-7741-426A-934F-4A20465A79F6}.Release|x86.ActiveCfg = Release|x86
 		{FD8CEA2F-7741-426A-934F-4A20465A79F6}.Release|x86.Build.0 = Release|x86
 		{FD8CEA2F-7741-426A-934F-4A20465A79F6}.Release|x86.Deploy.0 = Release|x86
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|Any CPU.Build.0 = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|ARM.ActiveCfg = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|ARM.Build.0 = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|ARM.Deploy.0 = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|ARM64.Build.0 = Debug|ARM64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|x64.ActiveCfg = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|x64.Build.0 = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|x64.Deploy.0 = Debug|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|x86.ActiveCfg = Debug|x86
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|x86.Build.0 = Debug|x86
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Debug|x86.Deploy.0 = Debug|x86
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|Any CPU.ActiveCfg = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|Any CPU.Build.0 = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|Any CPU.Deploy.0 = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|ARM.ActiveCfg = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|ARM.Build.0 = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|ARM.Deploy.0 = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|ARM64.Build.0 = Release|ARM64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|ARM64.Deploy.0 = Release|ARM64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|x64.ActiveCfg = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|x64.Build.0 = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|x64.Deploy.0 = Release|x64
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|x86.ActiveCfg = Release|x86
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|x86.Build.0 = Release|x86
+		{C4D62168-8A08-425B-A650-536F6FFF1FE5}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Wino.Server.NET8/Wino.Server.NET8.csproj b/Wino.Server.NET8/Wino.Server.NET8.csproj
deleted file mode 100644
index 7a31aadc..00000000
--- a/Wino.Server.NET8/Wino.Server.NET8.csproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>Wino.Server</RootNamespace>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x86;x64;ARM64</Platforms>
-	<SelfContained>true</SelfContained>
-    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
-    <UseWinUI>true</UseWinUI>
-    <EnableMsixTooling>true</EnableMsixTooling>
-	<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
-  </PropertyGroup>
-
-	<!-- Disable XAML generated main to enable single activation. -->
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	
-  <ItemGroup>
-    <None Remove="app.manifest" />
-    <None Remove="Assets\Wino_Icon.ico" />
-    <None Remove="TrayIconResources.xaml" />
-  </ItemGroup>
-	
-  <ItemGroup>
-    <Page Remove="App.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="H.NotifyIcon.WinUI" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
-    <Manifest Include="$(ApplicationManifest)" />
-  </ItemGroup>
-
-  <!--
-    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
-    Tools extension to be activated for this project even if the Windows App SDK Nuget
-    package has not yet been restored.
-  -->
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix" />
-  </ItemGroup>
-	
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.NET8.csproj" />
-    <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.WinUI.csproj" />
-    <ProjectReference Include="..\Wino.Core\Wino.Core.NET8.csproj" />
-    <ProjectReference Include="..\Wino.Messages\Wino.Messaging.NET8.csproj" />
-  </ItemGroup>
-	
-  <ItemGroup>
-    <Resource Include="app.manifest">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-  </ItemGroup>
-	
-  <ItemGroup>
-    <Page Update="TrayIconResources.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-	
-  <ItemGroup>
-    <Folder Include="Styles\" />
-  </ItemGroup>
-
-  <!--
-    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
-    Explorer "Package and Publish" context menu entry to be enabled for this project even if
-    the Windows App SDK Nuget package has not yet been restored.
-  -->
-  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Wino.Server/App.xaml b/Wino.Server.WPF/App.xaml
similarity index 100%
rename from Wino.Server/App.xaml
rename to Wino.Server.WPF/App.xaml
diff --git a/Wino.Server/App.xaml.cs b/Wino.Server.WPF/App.xaml.cs
similarity index 100%
rename from Wino.Server/App.xaml.cs
rename to Wino.Server.WPF/App.xaml.cs
diff --git a/Wino.Server.NET8/Assets/Wino_Icon.ico b/Wino.Server.WPF/Images/Wino_Icon.ico
similarity index 100%
rename from Wino.Server.NET8/Assets/Wino_Icon.ico
rename to Wino.Server.WPF/Images/Wino_Icon.ico
diff --git a/Wino.Server.NET8/ServerContext.cs b/Wino.Server.WPF/ServerContext.cs
similarity index 99%
rename from Wino.Server.NET8/ServerContext.cs
rename to Wino.Server.WPF/ServerContext.cs
index 5471c501..168bf7cc 100644
--- a/Wino.Server.NET8/ServerContext.cs
+++ b/Wino.Server.WPF/ServerContext.cs
@@ -17,7 +17,6 @@ using Wino.Core.Synchronizers;
 using Wino.Messaging;
 using Wino.Messaging.Enums;
 using Wino.Messaging.Server;
-using Wino.Server.NET8;
 
 namespace Wino.Server
 {
@@ -213,5 +212,10 @@ namespace Wino.Server
         }
 
         #endregion
+
+
+
+
+
     }
 }
diff --git a/Wino.Server.NET8/ServerViewModel.cs b/Wino.Server.WPF/ServerViewModel.cs
similarity index 94%
rename from Wino.Server.NET8/ServerViewModel.cs
rename to Wino.Server.WPF/ServerViewModel.cs
index c6bbacb0..42a2574f 100644
--- a/Wino.Server.NET8/ServerViewModel.cs
+++ b/Wino.Server.WPF/ServerViewModel.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Wino.Core.Domain.Interfaces;
@@ -28,6 +29,8 @@ namespace Wino.Server
         public void ExitApplication()
         {
             // TODO: App service send message to UWP app to terminate itself.
+
+            Application.Current.Shutdown();
         }
 
         public async Task ReconnectAsync() => await Context.InitializeAppServiceConnectionAsync();
diff --git a/Wino.Server/TrayIconResources.xaml b/Wino.Server.WPF/TrayIconResources.xaml
similarity index 100%
rename from Wino.Server/TrayIconResources.xaml
rename to Wino.Server.WPF/TrayIconResources.xaml
diff --git a/Wino.Server/Wino.Server.NET8.csproj b/Wino.Server.WPF/Wino.Server.NET8.csproj
similarity index 100%
rename from Wino.Server/Wino.Server.NET8.csproj
rename to Wino.Server.WPF/Wino.Server.NET8.csproj
diff --git a/Wino.Server.WPF/Wino.Server.csproj b/Wino.Server.WPF/Wino.Server.csproj
new file mode 100644
index 00000000..abc3c4f5
--- /dev/null
+++ b/Wino.Server.WPF/Wino.Server.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+		<OutputType>WinExe</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<UseWPF>true</UseWPF>
+		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+		<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+		<CsWinRTComponent>true</CsWinRTComponent>
+		<CsWinRTWindowsMetadata>10.0.22621.0</CsWinRTWindowsMetadata>
+	</PropertyGroup>
+	<PropertyGroup>
+		<StartupObject>Wino.Server.App</StartupObject>
+	</PropertyGroup>
+	<ItemGroup>
+	  <None Remove="Images\Wino_Icon.ico" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Resource Include="Images\Wino_Icon.ico">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Resource>
+	</ItemGroup>
+	<ItemGroup>
+	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+	  <PackageReference Include="H.NotifyIcon.Wpf" Version="2.1.0" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.NET8.csproj" />
+	  <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.WinUI.csproj" />
+	  <ProjectReference Include="..\Wino.Core\Wino.Core.NET8.csproj" />
+	  <ProjectReference Include="..\Wino.Messages\Wino.Messaging.NET8.csproj" />
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Wino.Server.NET8/Assets/LockScreenLogo.scale-200.png b/Wino.Server/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from Wino.Server.NET8/Assets/LockScreenLogo.scale-200.png
rename to Wino.Server/Assets/LockScreenLogo.scale-200.png
diff --git a/Wino.Server.NET8/Assets/SplashScreen.scale-200.png b/Wino.Server/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from Wino.Server.NET8/Assets/SplashScreen.scale-200.png
rename to Wino.Server/Assets/SplashScreen.scale-200.png
diff --git a/Wino.Server.NET8/Assets/Square150x150Logo.scale-200.png b/Wino.Server/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from Wino.Server.NET8/Assets/Square150x150Logo.scale-200.png
rename to Wino.Server/Assets/Square150x150Logo.scale-200.png
diff --git a/Wino.Server.NET8/Assets/Square44x44Logo.scale-200.png b/Wino.Server/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from Wino.Server.NET8/Assets/Square44x44Logo.scale-200.png
rename to Wino.Server/Assets/Square44x44Logo.scale-200.png
diff --git a/Wino.Server.NET8/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Server/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from Wino.Server.NET8/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to Wino.Server/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/Wino.Server.NET8/Assets/StoreLogo.png b/Wino.Server/Assets/StoreLogo.png
similarity index 100%
rename from Wino.Server.NET8/Assets/StoreLogo.png
rename to Wino.Server/Assets/StoreLogo.png
diff --git a/Wino.Server.NET8/Assets/Wide310x150Logo.scale-200.png b/Wino.Server/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from Wino.Server.NET8/Assets/Wide310x150Logo.scale-200.png
rename to Wino.Server/Assets/Wide310x150Logo.scale-200.png
diff --git a/Wino.Server/Images/Wino_Icon.ico b/Wino.Server/Assets/Wino_Icon.ico
similarity index 100%
rename from Wino.Server/Images/Wino_Icon.ico
rename to Wino.Server/Assets/Wino_Icon.ico
diff --git a/Wino.Server.NET8/Package.appxmanifest b/Wino.Server/Package.appxmanifest
similarity index 100%
rename from Wino.Server.NET8/Package.appxmanifest
rename to Wino.Server/Package.appxmanifest
diff --git a/Wino.Server.NET8/Program.cs b/Wino.Server/Program.cs
similarity index 98%
rename from Wino.Server.NET8/Program.cs
rename to Wino.Server/Program.cs
index f7933cc0..0af86fd2 100644
--- a/Wino.Server.NET8/Program.cs
+++ b/Wino.Server/Program.cs
@@ -24,7 +24,7 @@ namespace Wino.Server
                     var context = new DispatcherQueueSynchronizationContext(
                         DispatcherQueue.GetForCurrentThread());
                     SynchronizationContext.SetSynchronizationContext(context);
-                    new App();
+                    new ServerApp();
                 });
             }
         }
diff --git a/Wino.Server.NET8/Properties/launchSettings.json b/Wino.Server/Properties/launchSettings.json
similarity index 100%
rename from Wino.Server.NET8/Properties/launchSettings.json
rename to Wino.Server/Properties/launchSettings.json
diff --git a/Wino.Server.NET8/App.xaml b/Wino.Server/ServerApp.xaml
similarity index 93%
rename from Wino.Server.NET8/App.xaml
rename to Wino.Server/ServerApp.xaml
index 5058d6b7..62f2c276 100644
--- a/Wino.Server.NET8/App.xaml
+++ b/Wino.Server/ServerApp.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Application
-    x:Class="Wino.Server.NET8.App"
+    x:Class="Wino.Server.NET8.ServerApp"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Wino.Server.NET8"
diff --git a/Wino.Server.NET8/App.xaml.cs b/Wino.Server/ServerApp.xaml.cs
similarity index 95%
rename from Wino.Server.NET8/App.xaml.cs
rename to Wino.Server/ServerApp.xaml.cs
index 1b6b410d..fb8d709c 100644
--- a/Wino.Server.NET8/App.xaml.cs
+++ b/Wino.Server/ServerApp.xaml.cs
@@ -13,16 +13,16 @@ using Wino.Services;
 
 namespace Wino.Server.NET8
 {
-    public partial class App : Application
+    public partial class ServerApp : Application
     {
-        public new static App Current => (App)Application.Current;
+        public new static ServerApp Current => (ServerApp)Application.Current;
 
         private const string WinoServerAppName = "Wino.Server";
 
         public TaskbarIcon TrayIcon { get; private set; }
         public bool HandleClosedEvents { get; set; } = true;
         public IServiceProvider Services { get; private set; }
-        public App()
+        public ServerApp()
         {
             InitializeComponent();
         }
diff --git a/Wino.Server/ServerContext.cs b/Wino.Server/ServerContext.cs
index 168bf7cc..d6c19a3e 100644
--- a/Wino.Server/ServerContext.cs
+++ b/Wino.Server/ServerContext.cs
@@ -17,6 +17,7 @@ using Wino.Core.Synchronizers;
 using Wino.Messaging;
 using Wino.Messaging.Enums;
 using Wino.Messaging.Server;
+using Wino.Server.NET8;
 
 namespace Wino.Server
 {
@@ -107,13 +108,13 @@ namespace Wino.Server
 
         public async Task TestOutlookSynchronizer()
         {
-            var accountService = App.Current.Services.GetService<IAccountService>();
+            var accountService = ServerApp.Current.Services.GetService<IAccountService>();
 
             var accs = await accountService.GetAccountsAsync();
             var acc = accs.ElementAt(0);
 
-            var authenticator = App.Current.Services.GetService<OutlookAuthenticator>();
-            var processor = App.Current.Services.GetService<IOutlookChangeProcessor>();
+            var authenticator = ServerApp.Current.Services.GetService<OutlookAuthenticator>();
+            var processor = ServerApp.Current.Services.GetService<IOutlookChangeProcessor>();
 
             var sync = new OutlookSynchronizer(acc, authenticator, processor);
 
@@ -212,10 +213,5 @@ namespace Wino.Server
         }
 
         #endregion
-
-
-
-
-
     }
 }
diff --git a/Wino.Server/ServerViewModel.cs b/Wino.Server/ServerViewModel.cs
index 42a2574f..c6bbacb0 100644
--- a/Wino.Server/ServerViewModel.cs
+++ b/Wino.Server/ServerViewModel.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Wino.Core.Domain.Interfaces;
@@ -29,8 +28,6 @@ namespace Wino.Server
         public void ExitApplication()
         {
             // TODO: App service send message to UWP app to terminate itself.
-
-            Application.Current.Shutdown();
         }
 
         public async Task ReconnectAsync() => await Context.InitializeAppServiceConnectionAsync();
diff --git a/Wino.Server.NET8/Styles/TrayIconResources.xaml b/Wino.Server/Styles/TrayIconResources.xaml
similarity index 100%
rename from Wino.Server.NET8/Styles/TrayIconResources.xaml
rename to Wino.Server/Styles/TrayIconResources.xaml
diff --git a/Wino.Server.NET8/Styles/TrayIconResources.xaml.cs b/Wino.Server/Styles/TrayIconResources.xaml.cs
similarity index 100%
rename from Wino.Server.NET8/Styles/TrayIconResources.xaml.cs
rename to Wino.Server/Styles/TrayIconResources.xaml.cs
diff --git a/Wino.Server/Wino.Server.csproj b/Wino.Server/Wino.Server.csproj
index abc3c4f5..5cf0c130 100644
--- a/Wino.Server/Wino.Server.csproj
+++ b/Wino.Server/Wino.Server.csproj
@@ -1,35 +1,106 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-		<OutputType>WinExe</OutputType>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<UseWPF>true</UseWPF>
-		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-		<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-		<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-		<CsWinRTComponent>true</CsWinRTComponent>
-		<CsWinRTWindowsMetadata>10.0.22621.0</CsWinRTWindowsMetadata>
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+	<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+	<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>Wino.Server</RootNamespace>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>x86;x64;ARM64</Platforms>
+	<SelfContained>true</SelfContained>
+    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
+    <UseWinUI>true</UseWinUI>
+    <EnableMsixTooling>true</EnableMsixTooling>
+  </PropertyGroup>
+
+	<!-- Disable XAML generated main to enable single activation. -->
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup>
-		<StartupObject>Wino.Server.App</StartupObject>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
 	</PropertyGroup>
-	<ItemGroup>
-	  <None Remove="Images\Wino_Icon.ico" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Resource Include="Images\Wino_Icon.ico">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Resource>
-	</ItemGroup>
-	<ItemGroup>
-	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-	  <PackageReference Include="H.NotifyIcon.Wpf" Version="2.1.0" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.NET8.csproj" />
-	  <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.WinUI.csproj" />
-	  <ProjectReference Include="..\Wino.Core\Wino.Core.NET8.csproj" />
-	  <ProjectReference Include="..\Wino.Messages\Wino.Messaging.NET8.csproj" />
-	</ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+	</PropertyGroup>
+	
+  <ItemGroup>
+    <None Remove="app.manifest" />
+    <None Remove="Assets\Wino_Icon.ico" />
+    <None Remove="TrayIconResources.xaml" />
+  </ItemGroup>
+	
+  <ItemGroup>
+	<ApplicationDefinition Include="ServerApp.xaml" SubType="Designer" />
+	<None Remove="ServerApp.xaml" />
+    <Page Remove="ServerApp.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="H.NotifyIcon.WinUI" Version="2.1.0" />
+	<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+
+  <!--
+    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+    Tools extension to be activated for this project even if the Windows App SDK Nuget
+    package has not yet been restored.
+  -->
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+	
+  <ItemGroup>
+    <Resource Include="app.manifest">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+	
+  <ItemGroup>
+    <Page Update="TrayIconResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+	
+  <ItemGroup>
+    <Folder Include="Styles\" />
+  </ItemGroup>
+	
+  <ItemGroup>
+    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
+    <ProjectReference Include="..\Wino.Core.UWP\Wino.Shared.csproj" />
+    <ProjectReference Include="..\Wino.Core\Wino.Core.csproj" />
+    <ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
+  </ItemGroup>
+
+  <!--
+    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
+    Explorer "Package and Publish" context menu entry to be enabled for this project even if
+    the Windows App SDK Nuget package has not yet been restored.
+  -->
+  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Wino.Server.NET8/app.manifest b/Wino.Server/app.manifest
similarity index 100%
rename from Wino.Server.NET8/app.manifest
rename to Wino.Server/app.manifest