Add server projects. Packaging with WinUI server doesn't work. Payload contains two or more files etc.

Wino.Server/App.xaml

@@ -1,10 +0,0 @@
-<Application
-    x:Class="Wino.Server.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    ShutdownMode="OnExplicitShutdown"
-    xmlns:local="clr-namespace:Wino.Server">
-    <Application.Resources>
-        <ResourceDictionary Source="TrayIconResources.xaml" />
-    </Application.Resources>
-</Application>

Wino.Server/App.xaml.cs

@@ -1,131 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using H.NotifyIcon;
-using Microsoft.Extensions.DependencyInjection;
-using Windows.Storage;
-using Wino.Core;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Services;
-using Wino.Core.UWP;
-//using Wino.Core.UWP;
-
-namespace Wino.Server
-{
-    /// <summary>
-    /// Single instance Wino Server.
-    /// Instancing is done using Mutex.
-    /// App will not start if another instance is already running.
-    /// App will let running server know that server execution is triggered, which will
-    /// led server to start new connection to requesting UWP app.
-    /// </summary>
-    public partial class App : Application
-    {
-        private const string NotifyIconResourceKey = "NotifyIcon";
-        private const string WinoServerAppName = "Wino.Server";
-        private const string WinoServerActiatedName = "Wino.Server.Activated";
-
-        public new static App Current => (App)Application.Current;
-
-        private TaskbarIcon? notifyIcon;
-        private static Mutex _mutex = null;
-        private EventWaitHandle _eventWaitHandle;
-
-        public IServiceProvider Services { get; private set; }
-
-        private IServiceProvider ConfigureServices()
-        {
-            var services = new ServiceCollection();
-
-            services.AddTransient<ServerContext>();
-            services.AddTransient<ServerViewModel>();
-
-            services.RegisterCoreServices();
-            services.RegisterCoreUWPServices();
-
-            // Below services belongs to UWP.Core package and some APIs are not available for WPF.
-            // We register them here to avoid compilation errors.
-
-            //services.AddSingleton<IConfigurationService, ConfigurationService>();
-            //services.AddSingleton<INativeAppService, NativeAppService>();
-            //services.AddSingleton<IPreferencesService, PreferencesService>();
-
-            return services.BuildServiceProvider();
-        }
-
-        private async Task<ServerViewModel> InitializeNewServerAsync()
-        {
-            // TODO: Error handling.
-
-            var databaseService = Services.GetService<IDatabaseService>();
-            var applicationFolderConfiguration = Services.GetService<IApplicationConfiguration>();
-
-            applicationFolderConfiguration.ApplicationDataFolderPath = ApplicationData.Current.LocalFolder.Path;
-            applicationFolderConfiguration.PublisherSharedFolderPath = ApplicationData.Current.GetPublisherCacheFolder(ApplicationConfiguration.SharedFolderName).Path;
-
-            await databaseService.InitializeAsync();
-
-            var serverViewModel = Services.GetRequiredService<ServerViewModel>();
-
-            await serverViewModel.InitializeAsync();
-
-            return serverViewModel;
-        }
-
-        protected override async void OnStartup(StartupEventArgs e)
-        {
-            _mutex = new Mutex(true, WinoServerAppName, out bool isCreatedNew);
-            _eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset, WinoServerActiatedName);
-
-            if (isCreatedNew)
-            {
-                // Spawn a thread which will be waiting for our event
-                var thread = new Thread(() =>
-                {
-                    while (_eventWaitHandle.WaitOne())
-                    {
-                        if (notifyIcon == null) return;
-
-                        Current.Dispatcher.BeginInvoke(async () =>
-                        {
-                            if (notifyIcon.DataContext is ServerViewModel trayIconViewModel)
-                            {
-                                await trayIconViewModel.ReconnectAsync();
-                            }
-                        });
-                    }
-                });
-
-                // It is important mark it as background otherwise it will prevent app from exiting.
-                thread.IsBackground = true;
-                thread.Start();
-
-                Services = ConfigureServices();
-
-                base.OnStartup(e);
-
-                var serverViewModel = await InitializeNewServerAsync();
-
-                // Create taskbar icon for the new server.
-                notifyIcon = (TaskbarIcon)FindResource(NotifyIconResourceKey);
-                notifyIcon.DataContext = serverViewModel;
-                notifyIcon.ForceCreate(enablesEfficiencyMode: true);
-            }
-            else
-            {
-                // Notify other instance so it could reconnect to UWP app if needed.
-                _eventWaitHandle.Set();
-
-                // Terminate this instance.
-                Shutdown();
-            }
-        }
-
-        protected override void OnExit(ExitEventArgs e)
-        {
-            notifyIcon?.Dispose();
-            base.OnExit(e);
-        }
-    }
-}

Wino.Server/Package.appxmanifest

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="f7498058-466c-48d4-bc53-0afe4ec4de31"
+    Publisher="CN=bkaan"
+    Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="f7498058-466c-48d4-bc53-0afe4ec4de31" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>Wino.Server.NET8</DisplayName>
+    <PublisherDisplayName>bkaan</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="Wino.Server.NET8"
+        Description="Wino.Server.NET8"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>

Wino.Server/Program.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.UI.Dispatching;
+using Microsoft.Windows.AppLifecycle;
+using Wino.Server.NET8;
+
+namespace Wino.Server
+{
+    class Program
+    {
+        private const string WinoActivationKey = nameof(WinoActivationKey);
+
+        [STAThread]
+        static void Main(string[] args)
+        {
+            WinRT.ComWrappersSupport.InitializeComWrappers();
+            bool isRedirect = DecideRedirection();
+            if (!isRedirect)
+            {
+                Microsoft.UI.Xaml.Application.Start((p) =>
+                {
+                    var context = new DispatcherQueueSynchronizationContext(
+                        DispatcherQueue.GetForCurrentThread());
+                    SynchronizationContext.SetSynchronizationContext(context);
+                    new ServerApp();
+                });
+            }
+        }
+
+        private static bool DecideRedirection()
+        {
+            bool isRedirect = false;
+
+            AppActivationArguments args = AppInstance.GetCurrent().GetActivatedEventArgs();
+            ExtendedActivationKind kind = args.Kind;
+
+            try
+            {
+                AppInstance keyInstance = AppInstance.FindOrRegisterForKey(WinoActivationKey);
+
+                if (keyInstance.IsCurrent)
+                {
+                    keyInstance.Activated += OnActivated;
+                }
+                else
+                {
+                    isRedirect = true;
+                    RedirectActivationTo(args, keyInstance);
+                }
+            }
+
+            catch (Exception ex)
+            {
+
+            }
+
+            return isRedirect;
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        private static extern IntPtr CreateEvent(IntPtr lpEventAttributes, bool bManualReset, bool bInitialState, string lpName);
+
+        [DllImport("kernel32.dll")]
+        private static extern bool SetEvent(IntPtr hEvent);
+
+        [DllImport("ole32.dll")]
+        private static extern uint CoWaitForMultipleObjects(uint dwFlags, uint dwMilliseconds, ulong nHandles, IntPtr[] pHandles, out uint dwIndex);
+
+        private static IntPtr redirectEventHandle = IntPtr.Zero;
+
+        // Do the redirection on another thread, and use a non-blocking
+        // wait method to wait for the redirection to complete.
+        public static void RedirectActivationTo(
+            AppActivationArguments args, AppInstance keyInstance)
+        {
+            redirectEventHandle = CreateEvent(IntPtr.Zero, true, false, null);
+
+            Task.Run(() =>
+            {
+                keyInstance.RedirectActivationToAsync(args).AsTask().Wait();
+                SetEvent(redirectEventHandle);
+            });
+
+            uint CWMO_DEFAULT = 0;
+            uint INFINITE = 0xFFFFFFFF;
+
+            _ = CoWaitForMultipleObjects(CWMO_DEFAULT, INFINITE, 1, new IntPtr[] { redirectEventHandle }, out uint handleIndex);
+        }
+
+        private static void OnActivated(object sender, AppActivationArguments args)
+        {
+            ExtendedActivationKind kind = args.Kind;
+        }
+    }
+}

Wino.Server/Properties/launchSettings.json

@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "Wino.Server.NET8 (Package)": {
+      "commandName": "MsixPackage"
+    },
+    "Wino.Server.NET8 (Unpackaged)": {
+      "commandName": "Project"
+    }
+  }
+}

Wino.Server/ServerApp.xaml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Application
+    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"
+    xmlns:styles="using:Wino.Server.Styles">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <styles:TrayIconResources />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

Wino.Server/ServerApp.xaml.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Threading.Tasks;
+using H.NotifyIcon;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+using Windows.Storage;
+using Wino.Core;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Services;
+using Wino.Core.UWP.Services;
+using Wino.Services;
+
+namespace Wino.Server.NET8
+{
+    public partial class ServerApp : Application
+    {
+        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 ServerApp()
+        {
+            InitializeComponent();
+        }
+
+        private IServiceProvider ConfigureServices()
+        {
+            var services = new ServiceCollection();
+
+            services.AddTransient<ServerContext>();
+            services.AddTransient<ServerViewModel>();
+
+            services.RegisterCoreServices();
+
+            // Below services belongs to UWP.Core package and some APIs are not available for WPF.
+            // We register them here to avoid compilation errors.
+
+            services.AddSingleton<IConfigurationService, ConfigurationService>();
+            services.AddSingleton<INativeAppService, NativeAppService>();
+            services.AddSingleton<IPreferencesService, PreferencesService>();
+
+            return services.BuildServiceProvider();
+        }
+
+        protected override async void OnLaunched(LaunchActivatedEventArgs args)
+        {
+            Services = ConfigureServices();
+
+            await InitializeNewServerAsync();
+            InitializeTrayIcon();
+        }
+
+        private async Task<ServerViewModel> InitializeNewServerAsync()
+        {
+            // TODO: Error handling.
+
+            var databaseService = Services.GetService<IDatabaseService>();
+            var applicationFolderConfiguration = Services.GetService<IApplicationConfiguration>();
+
+            applicationFolderConfiguration.ApplicationDataFolderPath = ApplicationData.Current.LocalFolder.Path;
+            applicationFolderConfiguration.PublisherSharedFolderPath = ApplicationData.Current.GetPublisherCacheFolder(ApplicationConfiguration.SharedFolderName).Path;
+
+            await databaseService.InitializeAsync();
+
+            var serverViewModel = Services.GetRequiredService<ServerViewModel>();
+
+            await serverViewModel.InitializeAsync();
+
+            return serverViewModel;
+        }
+
+        private void InitializeTrayIcon()
+        {
+            var viewModel = Services.GetService<ServerViewModel>();
+
+            var launchCommand = (XamlUICommand)Resources["LaunchCommand"];
+            launchCommand.Command = viewModel.LaunchWinoCommand;
+
+            var exitApplicationCommand = (XamlUICommand)Resources["TerminateCommand"];
+            exitApplicationCommand.Command = viewModel.ExitApplicationCommand;
+
+            TrayIcon = (TaskbarIcon)Resources["TrayIcon"];
+            TrayIcon.ForceCreate();
+        }
+    }
+}

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
-
-
-
-
-
     }
 }

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();

Wino.Server/Styles/TrayIconResources.xaml

@@ -0,0 +1,44 @@
+<ResourceDictionary
+    x:Class="Wino.Server.Styles.TrayIconResources"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:local="using:Wino.Server"
+    xmlns:tb="using:H.NotifyIcon">
+
+    <!--  TODO: Localize by Translator.  -->
+    <XamlUICommand
+        x:Key="LaunchCommand"
+        Label="Launch"
+        Description="Activates Wino Mail window.">
+        <XamlUICommand.IconSource>
+            <SymbolIconSource Symbol="Accept" />
+        </XamlUICommand.IconSource>
+    </XamlUICommand>
+
+    <XamlUICommand
+        x:Key="TerminateCommand"
+        Label="Quit"
+        Description="Close Wino Mail completely.">
+        <XamlUICommand.IconSource>
+            <SymbolIconSource Symbol="ClosePane" />
+        </XamlUICommand.IconSource>
+    </XamlUICommand>
+
+    <tb:TaskbarIcon
+        x:Key="TrayIcon"
+        Visibility="Visible"
+        ToolTipText="Wino Mail"
+        ContextMenuMode="PopupMenu"
+        LeftClickCommand="{StaticResource LaunchCommand}"
+        NoLeftClickDelay="True"
+        IconSource="\Assets\Wino_Icon.ico">
+        <tb:TaskbarIcon.ContextFlyout>
+            <MenuFlyout>
+                <MenuFlyoutItem Command="{StaticResource LaunchCommand}" />
+                <MenuFlyoutItem Command="{StaticResource TerminateCommand}" />
+            </MenuFlyout>
+        </tb:TaskbarIcon.ContextFlyout>
+    </tb:TaskbarIcon>
+
+</ResourceDictionary>

Wino.Server/Styles/TrayIconResources.xaml.cs

@@ -0,0 +1,12 @@
+using Microsoft.UI.Xaml;
+
+namespace Wino.Server.Styles
+{
+    partial class TrayIconResources : ResourceDictionary
+    {
+        public TrayIconResources()
+        {
+            InitializeComponent();
+        }
+    }
+}

Wino.Server/TrayIconResources.xaml

@@ -1,21 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:tb="http://www.hardcodet.net/taskbar"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:server="clr-namespace:Wino.Server">
-
-    <ContextMenu x:Shared="false" x:Key="SysTrayMenu">
-        <MenuItem Header="Launch Wino Mail" Command="{Binding LaunchWinoCommand}" />
-        <Separator />
-        <MenuItem Header="Exit" Command="{Binding ExitApplicationCommand}" />
-    </ContextMenu>
-
-    <tb:TaskbarIcon
-        x:Key="NotifyIcon"
-        IconSource="Images/Wino_Icon.ico"
-        ToolTipText="Wino Mail"
-        LeftClickCommand="{Binding LaunchWinoCommand}"
-        NoLeftClickDelay="True"
-        ContextMenu="{StaticResource SysTrayMenu}" />
-
-</ResourceDictionary>

Wino.Server/Wino.Server.NET8.csproj

@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>Wino.Server.WinUI</RootNamespace>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x86;x64;ARM64</Platforms>
-    <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>
-	<PropertyGroup>
-		<StartupObject>Wino.Server.App</StartupObject>
-	</PropertyGroup>
-	<ItemGroup>
-	  <None Remove="Images\Wino_Icon.ico" />
-	  <None Remove="TrayIconResources.xaml" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Include="..\Wino.Core.UWP\Services\ConfigurationService.cs" Link="Services\ConfigurationService.cs" />
-	  <Compile Include="..\Wino.Core.UWP\Services\NativeAppService.cs" Link="Services\NativeAppService.cs" />
-	  <Compile Include="..\Wino.Core.UWP\Services\NotificationBuilder.cs" Link="Services\NotificationBuilder.cs" />
-	  <Compile Include="..\Wino.Core.UWP\Services\PreferencesService.cs" Link="Services\PreferencesService.cs" />
-	</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.WinUI" Version="2.1.0" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.NET8.csproj" />
-	  <ProjectReference Include="..\Wino.Core\Wino.Core.NET8.csproj" />
-	  <ProjectReference Include="..\Wino.Messages\Wino.Messaging.NET8.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Services\" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="TrayIconResources.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-</Project>

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>

Wino.Server/app.manifest

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="Wino.Server.NET8.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
+      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
+      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>