Remove commented code.

.editorconfig

@@ -149,7 +149,7 @@ csharp_preferred_modifier_order = public,private,protected,internal,static,exter
 # Code-block preferences
 csharp_prefer_braces = true:silent
 csharp_prefer_simple_using_statement = true:suggestion
-csharp_style_namespace_declarations = file_scoped:error
+csharp_style_namespace_declarations = block_scoped:silent
 
 # Expression-level preferences
 csharp_prefer_simple_default_expression = true:suggestion
@@ -288,5 +288,3 @@ csharp_style_prefer_utf8_string_literals = true:suggestion
 csharp_style_prefer_readonly_struct = true:suggestion
 csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
 csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
-csharp_style_prefer_primary_constructors = true:silent
-csharp_prefer_system_threading_lock = true:suggestion

Directory.Build.Props

@@ -1,7 +0,0 @@
-<Project>
-	<PropertyGroup>
-		<LangVersion>preview</LangVersion>
-		<IsAotCompatible>true</IsAotCompatible>
-		<Configurations>Debug;Release</Configurations>
-	</PropertyGroup>
-</Project>

Directory.Packages.props

@@ -1,67 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageVersion Include="ColorHashSharp" Version="1.0.0" />
-    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
-    <PackageVersion Include="CommunityToolkit.Labs.Uwp.DependencyPropertyGenerator" Version="0.1.250206-build.2040" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Animations" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Segmented" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.250129-preview2" />
-    <PackageVersion Include="EmailValidation" Version="1.3.0" />
-    <PackageVersion Include="gravatar-dotnet" Version="0.1.3" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.12.0" />
-    <PackageVersion Include="Ical.Net" Version="4.3.1" />
-    <PackageVersion Include="IsExternalInit" Version="1.0.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Graph" Version="5.75.0" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.70.1" />
-    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.70.1" />
-    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.70.1" />
-    <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
-    <PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
-    <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
-    <PackageVersion Include="MimeKit" Version="4.11.0" />
-    <PackageVersion Include="morelinq" Version="4.4.0" />
-    <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageVersion Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
-    <PackageVersion Include="NodaTime" Version="3.2.2" />
-    <PackageVersion Include="Serilog" Version="4.2.0" />
-    <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
-    <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
-    <PackageVersion Include="SkiaSharp" Version="3.116.1" />
-    <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="SqlKata" Version="4.0.1" />
-    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.4" />
-    <PackageVersion Include="Win2D.uwp" Version="1.28.2" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
-    <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
-    <PackageVersion Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
-    <PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
-    <PackageVersion Include="HtmlKit" Version="1.2.0" />
-    <PackageVersion Include="MailKit" Version="4.11.0" />
-    <PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.6" />
-    <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.4" />
-  </ItemGroup>
-</Project>

Wino.Authentication/BaseAuthenticator.cs

@@ -1,8 +1,8 @@
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Authentication;
-
+namespace Wino.Authentication
+{
     public abstract class BaseAuthenticator
     {
         public abstract MailProviderType ProviderType { get; }
@@ -14,3 +14,4 @@ public abstract class BaseAuthenticator
             AuthenticatorConfig = authenticatorConfig;
         }
     }
+}

Wino.Authentication/GmailAuthenticator.cs

@@ -7,8 +7,8 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Authentication;
 
-namespace Wino.Authentication;
-
+namespace Wino.Authentication
+{
     public class GmailAuthenticator : BaseAuthenticator, IGmailAuthenticator
     {
         public GmailAuthenticator(IAuthenticatorConfig authConfig) : base(authConfig)
@@ -48,3 +48,4 @@ public class GmailAuthenticator : BaseAuthenticator, IGmailAuthenticator
             }, AuthenticatorConfig.GmailScope, account.Id.ToString(), CancellationToken.None, new FileDataStore(AuthenticatorConfig.GmailTokenStoreIdentifier));
         }
     }
+}

Wino.Authentication/OutlookAuthenticator.cs

@@ -11,8 +11,8 @@ using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Authentication;
 
-namespace Wino.Authentication;
-
+namespace Wino.Authentication
+{
     public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
     {
         private const string TokenCacheFileName = "OutlookCache.bin";
@@ -67,8 +67,7 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
         {
             await EnsureTokenCacheAttachedAsync();
 
-        var storedAccount = (await _publicClientApplication.GetAccountsAsync()).FirstOrDefault(
-            a => string.Equals(a.Username?.Trim(), account.Address?.Trim(), StringComparison.OrdinalIgnoreCase));
+            var storedAccount = (await _publicClientApplication.GetAccountsAsync()).FirstOrDefault(a => a.Username == account.Address);
 
             if (storedAccount == null)
                 return await GenerateTokenInformationAsync(account);
@@ -108,7 +107,7 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
 
                 if (account?.Address != null && !account.Address.Equals(authResult.Account.Username, StringComparison.OrdinalIgnoreCase))
                 {
-                throw new AuthenticationException("Authenticated address does not match with your account address. If you are signing with a Office365, it is not officially supported yet.");
+                    throw new AuthenticationException("Authenticated address does not match with your account address.");
                 }
 
                 return new TokenInformationEx(authResult.AccessToken, authResult.Account.Username);
@@ -124,3 +123,4 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
             throw new AuthenticationException(Translator.Exception_UnknowErrorDuringAuthentication, new Exception(Translator.Exception_TokenGenerationFailed));
         }
     }
+}

Wino.Authentication/Wino.Authentication.csproj

@@ -1,20 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<RootNamespace>Wino.Authentication</RootNamespace>
-		<Platforms>x86;x64;arm64</Platforms>
+		<Configurations>Debug;Release</Configurations>
+		<LangVersion>12</LangVersion>
+		<Platforms>AnyCPU;x64;x86</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
 	</PropertyGroup>
+
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Diagnostics" />
-		<PackageReference Include="CommunityToolkit.Mvvm"  />
-		<PackageReference Include="Google.Apis.Auth"  />
-		<PackageReference Include="Microsoft.Identity.Client" />
-		<PackageReference Include="Microsoft.Identity.Client.Broker"  />
-		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal"  />
+		<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.3.2" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+		<PackageReference Include="Google.Apis.Auth" Version="1.68.0" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
+		<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.66.2" />
+		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.66.2" />
 	</ItemGroup>
+
 	<ItemGroup>
 	  <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
 	  <ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />

Wino.Calendar.Packaging/Package.appxmanifest

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="58272BurakKSE.WinoCalendar"
+    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
+    Version="1.0.0.0" />
+
+  <Properties>
+    <DisplayName>Wino Calendar</DisplayName>
+    <PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="Wino Calendar"
+        Description="Wino.Calendar.Packaging"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+
+		<Extensions>
+			<!-- Registration of full trust backend application. -->
+			<uap:Extension Category="windows.appService">
+				<uap:AppService Name="WinoInteropService" />
+			</uap:Extension>
+			
+			<!-- Protocol activation: Google OAuth -->
+			<uap:Extension Category="windows.protocol">
+				<uap:Protocol Name="google.pw.oauth2">
+					<uap:DisplayName>Wino Google Authentication Protocol</uap:DisplayName>
+				</uap:Protocol>
+			</uap:Extension>
+			
+			<!-- Protocol activation: Launch UWP app from Full Trust Process  -->
+			<uap:Extension Category="windows.protocol">
+				<uap:Protocol Name="wino.calendar.launch">
+					<uap:DisplayName>Wino Calendara Launcher Protocol</uap:DisplayName>
+				</uap:Protocol>
+			</uap:Extension>
+
+			<!-- Startup Task -->
+			<uap5:Extension
+				Category="windows.startupTask"
+				Executable="Wino.Server\Wino.Server.exe"
+				EntryPoint="Windows.FullTrustApplication">
+				<uap5:StartupTask
+					  TaskId="WinoServer"
+					  Enabled="false"
+					  DisplayName="Wino Mail" />
+			</uap5:Extension>
+
+			<desktop:Extension Category="windows.fullTrustProcess" Executable="Wino.Server\Wino.Server.exe">
+				<desktop:FullTrustProcess>
+					<desktop:ParameterGroup GroupId="WinoServer" Parameters="Calendar" />
+				</desktop:FullTrustProcess>
+			</desktop:Extension>
+		</Extensions>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+	<rescap:Capability Name="confirmAppClose" />
+  </Capabilities>
+</Package>

Wino.Calendar.Packaging/Wino.Calendar.Packaging.wapproj

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|AnyCPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|AnyCPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>7485b18c-f5ab-4abe-ba7f-05b6623c67c8</ProjectGuid>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
+    <EntryPointProjectUniqueName>..\Wino.Calendar\Wino.Calendar.csproj</EntryPointProjectUniqueName>
+    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\LockScreenLogo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Images\StoreLogo.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+    <None Include="Package.StoreAssociation.xml" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Wino.Calendar\Wino.Calendar.csproj" />
+    <ProjectReference Include="..\Wino.Server\Wino.Server.csproj" />
+  </ItemGroup>
+</Project>

Wino.Calendar.ViewModels/AccountDetailsPageViewModel.cs

@@ -1,16 +1,14 @@
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Input;
 using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.ViewModels;
 using Wino.Mail.ViewModels.Data;
-using Wino.Messaging.Client.Navigation;
-
-namespace Wino.Calendar.ViewModels;
+using Wino.Messaging.UI;
 
+namespace Wino.Calendar.ViewModels
+{
     public partial class AccountDetailsPageViewModel : CalendarBaseViewModel
     {
         private readonly IAccountService _accountService;
@@ -27,11 +25,24 @@ public partial class AccountDetailsPageViewModel : CalendarBaseViewModel
         }
 
         [RelayCommand]
-    private void EditAccountDetails()
-            => Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsEditAccountDetails_Title, WinoPage.EditAccountDetailsPage, Account));
+        private async Task RenameAccount()
+        {
+            if (Account == null)
+                return;
+
+            var updatedAccount = await CalendarDialogService.ShowEditAccountDialogAsync(Account.Account);
+
+            if (updatedAccount != null)
+            {
+                await _accountService.UpdateAccountAsync(updatedAccount);
+
+                ReportUIChange(new AccountUpdatedMessage(updatedAccount));
+            }
+        }
 
         public override void OnNavigatedTo(NavigationMode mode, object parameters)
         {
             base.OnNavigatedTo(mode, parameters);
         }
     }
+}

Wino.Calendar.ViewModels/AccountManagementViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
@@ -14,8 +13,8 @@ using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Server;
 
-namespace Wino.Calendar.ViewModels;
-
+namespace Wino.Calendar.ViewModels
+{
     public partial class AccountManagementViewModel : AccountManagementPageViewModelBase
     {
         private readonly IProviderService _providerService;
@@ -84,8 +83,8 @@ public partial class AccountManagementViewModel : AccountManagementPageViewModel
             var accountCreationCancellationTokenSource = new CancellationTokenSource();
             var accountCreationDialog = CalendarDialogService.GetAccountCreationDialog(accountCreationDialogResult);
 
-        await accountCreationDialog.ShowDialogAsync(accountCreationCancellationTokenSource);
-        await Task.Delay(500);
+            accountCreationDialog.ShowDialog(accountCreationCancellationTokenSource);
+            accountCreationDialog.State = AccountCreationDialogState.SigningIn;
 
             // For OAuth authentications, we just generate token and assign it to the MailAccount.
 
@@ -142,16 +141,7 @@ public partial class AccountManagementViewModel : AccountManagementPageViewModel
                 Type = CalendarSynchronizationType.CalendarMetadata
             };
 
-        var timer = new Stopwatch();
-
             var synchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<CalendarSynchronizationResult, NewCalendarSynchronizationRequested>(new NewCalendarSynchronizationRequested(synchronizationOptions, SynchronizationSource.Client));
-
-        timer.Stop();
-
-        Debug.WriteLine("Synchronization completed in {timer.ElapsedMilliseconds} ms");
-
-        // TODO: Properly handle synchronization errors.
-
-        accountCreationDialog.Complete(false);
+        }
     }
 }

Wino.Calendar.ViewModels/AppShellViewModel.cs

@@ -21,8 +21,8 @@ using Wino.Messaging.Client.Calendar;
 using Wino.Messaging.Client.Navigation;
 using Wino.Messaging.Server;
 
-namespace Wino.Calendar.ViewModels;
-
+namespace Wino.Calendar.ViewModels
+{
     public partial class AppShellViewModel : CalendarBaseViewModel,
         IRecipient<VisibleDateRangeChangedMessage>,
         IRecipient<CalendarEnableStatusChangedMessage>,
@@ -364,3 +364,4 @@ public partial class AppShellViewModel : CalendarBaseViewModel,
             });
         }
     }
+}

Wino.Calendar.ViewModels/CalendarPageViewModel.cs

@@ -23,8 +23,8 @@ using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
 
-namespace Wino.Calendar.ViewModels;
-
+namespace Wino.Calendar.ViewModels
+{
     public partial class CalendarPageViewModel : CalendarBaseViewModel,
         IRecipient<LoadCalendarMessage>,
         IRecipient<CalendarItemDeleted>,
@@ -127,7 +127,6 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
         private readonly ICalendarService _calendarService;
         private readonly INavigationService _navigationService;
         private readonly IKeyPressService _keyPressService;
-    private readonly ICalendarServiceEx _calendarServiceEx;
         private readonly IPreferencesService _preferencesService;
 
         // Store latest rendered options.
@@ -147,7 +146,6 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
                                      ICalendarService calendarService,
                                      INavigationService navigationService,
                                      IKeyPressService keyPressService,
-                                 ICalendarServiceEx calendarServiceEx,
                                      IAccountCalendarStateService accountCalendarStateService,
                                      IPreferencesService preferencesService)
         {
@@ -157,7 +155,6 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
             _calendarService = calendarService;
             _navigationService = navigationService;
             _keyPressService = keyPressService;
-        _calendarServiceEx = calendarServiceEx;
             _preferencesService = preferencesService;
 
             AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
@@ -238,6 +235,23 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
         [RelayCommand(AllowConcurrentExecutions = false, CanExecute = nameof(CanSaveQuickEvent))]
         private async Task SaveQuickEventAsync()
         {
+            var durationSeconds = (QuickEventEndTime - QuickEventStartTime).TotalSeconds;
+
+            var testCalendarItem = new CalendarItem
+            {
+                CalendarId = SelectedQuickEventAccountCalendar.Id,
+                StartDate = QuickEventStartTime,
+                DurationInSeconds = durationSeconds,
+                CreatedAt = DateTime.UtcNow,
+                Description = string.Empty,
+                Location = Location,
+                Title = EventName,
+                Id = Guid.NewGuid()
+            };
+
+            IsQuickEventDialogOpen = false;
+            await _calendarService.CreateNewCalendarItemAsync(testCalendarItem, null);
+
             // TODO: Create the request with the synchronizer.
         }
 
@@ -621,13 +635,10 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
                 // Check all the events for the given date range and calendar.
                 // Then find the day representation for all the events returned, and add to the collection.
 
-            var events = await _calendarServiceEx.GetExpandedEventsInDateRangeWithExceptionsAsync(dayRangeRenderModel.Period.Start, dayRangeRenderModel.Period.End, calendarViewModel.AccountCalendar).ConfigureAwait(false);
+                var events = await _calendarService.GetCalendarEventsAsync(calendarViewModel, dayRangeRenderModel).ConfigureAwait(false);
 
                 foreach (var @event in events)
                 {
-                // TODO: Do it in the service.
-                @event.AssignedCalendar = calendarViewModel.AccountCalendar;
-
                     // Find the days that the event falls into.
                     var allDaysForEvent = dayRangeRenderModel.CalendarDays.Where(a => a.Period.OverlapsWith(@event.Period));
 
@@ -789,12 +800,12 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
             // Recurring events must be selected as a single instance.
             // We need to find the day that the event is in, and then select the event.
 
-        if (calendarItemViewModel == null) return Enumerable.Empty<CalendarItemViewModel>();
-
-        // If the calendar item is not recurring, we can just return it.
-
-        if (calendarItemViewModel.ItemType == CalendarItemType.Timed || calendarItemViewModel.ItemType == CalendarItemType.RecurringException) return new[] { calendarItemViewModel };
-
+            if (!calendarItemViewModel.IsRecurringEvent)
+            {
+                return [calendarItemViewModel];
+            }
+            else
+            {
                 return DayRanges
                     .SelectMany(a => a.CalendarDays)
                     .Select(b => b.EventsCollection.GetCalendarItem(calendarItemViewModel.Id))
@@ -802,6 +813,7 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
                     .Cast<CalendarItemViewModel>()
                     .Distinct();
             }
+        }
 
         private void UnselectCalendarItem(CalendarItemViewModel calendarItemViewModel, CalendarDayModel calendarDay = null)
         {
@@ -809,8 +821,6 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
 
             var itemsToUnselect = GetCalendarItems(calendarItemViewModel, calendarDay);
 
-        if (itemsToUnselect == null) return;
-
             foreach (var item in itemsToUnselect)
             {
                 item.IsSelected = false;
@@ -823,8 +833,6 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
 
             var itemsToSelect = GetCalendarItems(calendarItemViewModel, calendarDay);
 
-        if (itemsToSelect == null) return;
-
             foreach (var item in itemsToSelect)
             {
                 item.IsSelected = true;
@@ -860,3 +868,4 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
             });
         }
     }
+}

Wino.Calendar.ViewModels/CalendarSettingsPageViewModel.cs

@@ -8,8 +8,8 @@ using Wino.Core.Domain.Translations;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
 
-namespace Wino.Calendar.ViewModels;
-
+namespace Wino.Calendar.ViewModels
+{
     public partial class CalendarSettingsPageViewModel : CalendarBaseViewModel
     {
         [ObservableProperty]
@@ -124,3 +124,4 @@ public partial class CalendarSettingsPageViewModel : CalendarBaseViewModel
             Messenger.Send(new CalendarSettingsUpdatedMessage());
         }
     }
+}

Wino.Calendar.ViewModels/CalendarViewModelContainerSetup.cs

@@ -1,8 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Wino.Core;
 
-namespace Wino.Calendar.ViewModels;
-
+namespace Wino.Calendar.ViewModels
+{
     public static class CalendarViewModelContainerSetup
     {
         public static void RegisterCalendarViewModelServices(this IServiceCollection services)
@@ -10,3 +10,4 @@ public static class CalendarViewModelContainerSetup
             services.RegisterCoreServices();
         }
     }
+}

Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs

@@ -4,8 +4,8 @@ using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Calendar.ViewModels.Data;
-
+namespace Wino.Calendar.ViewModels.Data
+{
     public partial class AccountCalendarViewModel : ObservableObject, IAccountCalendar
     {
         public MailAccount Account { get; }
@@ -67,3 +67,4 @@ public partial class AccountCalendarViewModel : ObservableObject, IAccountCalend
         }
         public Guid Id { get => ((IAccountCalendar)AccountCalendar).Id; set => ((IAccountCalendar)AccountCalendar).Id = value; }
     }
+}

Wino.Calendar.ViewModels/Data/CalendarItemViewModel.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Itenso.TimePeriod;
 using Wino.Core.Domain.Entities.Calendar;
-using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Calendar.ViewModels.Data;
-
+namespace Wino.Calendar.ViewModels.Data
+{
     public partial class CalendarItemViewModel : ObservableObject, ICalendarItem, ICalendarItemViewModel
     {
         public CalendarItem CalendarItem { get; }
@@ -19,74 +17,30 @@ public partial class CalendarItemViewModel : ObservableObject, ICalendarItem, IC
 
         public IAccountCalendar AssignedCalendar => CalendarItem.AssignedCalendar;
 
-    public DateTime StartDateTime { get => CalendarItem.StartDateTime; set => CalendarItem.StartDateTime = value; }
+        public DateTime StartDate { get => CalendarItem.StartDate; set => CalendarItem.StartDate = value; }
 
-    public DateTime EndDateTime => CalendarItem.EndDateTime;
+        public DateTime EndDate => CalendarItem.EndDate;
 
-    /// <summary>
-    /// Gets the start date and time in the local time zone for display purposes.
-    /// </summary>
-    public DateTime LocalStartDateTime => ConvertToLocalTime();
-
-    /// <summary>
-    /// Gets the end date and time in the local time zone for display purposes.
-    /// </summary>
-    public DateTime LocalEndDateTime => ConvertToLocalTime();
+        public double DurationInSeconds { get => CalendarItem.DurationInSeconds; set => CalendarItem.DurationInSeconds = value; }
 
         public ITimePeriod Period => CalendarItem.Period;
 
-    public bool IsRecurringEvent => !string.IsNullOrEmpty(CalendarItem.RecurrenceRules) || !string.IsNullOrEmpty(CalendarItem.RecurringEventId);
+        public bool IsAllDayEvent => CalendarItem.IsAllDayEvent;
+        public bool IsMultiDayEvent => CalendarItem.IsMultiDayEvent;
+        public bool IsRecurringEvent => CalendarItem.IsRecurringEvent;
+        public bool IsRecurringChild => CalendarItem.IsRecurringChild;
+        public bool IsRecurringParent => CalendarItem.IsRecurringParent;
 
         [ObservableProperty]
         private bool _isSelected;
 
         public ObservableCollection<CalendarEventAttendee> Attendees { get; } = new ObservableCollection<CalendarEventAttendee>();
 
-    public CalendarItemType ItemType => CalendarItem.ItemType;
-
         public CalendarItemViewModel(CalendarItem calendarItem)
         {
             CalendarItem = calendarItem;
-
-        Debug.WriteLine($"{Title} : {ItemType}");
-    }
-
-    /// <summary>
-    /// Converts a DateTime to local time based on the provided timezone.
-    /// If timezone is empty or null, assumes the DateTime is in UTC.
-    /// </summary>
-    /// <param name="dateTime">The DateTime to convert</param>
-    /// <param name="timeZone">The timezone string. If empty/null, assumes UTC.</param>
-    /// <returns>DateTime converted to local time</returns>
-    private DateTime ConvertToLocalTime()
-    {
-        // All day events ignore time zones and are treated as local time.
-        if (ItemType == CalendarItemType.AllDay || ItemType == CalendarItemType.MultiDayAllDay || ItemType == CalendarItemType.RecurringAllDay)
-            return CalendarItem.StartDateTime;
-
-        if (string.IsNullOrEmpty(CalendarItem.TimeZone))
-        {
-            // If no timezone specified, assume it's UTC and convert to local time
-            return DateTime.SpecifyKind(CalendarItem.StartDateTime, DateTimeKind.Utc).ToLocalTime();
-        }
-
-        try
-        {
-            // Parse the timezone and convert to local time
-            var sourceTimeZone = TimeZoneInfo.FindSystemTimeZoneById(CalendarItem.TimeZone);
-            return TimeZoneInfo.ConvertTimeToUtc(CalendarItem.StartDateTime, sourceTimeZone).ToLocalTime();
-        }
-        catch (TimeZoneNotFoundException)
-        {
-            // If timezone is not found, fallback to treating as UTC
-            return DateTime.SpecifyKind(CalendarItem.StartDateTime, DateTimeKind.Utc).ToLocalTime();
-        }
-        catch (InvalidTimeZoneException)
-        {
-            // If timezone is invalid, fallback to treating as UTC
-            return DateTime.SpecifyKind(CalendarItem.StartDateTime, DateTimeKind.Utc).ToLocalTime();
-        }
         }
 
         public override string ToString() => CalendarItem.Title;
     }
+}

Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs

@@ -6,8 +6,8 @@ using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Entities.Shared;
 
-namespace Wino.Calendar.ViewModels.Data;
-
+namespace Wino.Calendar.ViewModels.Data
+{
     public partial class GroupedAccountCalendarViewModel : ObservableObject
     {
         public event EventHandler CollectiveSelectionStateChanged;
@@ -143,3 +143,4 @@ public partial class GroupedAccountCalendarViewModel : ObservableObject
             CalendarSelectionStateChanged?.Invoke(this, accountCalendarViewModel);
         }
     }
+}

Wino.Calendar.ViewModels/EventDetailsPageViewModel.cs

@@ -12,8 +12,8 @@ using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
 
-namespace Wino.Calendar.ViewModels;
-
+namespace Wino.Calendar.ViewModels
+{
     public partial class EventDetailsPageViewModel : CalendarBaseViewModel
     {
         private readonly ICalendarService _calendarService;
@@ -31,7 +31,7 @@ public partial class EventDetailsPageViewModel : CalendarBaseViewModel
         [ObservableProperty]
         private CalendarItemViewModel _seriesParent;
 
-    public bool CanViewSeries => false; //CurrentEvent?.IsRecurringChild ?? false; // TODO: Implement this properly
+        public bool CanViewSeries => CurrentEvent?.IsRecurringChild ?? false;
 
         #endregion
 
@@ -67,7 +67,7 @@ public partial class EventDetailsPageViewModel : CalendarBaseViewModel
 
                 CurrentEvent = new CalendarItemViewModel(currentEventItem);
 
-            var attendees = await _calendarService.GetAttendeesAsync(currentEventItem.Id);
+                var attendees = await _calendarService.GetAttendeesAsync(currentEventItem.EventTrackingId);
 
                 foreach (var item in attendees)
                 {
@@ -113,3 +113,4 @@ public partial class EventDetailsPageViewModel : CalendarBaseViewModel
             if (CurrentEvent == null) return;
         }
     }
+}

Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs

@@ -6,8 +6,8 @@ using System.Linq;
 using Wino.Calendar.ViewModels.Data;
 using Wino.Core.Domain.Entities.Shared;
 
-namespace Wino.Calendar.ViewModels.Interfaces;
-
+namespace Wino.Calendar.ViewModels.Interfaces
+{
     public interface IAccountCalendarStateService : INotifyPropertyChanged
     {
         ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; }
@@ -28,3 +28,4 @@ public interface IAccountCalendarStateService : INotifyPropertyChanged
         IEnumerable<AccountCalendarViewModel> ActiveCalendars { get; }
         IEnumerable<IGrouping<MailAccount, AccountCalendarViewModel>> GroupedAccountCalendarsEnumerable { get; }
     }
+}

Wino.Calendar.ViewModels/Messages/CalendarItemDoubleTappedMessage.cs

@@ -1,7 +1,7 @@
 using Wino.Calendar.ViewModels.Data;
 
-namespace Wino.Calendar.ViewModels.Messages;
-
+namespace Wino.Calendar.ViewModels.Messages
+{
     public class CalendarItemDoubleTappedMessage
     {
         public CalendarItemDoubleTappedMessage(CalendarItemViewModel calendarItemViewModel)
@@ -11,3 +11,4 @@ public class CalendarItemDoubleTappedMessage
 
         public CalendarItemViewModel CalendarItemViewModel { get; }
     }
+}

Wino.Calendar.ViewModels/Messages/CalendarItemRightTappedMessage.cs

@@ -1,7 +1,7 @@
 using Wino.Calendar.ViewModels.Data;
 
-namespace Wino.Calendar.ViewModels.Messages;
-
+namespace Wino.Calendar.ViewModels.Messages
+{
     public class CalendarItemRightTappedMessage
     {
         public CalendarItemRightTappedMessage(CalendarItemViewModel calendarItemViewModel)
@@ -11,3 +11,4 @@ public class CalendarItemRightTappedMessage
 
         public CalendarItemViewModel CalendarItemViewModel { get; }
     }
+}

Wino.Calendar.ViewModels/Messages/CalendarItemTappedMessage.cs

@@ -1,8 +1,8 @@
 using Wino.Calendar.ViewModels.Data;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Calendar.ViewModels.Messages;
-
+namespace Wino.Calendar.ViewModels.Messages
+{
     public class CalendarItemTappedMessage
     {
         public CalendarItemTappedMessage(CalendarItemViewModel calendarItemViewModel, CalendarDayModel clickedPeriod)
@@ -14,3 +14,4 @@ public class CalendarItemTappedMessage
         public CalendarItemViewModel CalendarItemViewModel { get; }
         public CalendarDayModel ClickedPeriod { get; }
     }
+}

Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj

@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<Platforms>x86;x64;arm64</Platforms>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<LangVersion>12</LangVersion>
+		<Platforms>AnyCPU;x64;x86</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
 	</PropertyGroup>
+
 	<ItemGroup>
-	  <PackageReference Include="TimePeriodLibrary.NET" />
+	  <PackageReference Include="TimePeriodLibrary.NET" Version="2.1.5" />
 	</ItemGroup>
 
 	<ItemGroup>

Wino.Calendar.sln

@@ -0,0 +1,308 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35424.110
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Core.Domain", "Wino.Core.Domain\Wino.Core.Domain.csproj", "{814400B6-5A05-4596-B451-3A116A147DC1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Core.UWP", "Wino.Core.UWP\Wino.Core.UWP.csproj", "{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Core.ViewModels", "Wino.Core.ViewModels\Wino.Core.ViewModels.csproj", "{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Messaging", "Wino.Messages\Wino.Messaging.csproj", "{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Server", "Wino.Server\Wino.Server.csproj", "{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Core", "Wino.Core\Wino.Core.csproj", "{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Calendar", "Wino.Calendar\Wino.Calendar.csproj", "{600F4979-DB7E-409D-B7DA-B60BE4C55C35}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.SourceGenerators", "Wino.SourceGenerators\Wino.SourceGenerators.csproj", "{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Wino.Calendar.Packaging", "Wino.Calendar.Packaging\Wino.Calendar.Packaging.wapproj", "{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Calendar.ViewModels", "Wino.Calendar.ViewModels\Wino.Calendar.ViewModels.csproj", "{CF850F8C-5042-4376-9CBA-C8F2BB554083}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Services", "Wino.Services\Wino.Services.csproj", "{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Authentication", "Wino.Authentication\Wino.Authentication.csproj", "{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x64.ActiveCfg = Debug|x64
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x64.Build.0 = Debug|x64
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x86.ActiveCfg = Debug|x86
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x86.Build.0 = Debug|x86
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM.Build.0 = Release|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM64.Build.0 = Release|Any CPU
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x64.ActiveCfg = Release|x64
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x64.Build.0 = Release|x64
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x86.ActiveCfg = Release|x86
+		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x86.Build.0 = Release|x86
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM.Build.0 = Debug|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM64.Build.0 = Debug|ARM64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x64.ActiveCfg = Debug|x64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x64.Build.0 = Debug|x64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x86.ActiveCfg = Debug|x86
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x86.Build.0 = Debug|x86
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM.ActiveCfg = Release|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM.Build.0 = Release|Any CPU
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM64.Build.0 = Release|ARM64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x64.ActiveCfg = Release|x64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x64.Build.0 = Release|x64
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x86.ActiveCfg = Release|x86
+		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x86.Build.0 = Release|x86
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM.Build.0 = Debug|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x64.ActiveCfg = Debug|x64
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x64.Build.0 = Debug|x64
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x86.ActiveCfg = Debug|x86
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x86.Build.0 = Debug|x86
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM.Build.0 = Release|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM64.Build.0 = Release|Any CPU
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x64.ActiveCfg = Release|x64
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x64.Build.0 = Release|x64
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x86.ActiveCfg = Release|x86
+		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x86.Build.0 = Release|x86
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x64.ActiveCfg = Debug|x64
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x64.Build.0 = Debug|x64
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x86.ActiveCfg = Debug|x86
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x86.Build.0 = Debug|x86
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM.Build.0 = Release|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM64.Build.0 = Release|Any CPU
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x64.ActiveCfg = Release|x64
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x64.Build.0 = Release|x64
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x86.ActiveCfg = Release|x86
+		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x86.Build.0 = Release|x86
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|Any CPU.Build.0 = Debug|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM.ActiveCfg = Debug|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM.Build.0 = Debug|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM64.Build.0 = Debug|ARM64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x64.ActiveCfg = Debug|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x64.Build.0 = Debug|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x86.ActiveCfg = Debug|x86
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x86.Build.0 = Debug|x86
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|Any CPU.ActiveCfg = Release|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|Any CPU.Build.0 = Release|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM.ActiveCfg = Release|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM.Build.0 = Release|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM64.Build.0 = Release|ARM64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x64.ActiveCfg = Release|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x64.Build.0 = Release|x64
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x86.ActiveCfg = Release|x86
+		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x86.Build.0 = Release|x86
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x64.ActiveCfg = Debug|x64
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x64.Build.0 = Debug|x64
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x86.ActiveCfg = Debug|x86
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x86.Build.0 = Debug|x86
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM.Build.0 = Release|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM64.Build.0 = Release|Any CPU
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x64.ActiveCfg = Release|x64
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x64.Build.0 = Release|x64
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x86.ActiveCfg = Release|x86
+		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x86.Build.0 = Release|x86
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|Any CPU.Build.0 = Debug|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM.ActiveCfg = Debug|ARM
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM.Build.0 = Debug|ARM
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM.Deploy.0 = Debug|ARM
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM64.Build.0 = Debug|ARM64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x64.ActiveCfg = Debug|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x64.Build.0 = Debug|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x64.Deploy.0 = Debug|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x86.ActiveCfg = Debug|x86
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x86.Build.0 = Debug|x86
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x86.Deploy.0 = Debug|x86
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|Any CPU.ActiveCfg = Release|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|Any CPU.Build.0 = Release|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|Any CPU.Deploy.0 = Release|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM.ActiveCfg = Release|ARM
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM.Build.0 = Release|ARM
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM.Deploy.0 = Release|ARM
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM64.ActiveCfg = Release|ARM64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM64.Build.0 = Release|ARM64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM64.Deploy.0 = Release|ARM64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x64.ActiveCfg = Release|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x64.Build.0 = Release|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x64.Deploy.0 = Release|x64
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x86.ActiveCfg = Release|x86
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x86.Build.0 = Release|x86
+		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x86.Deploy.0 = Release|x86
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM.Build.0 = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM64.Build.0 = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x64.ActiveCfg = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x64.Build.0 = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x86.ActiveCfg = Release|Any CPU
+		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x86.Build.0 = Release|Any CPU
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM.ActiveCfg = Debug|ARM
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM.Build.0 = Debug|ARM
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM.Deploy.0 = Debug|ARM
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x64.ActiveCfg = Debug|x64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x64.Build.0 = Debug|x64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x64.Deploy.0 = Debug|x64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x86.ActiveCfg = Debug|x86
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x86.Build.0 = Debug|x86
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x86.Deploy.0 = Debug|x86
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM.ActiveCfg = Release|ARM
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM.Build.0 = Release|ARM
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM.Deploy.0 = Release|ARM
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM64.Build.0 = Release|ARM64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM64.Deploy.0 = Release|ARM64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x64.ActiveCfg = Release|x64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x64.Build.0 = Release|x64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x64.Deploy.0 = Release|x64
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x86.ActiveCfg = Release|x86
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x86.Build.0 = Release|x86
+		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x86.Deploy.0 = Release|x86
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM.Build.0 = Debug|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x64.ActiveCfg = Debug|x64
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x64.Build.0 = Debug|x64
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x86.ActiveCfg = Debug|x86
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x86.Build.0 = Debug|x86
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM.Build.0 = Release|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM64.Build.0 = Release|Any CPU
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x64.ActiveCfg = Release|x64
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x64.Build.0 = Release|x64
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x86.ActiveCfg = Release|x86
+		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x86.Build.0 = Release|x86
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x64.Build.0 = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x86.Build.0 = Debug|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM.Build.0 = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM64.Build.0 = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x64.ActiveCfg = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x64.Build.0 = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x86.ActiveCfg = Release|Any CPU
+		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x86.Build.0 = Release|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM.Build.0 = Debug|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x64.ActiveCfg = Debug|x64
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x64.Build.0 = Debug|x64
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x86.ActiveCfg = Debug|x86
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x86.Build.0 = Debug|x86
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM.ActiveCfg = Release|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM.Build.0 = Release|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM64.Build.0 = Release|Any CPU
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x64.ActiveCfg = Release|x64
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x64.Build.0 = Release|x64
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x86.ActiveCfg = Release|x86
+		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Wino.Calendar/Activation/DefaultActivationHandler.cs

@@ -6,8 +6,8 @@ using Windows.UI.Xaml.Media.Animation;
 using Wino.Activation;
 using Wino.Calendar.Views;
 
-namespace Wino.Calendar.Activation;
-
+namespace Wino.Calendar.Activation
+{
     public class DefaultActivationHandler : ActivationHandler<IActivatedEventArgs>
     {
         protected override Task HandleInternalAsync(IActivatedEventArgs args)
@@ -21,3 +21,4 @@ public class DefaultActivationHandler : ActivationHandler<IActivatedEventArgs>
         protected override bool CanHandleInternal(IActivatedEventArgs args)
             => (Window.Current?.Content as Frame)?.Content == null;
     }
+}

Wino.Calendar/App.xaml.cs

@@ -24,16 +24,20 @@ using Wino.Messaging.Client.Connection;
 using Wino.Messaging.Server;
 using Wino.Services;
 
-namespace Wino.Calendar;
-
+namespace Wino.Calendar
+{
     public sealed partial class App : WinoApplication, IRecipient<NewCalendarSynchronizationRequested>
     {
+        public override string AppCenterKey => "dfdad6ab-95f9-44cc-9112-45ec6730c49e";
+
         private BackgroundTaskDeferral connectionBackgroundTaskDeferral;
+        private BackgroundTaskDeferral toastActionBackgroundTaskDeferral;
 
         public App()
         {
             InitializeComponent();
-        WeakReferenceMessenger.Default.Register<NewCalendarSynchronizationRequested>(this);
+
+            WeakReferenceMessenger.Default.Register(this);
         }
 
         public override IServiceProvider ConfigureServices()
@@ -157,3 +161,4 @@ public sealed partial class App : WinoApplication, IRecipient<NewCalendarSynchro
             }
         }
     }
+}

Wino.Calendar/Args/TimelineCellSelectedArgs.cs

@@ -1,8 +1,8 @@
 using System;
 using Windows.Foundation;
 
-namespace Wino.Calendar.Args;
-
+namespace Wino.Calendar.Args
+{
     /// <summary>
     /// When a new timeline cell is selected.
     /// </summary>
@@ -38,3 +38,4 @@ public class TimelineCellSelectedArgs : EventArgs
         /// </summary>
         public Size CellSize { get; }
     }
+}

Wino.Calendar/Args/TimelineCellUnselectedArgs.cs

@@ -1,8 +1,9 @@
 using System;
 
-namespace Wino.Calendar.Args;
-
+namespace Wino.Calendar.Args
+{
     /// <summary>
     /// When selected timeline cell is unselected.
     /// </summary>
     public class TimelineCellUnselectedArgs : EventArgs { }
+}

Wino.Calendar/Controls/CalendarItemCommandBarFlyout.cs

@@ -2,9 +2,9 @@
 using Windows.UI.Xaml;
 using Wino.Calendar.ViewModels.Data;
 
-namespace Wino.Calendar.Controls;
-
-public partial class CalendarItemCommandBarFlyout : CommandBarFlyout
+namespace Wino.Calendar.Controls
+{
+    public class CalendarItemCommandBarFlyout : CommandBarFlyout
     {
         public static readonly DependencyProperty ItemProperty = DependencyProperty.Register(nameof(Item), typeof(CalendarItemViewModel), typeof(CalendarItemCommandBarFlyout), new PropertyMetadata(null, new PropertyChangedCallback(OnItemChanged)));
 
@@ -28,3 +28,4 @@ public partial class CalendarItemCommandBarFlyout : CommandBarFlyout
 
         }
     }
+}

Wino.Calendar/Controls/CalendarItemControl.xaml

@@ -69,7 +69,7 @@
             VerticalAlignment="Top"
             Orientation="Horizontal"
             Spacing="6">
-            <!--<controls:WinoFontIcon
+            <controls:WinoFontIcon
                 FontSize="12"
                 Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(CalendarItem.AssignedCalendar.BackgroundColorHex), Mode=OneWay}"
                 Icon="CalendarEventRepeat"
@@ -79,7 +79,7 @@
                 FontSize="12"
                 Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(CalendarItem.AssignedCalendar.BackgroundColorHex), Mode=OneWay}"
                 Icon="CalendarEventMuiltiDay"
-                Visibility="{x:Bind CalendarItem.IsMultiDayEvent, Mode=OneWay}" />-->
+                Visibility="{x:Bind CalendarItem.IsMultiDayEvent, Mode=OneWay}" />
         </StackPanel>
 
         <VisualStateManager.VisualStateGroups>

Wino.Calendar/Controls/CalendarItemControl.xaml.cs

@@ -7,11 +7,10 @@ using Windows.UI.Xaml.Input;
 using Wino.Calendar.ViewModels.Data;
 using Wino.Calendar.ViewModels.Messages;
 using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Calendar.Controls;
-
+namespace Wino.Calendar.Controls
+{
     public sealed partial class CalendarItemControl : UserControl
     {
         // Single tap has a delay to report double taps properly.
@@ -91,9 +90,7 @@ public sealed partial class CalendarItemControl : UserControl
             if (CalendarItem == null) return;
             if (DisplayingDate == null) return;
 
-        bool isMultiDayEvent = CalendarItem.CalendarItem.ItemType == CalendarItemType.MultiDay || CalendarItem.CalendarItem.ItemType == CalendarItemType.MultiDayAllDay;
-
-        if (isMultiDayEvent)
+            if (CalendarItem.IsMultiDayEvent)
             {
                 // Multi day events are divided into 3 categories:
                 // 1. All day events
@@ -106,14 +103,14 @@ public sealed partial class CalendarItemControl : UserControl
                     periodRelation == PeriodRelation.EnclosingStartTouching)
                 {
                     // hour -> title
-                CalendarItemTitle = $"{DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.StartDateTime.TimeOfDay)} -> {CalendarItem.Title}";
+                    CalendarItemTitle = $"{DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.StartDate.TimeOfDay)} -> {CalendarItem.Title}";
                 }
                 else if (
                     periodRelation == PeriodRelation.EndInside ||
                     periodRelation == PeriodRelation.EnclosingEndTouching)
                 {
                     // title <- hour
-                CalendarItemTitle = $"{CalendarItem.Title} <- {DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.EndDateTime.TimeOfDay)}";
+                    CalendarItemTitle = $"{CalendarItem.Title} <- {DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.EndDate.TimeOfDay)}";
                 }
                 else if (periodRelation == PeriodRelation.Enclosing)
                 {
@@ -142,11 +139,11 @@ public sealed partial class CalendarItemControl : UserControl
         {
             if (CalendarItem == null) return;
 
-        if (CalendarItem.CalendarItem.ItemType == CalendarItemType.AllDay)
+            if (CalendarItem.IsAllDayEvent)
             {
                 VisualStateManager.GoToState(this, "AllDayEvent", true);
             }
-        else if (CalendarItem.CalendarItem.ItemType == CalendarItemType.MultiDayAllDay || CalendarItem.CalendarItem.ItemType == CalendarItemType.MultiDay)
+            else if (CalendarItem.IsMultiDayEvent)
             {
                 if (IsCustomEventArea)
                 {
@@ -198,3 +195,4 @@ public sealed partial class CalendarItemControl : UserControl
             WeakReferenceMessenger.Default.Send(new CalendarItemRightTappedMessage(CalendarItem));
         }
     }
+}

Wino.Calendar/Controls/CustomCalendarFlipView.cs

@@ -1,12 +1,12 @@
 using Windows.UI.Xaml.Automation.Peers;
 using Windows.UI.Xaml.Controls;
 
-namespace Wino.Calendar.Controls;
-
+namespace Wino.Calendar.Controls
+{
     /// <summary>
     /// FlipView that hides the navigation buttons and exposes methods to navigate to the next and previous items with animations.
     /// </summary>
-public partial class CustomCalendarFlipView : FlipView
+    public class CustomCalendarFlipView : FlipView
     {
         private const string PART_PreviousButton = "PreviousButtonHorizontal";
         private const string PART_NextButton = "NextButtonHorizontal";
@@ -40,3 +40,4 @@ public partial class CustomCalendarFlipView : FlipView
             nextPeer.Invoke();
         }
     }
+}

Wino.Calendar/Controls/DayColumnControl.cs

@@ -3,9 +3,9 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Calendar.Controls;
-
-public partial class DayColumnControl : Control
+namespace Wino.Calendar.Controls
+{
+    public class DayColumnControl : Control
     {
         private const string PART_HeaderDateDayText = nameof(PART_HeaderDateDayText);
         private const string PART_IsTodayBorder = nameof(PART_IsTodayBorder);
@@ -75,3 +75,4 @@ public partial class DayColumnControl : Control
             UpdateLayout();
         }
     }
+}

Wino.Calendar/Controls/DayHeaderControl.cs

@@ -3,9 +3,9 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Calendar.Controls;
-
-public partial class DayHeaderControl : Control
+namespace Wino.Calendar.Controls
+{
+    public class DayHeaderControl : Control
     {
         private const string PART_DayHeaderTextBlock = nameof(PART_DayHeaderTextBlock);
         private TextBlock HeaderTextblock;
@@ -54,3 +54,4 @@ public partial class DayHeaderControl : Control
             }
         }
     }
+}

Wino.Calendar/Controls/WinoCalendarControl.cs

@@ -10,9 +10,9 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Helpers;
 
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarControl : Control
+namespace Wino.Calendar.Controls
+{
+    public class WinoCalendarControl : Control
     {
         private const string PART_WinoFlipView = nameof(PART_WinoFlipView);
         private const string PART_IdleGrid = nameof(PART_IdleGrid);
@@ -297,3 +297,4 @@ public partial class WinoCalendarControl : Control
             return this.FindDescendants<CalendarItemControl>().FirstOrDefault(a => a.CalendarItem == calendarItemViewModel);
         }
     }
+}

Wino.Calendar/Controls/WinoCalendarFlipView.cs

@@ -8,9 +8,9 @@ using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Collections;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarFlipView : CustomCalendarFlipView
+namespace Wino.Calendar.Controls
+{
+    public class WinoCalendarFlipView : CustomCalendarFlipView
     {
         public static readonly DependencyProperty IsIdleProperty = DependencyProperty.Register(nameof(IsIdle), typeof(bool), typeof(WinoCalendarFlipView), new PropertyMetadata(true));
         public static readonly DependencyProperty ActiveCanvasProperty = DependencyProperty.Register(nameof(ActiveCanvas), typeof(WinoDayTimelineCanvas), typeof(WinoCalendarFlipView), new PropertyMetadata(null));
@@ -183,3 +183,4 @@ public partial class WinoCalendarFlipView : CustomCalendarFlipView
         private ObservableRangeCollection<DayRangeRenderModel> GetItemsSource()
             => ItemsSource as ObservableRangeCollection<DayRangeRenderModel>;
     }
+}

Wino.Calendar/Controls/WinoCalendarPanel.cs

@@ -9,12 +9,11 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Wino.Calendar.Models;
 using Wino.Calendar.ViewModels.Data;
-using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarPanel : Panel
+namespace Wino.Calendar.Controls
+{
+    public class WinoCalendarPanel : Panel
     {
         private const double LastItemRightExtraMargin = 12d;
 
@@ -45,9 +44,9 @@ public partial class WinoCalendarPanel : Panel
 
         private void ResetMeasurements() => _measurements.Clear();
 
-    private double GetChildTopMargin(ICalendarItemViewModel calendarItemViewModel, double availableHeight)
+        private double GetChildTopMargin(ICalendarItem calendarItemViewModel, double availableHeight)
         {
-        var childStart = calendarItemViewModel.LocalStartDateTime;
+            var childStart = calendarItemViewModel.StartDate;
 
             if (childStart <= Period.Start)
             {
@@ -69,10 +68,10 @@ public partial class WinoCalendarPanel : Panel
         private double GetChildLeftMargin(CalendarItemMeasurement calendarItemMeasurement, double availableWidth)
             => availableWidth * calendarItemMeasurement.Left;
 
-    private double GetChildHeight(ICalendarItemViewModel child)
+        private double GetChildHeight(ICalendarItem child)
         {
             // All day events are not measured.
-        if (child.ItemType == CalendarItemType.AllDay) return 0;
+            if (child.IsAllDayEvent) return 0;
 
             double childDurationInMinutes = 0d;
             double availableHeight = HourHeight * 24;
@@ -81,7 +80,7 @@ public partial class WinoCalendarPanel : Panel
 
             // Debug.WriteLine($"Render relation of {child.Title} ({child.Period.Start} - {child.Period.End}) is {periodRelation} with {Period.Start.Day}");
 
-        if (child.ItemType != CalendarItemType.MultiDay || child.ItemType != CalendarItemType.MultiDayAllDay)
+            if (!child.IsMultiDayEvent)
             {
                 childDurationInMinutes = child.Period.Duration.TotalMinutes;
             }
@@ -128,7 +127,7 @@ public partial class WinoCalendarPanel : Panel
             foreach (var control in calendarControls)
             {
                 // We can't arrange this child.
-            if (!(control.Content is ICalendarItemViewModel child)) continue;
+                if (!(control.Content is ICalendarItem child)) continue;
 
                 bool isHorizontallyLastItem = false;
 
@@ -161,7 +160,7 @@ public partial class WinoCalendarPanel : Panel
                 double extraRightMargin = 0;
 
                 // Multi-day events don't have any margin and their hit test is disabled.
-            if (child.ItemType != CalendarItemType.MultiDay || child.ItemType != CalendarItemType.MultiDayAllDay)
+                if (!child.IsMultiDayEvent)
                 {
                     // Max of 5% of the width or 20px max.
                     extraRightMargin = isHorizontallyLastItem ? Math.Max(LastItemRightExtraMargin, finalSize.Width * 5 / 100) : 0;
@@ -169,10 +168,8 @@ public partial class WinoCalendarPanel : Panel
 
                 if (childWidth < 0) childWidth = 1;
 
-            bool isAllOrMultiDayEvent = child.ItemType == CalendarItemType.AllDay || child.ItemType == CalendarItemType.MultiDay || child.ItemType == CalendarItemType.MultiDayAllDay;
-
                 // Regular events must have 2px margin
-            if (!isAllOrMultiDayEvent)
+                if (!child.IsMultiDayEvent && !child.IsAllDayEvent)
                 {
                     childLeft += 2;
                     childTop += 2;
@@ -214,12 +211,10 @@ public partial class WinoCalendarPanel : Panel
             var columns = new List<List<ICalendarItem>>();
             DateTime? lastEventEnding = null;
 
-        foreach (var ev in events.OrderBy(ev => ev.StartDateTime).ThenBy(ev => ev.EndDateTime))
+            foreach (var ev in events.OrderBy(ev => ev.StartDate).ThenBy(ev => ev.EndDate))
             {
                 // Multi-day events are not measured.
-            bool isMultiDayEvent = ev.ItemType == CalendarItemType.MultiDay || ev.ItemType == CalendarItemType.MultiDayAllDay;
-
-            if (isMultiDayEvent) continue;
+                if (ev.IsMultiDayEvent) continue;
 
                 if (ev.Period.Start >= lastEventEnding)
                 {
@@ -296,3 +291,4 @@ public partial class WinoCalendarPanel : Panel
 
         #endregion
     }
+}

Wino.Calendar/Controls/WinoCalendarTypeSelectorControl.cs

@@ -4,9 +4,9 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarTypeSelectorControl : Control
+namespace Wino.Calendar.Controls
+{
+    public class WinoCalendarTypeSelectorControl : Control
     {
         private const string PART_TodayButton = nameof(PART_TodayButton);
         private const string PART_DayToggle = nameof(PART_DayToggle);
@@ -89,3 +89,4 @@ public partial class WinoCalendarTypeSelectorControl : Control
             _yearToggle.IsChecked = SelectedType == CalendarDisplayType.Year;
         }
     }
+}

Wino.Calendar/Controls/WinoCalendarView.cs

@@ -8,9 +8,9 @@ using Windows.UI.Xaml.Media;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Helpers;
 
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarView : Control
+namespace Wino.Calendar.Controls
+{
+    public class WinoCalendarView : Control
     {
         private const string PART_DayViewItemBorder = nameof(PART_DayViewItemBorder);
         private const string PART_CalendarView = nameof(PART_CalendarView);
@@ -145,3 +145,4 @@ public partial class WinoCalendarView : Control
             }
         }
     }
+}

Wino.Calendar/Controls/WinoDayTimelineCanvas.cs

@@ -10,9 +10,9 @@ using Windows.UI.Xaml.Media;
 using Wino.Calendar.Args;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Calendar.Controls;
-
-public partial class WinoDayTimelineCanvas : Control, IDisposable
+namespace Wino.Calendar.Controls
+{
+    public class WinoDayTimelineCanvas : Control, IDisposable
     {
         public event EventHandler<TimelineCellSelectedArgs> TimelineCellSelected;
         public event EventHandler<TimelineCellUnselectedArgs> TimelineCellUnselected;
@@ -275,3 +275,4 @@ public partial class WinoDayTimelineCanvas : Control, IDisposable
             Canvas = null;
         }
     }
+}

Wino.Calendar/Helpers/CalendarXamlHelpers.cs

@@ -10,8 +10,8 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Helpers;
 
-namespace Wino.Calendar.Helpers;
-
+namespace Wino.Calendar.Helpers
+{
     public static class CalendarXamlHelpers
     {
         public static CalendarItemViewModel GetFirstAllDayEvent(CalendarEventCollection collection)
@@ -22,7 +22,6 @@ public static class CalendarXamlHelpers
         /// </summary>
         public static string GetEventDetailsDateString(CalendarItemViewModel calendarItemViewModel, CalendarSettings settings)
         {
-        // TODO: This is not correct.
             if (calendarItemViewModel == null || settings == null) return string.Empty;
 
             var start = calendarItemViewModel.Period.Start;
@@ -31,7 +30,7 @@ public static class CalendarXamlHelpers
             string timeFormat = settings.DayHeaderDisplayType == DayHeaderDisplayType.TwelveHour ? "h:mm tt" : "HH:mm";
             string dateFormat = settings.DayHeaderDisplayType == DayHeaderDisplayType.TwelveHour ? "dddd, dd MMMM h:mm tt" : "dddd, dd MMMM HH:mm";
 
-        if (calendarItemViewModel.CalendarItem.ItemType == CalendarItemType.MultiDay || calendarItemViewModel.CalendarItem.ItemType == CalendarItemType.MultiDayAllDay)
+            if (calendarItemViewModel.IsMultiDayEvent)
             {
                 return $"{start.ToString($"dd MMMM ddd {timeFormat}", settings.CultureInfo)} - {end.ToString($"dd MMMM ddd {timeFormat}", settings.CultureInfo)}";
             }
@@ -43,14 +42,54 @@ public static class CalendarXamlHelpers
 
         public static string GetRecurrenceString(CalendarItemViewModel calendarItemViewModel)
         {
-        // TODO
-        return string.Empty;
+            if (calendarItemViewModel == null || !calendarItemViewModel.IsRecurringChild) return string.Empty;
+
+            // Parse recurrence rules
+            var calendarEvent = new CalendarEvent
+            {
+                Start = new CalDateTime(calendarItemViewModel.StartDate),
+                End = new CalDateTime(calendarItemViewModel.EndDate),
+            };
+
+            var recurrenceLines = Regex.Split(calendarItemViewModel.CalendarItem.Recurrence, Constants.CalendarEventRecurrenceRuleSeperator);
+
+            foreach (var line in recurrenceLines)
+            {
+                calendarEvent.RecurrenceRules.Add(new RecurrencePattern(line));
+            }
+
+            if (calendarEvent.RecurrenceRules == null || !calendarEvent.RecurrenceRules.Any())
+            {
+                return "No recurrence pattern.";
+            }
+
+            var recurrenceRule = calendarEvent.RecurrenceRules.First();
+            var daysOfWeek = string.Join(", ", recurrenceRule.ByDay.Select(day => day.DayOfWeek.ToString()));
+            string timeZone = calendarEvent.DtStart.TzId ?? "UTC";
+
+            return $"Every {daysOfWeek}, effective {calendarEvent.DtStart.Value.ToShortDateString()} " +
+                   $"from {calendarEvent.DtStart.Value.ToShortTimeString()} to {calendarEvent.DtEnd.Value.ToShortTimeString()} " +
+                   $"{timeZone}.";
         }
 
         public static string GetDetailsPopupDurationString(CalendarItemViewModel calendarItemViewModel, CalendarSettings settings)
         {
-        // TODO
-        return string.Empty;
+            if (calendarItemViewModel == null || settings == null) return string.Empty;
+
+            // Single event in a day.
+            if (!calendarItemViewModel.IsAllDayEvent && !calendarItemViewModel.IsMultiDayEvent)
+            {
+                return $"{calendarItemViewModel.Period.Start.ToString("d", settings.CultureInfo)} {settings.GetTimeString(calendarItemViewModel.Period.Duration)}";
+            }
+            else if (calendarItemViewModel.IsMultiDayEvent)
+            {
+                return $"{calendarItemViewModel.Period.Start.ToString("d", settings.CultureInfo)} - {calendarItemViewModel.Period.End.ToString("d", settings.CultureInfo)}";
+            }
+            else
+            {
+                // All day event.
+                return $"{calendarItemViewModel.Period.Start.ToString("d", settings.CultureInfo)} ({Translator.CalendarItemAllDay})";
+            }
         }
 
         public static PopupPlacementMode GetDesiredPlacementModeForEventsDetailsPopup(
@@ -59,13 +98,10 @@ public static class CalendarXamlHelpers
         {
             if (calendarItemViewModel == null) return PopupPlacementMode.Auto;
 
-        bool isAllDayOrMultiDay = calendarItemViewModel.CalendarItem.ItemType == CalendarItemType.MultiDay ||
-            calendarItemViewModel.CalendarItem.ItemType == CalendarItemType.AllDay ||
-            calendarItemViewModel.CalendarItem.ItemType == CalendarItemType.MultiDayAllDay;
-
             // All and/or multi day events always go to the top of the screen.
-        if (isAllDayOrMultiDay) return PopupPlacementMode.Bottom;
+            if (calendarItemViewModel.IsAllDayEvent || calendarItemViewModel.IsMultiDayEvent) return PopupPlacementMode.Bottom;
 
             return XamlHelpers.GetPlaccementModeForCalendarType(calendarDisplayType);
         }
     }
+}

Wino.Calendar/MainPage.xaml.cs

@@ -15,8 +15,8 @@ using Windows.UI.Xaml.Navigation;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
 
-namespace Wino.Calendar;
-
+namespace Wino.Calendar
+{
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
@@ -27,3 +27,4 @@ public sealed partial class MainPage : Page
             this.InitializeComponent();
         }
     }
+}

Wino.Calendar/Models/CalendarItemMeasurement.cs

@@ -1,5 +1,5 @@
-namespace Wino.Calendar.Models;
-
+namespace Wino.Calendar.Models
+{
     public struct CalendarItemMeasurement
     {
         // Where to start?
@@ -14,3 +14,4 @@ public struct CalendarItemMeasurement
             Right = right;
         }
     }
+}

Wino.Calendar/Package.appxmanifest

@@ -8,11 +8,6 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   IgnorableNamespaces="uap mp">
 
-  <Identity
-    Name="58272BurakKSE.WinoCalendar"
-    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
-    Version="1.0.15.0" />
-
 	<!-- Publisher Cache Folders -->
 	<Extensions>
 		<Extension Category="windows.publisherCacheFolders">
@@ -22,6 +17,11 @@
 		</Extension>
 	</Extensions>
 	
+  <Identity
+    Name="58272BurakKSE.WinoCalendar"
+    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
+    Version="1.0.15.0" />
+
   <mp:PhoneIdentity PhoneProductId="f047b7dd-96ec-4d54-a862-9321e271e449" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>

Wino.Calendar/Properties/AssemblyInfo.cs

@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Wino.Calendar")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Wino.Calendar")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]

Wino.Calendar/Properties/Default.rd.xml

@@ -0,0 +1,44 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+	  <Assembly Name="*Application*" Dynamic="Required All" />
+
+	  <!-- Reduce memory footprint when building with Microsoft.Graph -->
+
+	  <Assembly Name="Microsoft.Graph" Serialize="Excluded" />
+
+	  <Assembly Name="Microsoft.Kiota.Abstractions" Dynamic="Public" />
+	  <Assembly Name="Microsoft.Kiota.Authentication.Azure" Dynamic="Public" />
+	  <Assembly Name="Microsoft.Kiota.Http.HttpClientLibrary" Dynamic="Public" />
+	  <Assembly Name="Microsoft.Kiota.Serialization.Form" Dynamic="Public" />
+	  <Assembly Name="Microsoft.Kiota.Serialization.Json" Dynamic="Public" />
+	  <Assembly Name="Microsoft.Kiota.Serialization.Multipart" Dynamic="Public" />
+
+	  <!-- Add your application specific runtime directives here. -->
+	  <Type Name="Windows.Foundation.TypedEventHandler{Microsoft.UI.Xaml.Controls.NavigationView,Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs}" MarshalObject="Public" />
+
+	  <Type Name="Microsoft.UI.Xaml.Controls.NavigationView">
+		  <Event Name="ItemInvoked" Dynamic="Required"/>
+	  </Type>
+  </Application>
+</Directives>

Wino.Calendar/Properties/launchSettings.json

@@ -1,7 +0,0 @@
-{
-    "profiles": {
-        "Wino.Calendar": {
-            "commandName": "MsixPackage"
-        }
-    }
-}

Wino.Calendar/Selectors/CustomAreaCalendarItemSelector.cs

@@ -2,9 +2,9 @@
 using Windows.UI.Xaml.Controls;
 using Wino.Calendar.ViewModels.Data;
 
-namespace Wino.Calendar.Selectors;
-
-public partial class CustomAreaCalendarItemSelector : DataTemplateSelector
+namespace Wino.Calendar.Selectors
+{
+    public class CustomAreaCalendarItemSelector : DataTemplateSelector
     {
         public DataTemplate AllDayTemplate { get; set; }
         public DataTemplate MultiDayTemplate { get; set; }
@@ -13,10 +13,10 @@ public partial class CustomAreaCalendarItemSelector : DataTemplateSelector
         {
             if (item is CalendarItemViewModel calendarItemViewModel)
             {
-            return calendarItemViewModel.CalendarItem.ItemType == Core.Domain.Enums.CalendarItemType.MultiDay ||
-                calendarItemViewModel.CalendarItem.ItemType == Core.Domain.Enums.CalendarItemType.MultiDayAllDay ? MultiDayTemplate : AllDayTemplate;
+                return calendarItemViewModel.IsMultiDayEvent ? MultiDayTemplate : AllDayTemplate;
             }
 
             return base.SelectTemplateCore(item, container);
         }
     }
+}

Wino.Calendar/Selectors/WinoCalendarItemTemplateSelector.cs

@@ -2,9 +2,9 @@
 using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Calendar.Selectors;
-
-public partial class WinoCalendarItemTemplateSelector : DataTemplateSelector
+namespace Wino.Calendar.Selectors
+{
+    public class WinoCalendarItemTemplateSelector : DataTemplateSelector
     {
         public CalendarDisplayType DisplayType { get; set; }
 
@@ -31,3 +31,4 @@ public partial class WinoCalendarItemTemplateSelector : DataTemplateSelector
             return base.SelectTemplateCore(item, container);
         }
     }
+}

Wino.Calendar/Services/AccountCalendarStateService.cs

@@ -7,8 +7,8 @@ using Wino.Calendar.ViewModels.Data;
 using Wino.Calendar.ViewModels.Interfaces;
 using Wino.Core.Domain.Entities.Shared;
 
-namespace Wino.Calendar.Services;
-
+namespace Wino.Calendar.Services
+{
     /// <summary>
     /// Encapsulated state manager for collectively managing the state of account calendars.
     /// Callers must react to the events to update their state only from this service.
@@ -19,7 +19,7 @@ public partial class AccountCalendarStateService : ObservableObject, IAccountCal
         public event EventHandler<AccountCalendarViewModel> AccountCalendarSelectionStateChanged;
 
         [ObservableProperty]
-    public partial ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; set; }
+        private ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> groupedAccountCalendars;
 
         private ObservableCollection<GroupedAccountCalendarViewModel> _internalGroupedAccountCalendars = new ObservableCollection<GroupedAccountCalendarViewModel>();
 
@@ -111,3 +111,4 @@ public partial class AccountCalendarStateService : ObservableObject, IAccountCal
             }
         }
     }
+}

Wino.Calendar/Services/CalendarAuthenticatorConfig.cs

@@ -1,7 +1,7 @@
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Calendar.Services;
-
+namespace Wino.Calendar.Services
+{
     public class CalendarAuthenticatorConfig : IAuthenticatorConfig
     {
         public string OutlookAuthenticatorClientId => "b19c2035-d740-49ff-b297-de6ec561b208";
@@ -30,3 +30,4 @@ public class CalendarAuthenticatorConfig : IAuthenticatorConfig
 
         public string GmailTokenStoreIdentifier => "WinoCalendarGmailTokenStore";
     }
+}

Wino.Calendar/Services/DialogService.cs

@@ -2,8 +2,8 @@
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.UWP.Services;
 
-namespace Wino.Calendar.Services;
-
+namespace Wino.Calendar.Services
+{
     public class DialogService : DialogServiceBase, ICalendarDialogService
     {
         public DialogService(IThemeService themeService,
@@ -12,3 +12,4 @@ public class DialogService : DialogServiceBase, ICalendarDialogService
         {
         }
     }
+}

Wino.Calendar/Services/NavigationService.cs

@@ -10,8 +10,8 @@ using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.UWP.Services;
 using Wino.Views;
 
-namespace Wino.Calendar.Services;
-
+namespace Wino.Calendar.Services
+{
     public class NavigationService : NavigationServiceBase, INavigationService
     {
         public Type GetPageType(WinoPage winoPage)
@@ -60,3 +60,4 @@ public class NavigationService : NavigationServiceBase, INavigationService
             return false;
         }
     }
+}

Wino.Calendar/Services/ProviderService.cs

@@ -4,8 +4,8 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 
-namespace Wino.Calendar.Services;
-
+namespace Wino.Calendar.Services
+{
     public class ProviderService : IProviderService
     {
         public IProviderDetail GetProviderDetail(MailProviderType type)
@@ -33,3 +33,4 @@ public class ProviderService : IProviderService
             return providerList;
         }
     }
+}

Wino.Calendar/Services/SettingsBuilderService.cs

@@ -4,8 +4,8 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Settings;
 
-namespace Wino.Calendar.Services;
-
+namespace Wino.Calendar.Services
+{
     public class SettingsBuilderService : ISettingsBuilderService
     {
         public List<SettingOption> GetSettingItems()
@@ -18,3 +18,4 @@ public class SettingsBuilderService : ISettingsBuilderService
                 new SettingOption(Translator.SettingsAbout_Title, Translator.SettingsAbout_Description, WinoPage.AboutPage,"F1 M 9.375 18.75 C 8.509114 18.75 7.677409 18.639322 6.879883 18.417969 C 6.082356 18.196615 5.335286 17.882486 4.638672 17.475586 C 3.942057 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.807943 1.274414 14.111328 C 0.867513 13.414714 0.553385 12.667644 0.332031 11.870117 C 0.110677 11.072592 0 10.240886 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.240885 0 11.072591 0.110678 11.870117 0.332031 C 12.667643 0.553387 13.414713 0.867514 14.111328 1.274414 C 14.807942 1.681316 15.44108 2.169598 16.010742 2.739258 C 16.580402 3.30892 17.068684 3.942059 17.475586 4.638672 C 17.882486 5.335287 18.196613 6.082357 18.417969 6.879883 C 18.639322 7.677409 18.75 8.509115 18.75 9.375 C 18.75 10.240886 18.639322 11.072592 18.417969 11.870117 C 18.196613 12.667644 17.882486 13.414714 17.475586 14.111328 C 17.068684 14.807943 16.580402 15.441081 16.010742 16.010742 C 15.44108 16.580404 14.807942 17.068686 14.111328 17.475586 C 13.414713 17.882486 12.667643 18.196615 11.870117 18.417969 C 11.072591 18.639322 10.240885 18.75 9.375 18.75 Z M 9.375 1.25 C 8.626302 1.25 7.906901 1.347656 7.216797 1.542969 C 6.526692 1.738281 5.880533 2.011719 5.27832 2.363281 C 4.676106 2.714844 4.127604 3.138021 3.632812 3.632812 C 3.138021 4.127604 2.714844 4.676107 2.363281 5.27832 C 2.011719 5.880534 1.738281 6.52832 1.542969 7.22168 C 1.347656 7.915039 1.25 8.632812 1.25 9.375 C 1.25 10.117188 1.347656 10.834961 1.542969 11.52832 C 1.738281 12.22168 2.011719 12.869467 2.363281 13.47168 C 2.714844 14.073894 3.138021 14.622396 3.632812 15.117188 C 4.127604 15.611979 4.676106 16.035156 5.27832 16.386719 C 5.880533 16.738281 6.526692 17.011719 7.216797 17.207031 C 7.906901 17.402344 8.626302 17.5 9.375 17.5 C 10.117188 17.5 10.834961 17.402344 11.52832 17.207031 C 12.221679 17.011719 12.869465 16.738281 13.47168 16.386719 C 14.073893 16.035156 14.622396 15.611979 15.117188 15.117188 C 15.611979 14.622396 16.035156 14.073894 16.386719 13.47168 C 16.738281 12.869467 17.011719 12.223308 17.207031 11.533203 C 17.402344 10.8431 17.5 10.123698 17.5 9.375 C 17.5 8.632812 17.402344 7.915039 17.207031 7.22168 C 17.011719 6.52832 16.738281 5.880534 16.386719 5.27832 C 16.035156 4.676107 15.611979 4.127604 15.117188 3.632812 C 14.622396 3.138021 14.073893 2.714844 13.47168 2.363281 C 12.869465 2.011719 12.221679 1.738281 11.52832 1.542969 C 10.834961 1.347656 10.117188 1.25 9.375 1.25 Z M 8.75 7.5 L 10 7.5 L 10 13.75 L 8.75 13.75 Z M 8.75 5 L 10 5 L 10 6.25 L 8.75 6.25 Z "),
             };
     }
+}

Wino.Calendar/Styles/WinoCalendarResources.xaml.cs

@@ -1,7 +1,7 @@
 using Windows.UI.Xaml;
 
-namespace Wino.Calendar.Styles;
-
+namespace Wino.Calendar.Styles
+{
     public sealed partial class WinoCalendarResources : ResourceDictionary
     {
         public WinoCalendarResources()
@@ -9,3 +9,4 @@ public sealed partial class WinoCalendarResources : ResourceDictionary
             this.InitializeComponent();
         }
     }
+}

Wino.Calendar/Views/Abstract/AccountDetailsPageAbstract.cs

@@ -1,6 +1,7 @@
 using Wino.Calendar.ViewModels;
 using Wino.Core.UWP;
 
-namespace Wino.Calendar.Views.Abstract;
-
+namespace Wino.Calendar.Views.Abstract
+{
     public abstract class AccountDetailsPageAbstract : BasePage<AccountDetailsPageViewModel> { }
+}

Wino.Calendar/Views/Abstract/AccountManagementPageAbstract.cs

@@ -1,6 +1,7 @@
 using Wino.Calendar.ViewModels;
 using Wino.Core.UWP;
 
-namespace Wino.Calendar.Views.Abstract;
-
-public partial class AccountManagementPageAbstract : BasePage<AccountManagementViewModel> { }
+namespace Wino.Calendar.Views.Abstract
+{
+    public class AccountManagementPageAbstract : BasePage<AccountManagementViewModel> { }
+}

Wino.Calendar/Views/Abstract/AppShellAbstract.cs

@@ -1,6 +1,7 @@
 using Wino.Calendar.ViewModels;
 using Wino.Core.UWP;
 
-namespace Wino.Calendar.Views.Abstract;
-
+namespace Wino.Calendar.Views.Abstract
+{
     public abstract class AppShellAbstract : BasePage<AppShellViewModel> { }
+}

Wino.Calendar/Views/Abstract/CalendarPageAbstract.cs

@@ -1,6 +1,7 @@
 using Wino.Calendar.ViewModels;
 using Wino.Core.UWP;
 
-namespace Wino.Calendar.Views.Abstract;
-
+namespace Wino.Calendar.Views.Abstract
+{
     public abstract class CalendarPageAbstract : BasePage<CalendarPageViewModel> { }
+}

Wino.Calendar/Views/Abstract/CalendarSettingsPageAbstract.cs

@@ -1,6 +1,7 @@
 using Wino.Calendar.ViewModels;
 using Wino.Core.UWP;
 
-namespace Wino.Calendar.Views.Abstract;
-
+namespace Wino.Calendar.Views.Abstract
+{
     public abstract class CalendarSettingsPageAbstract : BasePage<CalendarSettingsPageViewModel> { }
+}

Wino.Calendar/Views/Abstract/EventDetailsPageAbstract.cs

@@ -1,6 +1,7 @@
 using Wino.Calendar.ViewModels;
 using Wino.Core.UWP;
 
-namespace Wino.Calendar.Views.Abstract;
-
+namespace Wino.Calendar.Views.Abstract
+{
     public abstract class EventDetailsPageAbstract : BasePage<EventDetailsPageViewModel> { }
+}

Wino.Calendar/Views/Abstract/PersonalizationPageAbstract.cs

@@ -1,6 +1,7 @@
 using Wino.Core.UWP;
 using Wino.Core.ViewModels;
 
-namespace Wino.Calendar.Views.Abstract;
-
-public partial class PersonalizationPageAbstract : BasePage<PersonalizationPageViewModel> { }
+namespace Wino.Calendar.Views.Abstract
+{
+    public class PersonalizationPageAbstract : BasePage<PersonalizationPageViewModel> { }
+}

Wino.Calendar/Views/Account/AccountManagementPage.xaml.cs

@@ -1,7 +1,7 @@
 using Wino.Calendar.Views.Abstract;
 
-namespace Wino.Calendar.Views.Account;
-
+namespace Wino.Calendar.Views.Account
+{
     public sealed partial class AccountManagementPage : AccountManagementPageAbstract
     {
         public AccountManagementPage()
@@ -9,3 +9,4 @@ public sealed partial class AccountManagementPage : AccountManagementPageAbstrac
             InitializeComponent();
         }
     }
+}

Wino.Calendar/Views/AppShell.xaml

@@ -89,7 +89,6 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center"
                             BorderBrush="Transparent"
-                            IsTabStop="False"
                             PlaceholderText="Search" />
 
                         <StackPanel

Wino.Calendar/Views/AppShell.xaml.cs

@@ -5,8 +5,8 @@ using Wino.Calendar.Views.Abstract;
 using Wino.Core.UWP;
 using Wino.Messaging.Client.Calendar;
 
-namespace Wino.Calendar.Views;
-
+namespace Wino.Calendar.Views
+{
     public sealed partial class AppShell : AppShellAbstract,
         IRecipient<CalendarDisplayTypeChangedMessage>
     {
@@ -51,3 +51,4 @@ public sealed partial class AppShell : AppShellAbstract,
         private void AppBarBackButtonClicked(Core.UWP.Controls.WinoAppTitleBar sender, RoutedEventArgs args)
             => ViewModel.NavigationService.GoBack();
     }
+}

Wino.Calendar/Views/CalendarPage.xaml.cs

@@ -9,8 +9,8 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Messaging.Client.Calendar;
 
-namespace Wino.Calendar.Views;
-
+namespace Wino.Calendar.Views
+{
     public sealed partial class CalendarPage : CalendarPageAbstract,
         IRecipient<ScrollToDateMessage>,
         IRecipient<ScrollToHourMessage>,
@@ -158,3 +158,4 @@ public sealed partial class CalendarPage : CalendarPageAbstract,
             ViewModel.DisplayDetailsCalendarItemViewModel = null;
         }
     }
+}

Wino.Calendar/Views/EventDetailsPage.xaml

@@ -256,7 +256,7 @@
                                         <PersonPicture
                                             Width="40"
                                             Height="40"
-                                            DisplayName="{x:Bind DisplayName}" />
+                                            DisplayName="{x:Bind Name}" />
 
                                         <!--  TODO: Organizer  -->
                                         <Grid Grid.Column="1">
@@ -265,7 +265,7 @@
                                                 <RowDefinition Height="Auto" />
                                             </Grid.RowDefinitions>
 
-                                            <TextBlock FontWeight="SemiBold" Text="{x:Bind DisplayName}" />
+                                            <TextBlock FontWeight="SemiBold" Text="{x:Bind Name}" />
                                             <TextBlock
                                                 Grid.Row="1"
                                                 FontSize="13"

Wino.Calendar/Views/EventDetailsPage.xaml.cs

@@ -1,8 +1,8 @@
 
 using Wino.Calendar.Views.Abstract;
 
-namespace Wino.Calendar.Views;
-
+namespace Wino.Calendar.Views
+{
     public sealed partial class EventDetailsPage : EventDetailsPageAbstract
     {
         public EventDetailsPage()
@@ -10,3 +10,4 @@ public sealed partial class EventDetailsPage : EventDetailsPageAbstract
             this.InitializeComponent();
         }
     }
+}

Wino.Calendar/Views/Settings/AccountDetailsPage.xaml

@@ -20,7 +20,7 @@
                 <controls:SettingsCard.HeaderIcon>
                     <PathIcon Data="F1 M 10 0.625 C 10 0.45573 10.061849 0.309246 10.185547 0.185547 C 10.309244 0.06185 10.455729 0 10.625 0 L 15.625 0 C 15.79427 0 15.940754 0.06185 16.064453 0.185547 C 16.18815 0.309246 16.25 0.45573 16.25 0.625 C 16.25 0.794271 16.18815 0.940756 16.064453 1.064453 C 15.940754 1.188152 15.79427 1.25 15.625 1.25 L 13.75 1.25 L 13.75 18.75 L 15.625 18.75 C 15.79427 18.75 15.940754 18.81185 16.064453 18.935547 C 16.18815 19.059244 16.25 19.205729 16.25 19.375 C 16.25 19.544271 16.18815 19.690756 16.064453 19.814453 C 15.940754 19.93815 15.79427 20 15.625 20 L 10.625 20 C 10.455729 20 10.309244 19.93815 10.185547 19.814453 C 10.061849 19.690756 10 19.544271 10 19.375 C 10 19.205729 10.061849 19.059244 10.185547 18.935547 C 10.309244 18.81185 10.455729 18.75 10.625 18.75 L 12.5 18.75 L 12.5 1.25 L 10.625 1.25 C 10.455729 1.25 10.309244 1.188152 10.185547 1.064453 C 10.061849 0.940756 10 0.794271 10 0.625 Z M 0 6.25 C 0 5.735678 0.097656 5.250651 0.292969 4.794922 C 0.488281 4.339193 0.756836 3.94043 1.098633 3.598633 C 1.44043 3.256836 1.837565 2.988281 2.290039 2.792969 C 2.742513 2.597656 3.229167 2.5 3.75 2.5 L 11.25 2.5 L 11.25 3.75 L 3.75 3.75 C 3.404948 3.75 3.081055 3.815105 2.77832 3.945312 C 2.475586 4.075521 2.210286 4.254558 1.982422 4.482422 C 1.754557 4.710287 1.575521 4.975587 1.445312 5.27832 C 1.315104 5.581056 1.25 5.904949 1.25 6.25 L 1.25 13.75 C 1.25 14.095053 1.315104 14.418945 1.445312 14.72168 C 1.575521 15.024414 1.754557 15.289714 1.982422 15.517578 C 2.210286 15.745443 2.475586 15.924479 2.77832 16.054688 C 3.081055 16.184896 3.404948 16.25 3.75 16.25 L 11.25 16.25 L 11.25 17.5 L 3.75 17.5 C 3.229167 17.5 2.742513 17.402344 2.290039 17.207031 C 1.837565 17.011719 1.44043 16.743164 1.098633 16.401367 C 0.756836 16.05957 0.488281 15.662436 0.292969 15.209961 C 0.097656 14.757487 0 14.270834 0 13.75 Z M 15 3.75 L 15 2.5 L 16.25 2.5 C 16.764322 2.5 17.249348 2.597656 17.705078 2.792969 C 18.160807 2.988281 18.55957 3.256836 18.901367 3.598633 C 19.243164 3.94043 19.511719 4.339193 19.707031 4.794922 C 19.902344 5.250651 20 5.735678 20 6.25 L 20 13.75 C 20 14.270834 19.902344 14.757487 19.707031 15.209961 C 19.511719 15.662436 19.243164 16.05957 18.901367 16.401367 C 18.55957 16.743164 18.160807 17.011719 17.705078 17.207031 C 17.249348 17.402344 16.764322 17.5 16.25 17.5 L 15 17.5 L 15 16.25 L 16.25 16.25 C 16.595051 16.25 16.918945 16.184896 17.22168 16.054688 C 17.524414 15.924479 17.789713 15.745443 18.017578 15.517578 C 18.245441 15.289714 18.424479 15.024414 18.554688 14.72168 C 18.684895 14.418945 18.75 14.095053 18.75 13.75 L 18.75 6.25 C 18.75 5.904949 18.684895 5.581056 18.554688 5.27832 C 18.424479 4.975587 18.245441 4.710287 18.017578 4.482422 C 17.789713 4.254558 17.524414 4.075521 17.22168 3.945312 C 16.918945 3.815105 16.595051 3.75 16.25 3.75 Z M 7.441406 5.361328 C 7.389323 5.250651 7.312825 5.162761 7.211914 5.097656 C 7.111002 5.032553 6.998697 5.000001 6.875 5 C 6.751302 5.000001 6.638997 5.032553 6.538086 5.097656 C 6.437174 5.162761 6.360677 5.250651 6.308594 5.361328 L 2.871094 12.861328 C 2.799479 13.017578 2.792969 13.177084 2.851562 13.339844 C 2.910156 13.502604 3.017578 13.619792 3.173828 13.691406 C 3.330078 13.763021 3.489583 13.769531 3.652344 13.710938 C 3.815104 13.652344 3.932292 13.544922 4.003906 13.388672 L 4.84375 11.5625 L 8.896484 11.5625 L 8.90625 11.5625 L 9.746094 13.388672 C 9.817708 13.544922 9.934896 13.652344 10.097656 13.710938 C 10.260416 13.769531 10.419922 13.763021 10.576172 13.691406 C 10.732422 13.619792 10.839844 13.502604 10.898438 13.339844 C 10.957031 13.177084 10.950521 13.017578 10.878906 12.861328 Z M 5.410156 10.3125 L 6.875 7.128906 L 8.339844 10.3125 Z " />
                 </controls:SettingsCard.HeaderIcon>
-                <Button Command="{x:Bind ViewModel.EditAccountDetailsCommand}" Content="{x:Bind domain:Translator.FolderOperation_Rename}" />
+                <Button Command="{x:Bind ViewModel.RenameAccountCommand}" Content="{x:Bind domain:Translator.FolderOperation_Rename}" />
             </controls:SettingsCard>
 
             <!--  TODO  -->

Wino.Calendar/Views/Settings/AccountDetailsPage.xaml.cs

@@ -1,7 +1,7 @@
 using Wino.Calendar.Views.Abstract;
 
-namespace Wino.Calendar.Views.Settings;
-
+namespace Wino.Calendar.Views.Settings
+{
     public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
     {
         public AccountDetailsPage()
@@ -9,3 +9,4 @@ public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
             this.InitializeComponent();
         }
     }
+}

Wino.Calendar/Views/Settings/CalendarSettingsPage.xaml.cs

@@ -1,8 +1,8 @@
 using Wino.Calendar.Views.Abstract;
 
 
-namespace Wino.Calendar.Views.Settings;
-
+namespace Wino.Calendar.Views.Settings
+{
     public sealed partial class CalendarSettingsPage : CalendarSettingsPageAbstract
     {
         public CalendarSettingsPage()
@@ -10,3 +10,4 @@ public sealed partial class CalendarSettingsPage : CalendarSettingsPageAbstract
             InitializeComponent();
         }
     }
+}

Wino.Calendar/Views/Settings/PersonalizationPage.xaml.cs

@@ -1,7 +1,7 @@
 using Wino.Calendar.Views.Abstract;
 
-namespace Wino.Calendar.Views.Settings;
-
+namespace Wino.Calendar.Views.Settings
+{
     public sealed partial class PersonalizationPage : PersonalizationPageAbstract
     {
         public PersonalizationPage()
@@ -9,3 +9,4 @@ public sealed partial class PersonalizationPage : PersonalizationPageAbstract
             this.InitializeComponent();
         }
     }
+}

Wino.Calendar/Wino.Calendar.csproj

@@ -1,31 +1,184 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-		<UseUwp>true</UseUwp>
-		<Platforms>x86;x64;arm64</Platforms>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-		<DefaultLanguage>en-US</DefaultLanguage>
-		<!--<PublishAot>true</PublishAot>-->
-		<PublishProfile>win-$(Platform).pubxml</PublishProfile>
-		<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<GenerateAppInstallerFile>True</GenerateAppInstallerFile>
-		<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <LangVersion>8.0</LangVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <!-- UWP WAM Authentication on Xbox needs this. -->
+    <UseDotNetNativeSharedAssemblyFrameworkPackage>false</UseDotNetNativeSharedAssemblyFrameworkPackage>
+    <PackageCertificateThumbprint>
+    </PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>Wino.Mail_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{600F4979-DB7E-409D-B7DA-B60BE4C55C35}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Wino.Calendar</RootNamespace>
+    <AssemblyName>Wino.Calendar</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <!-- .NET Native Shit -->
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <UseDotNetNativeSharedAssemblyFrameworkPackage>false</UseDotNetNativeSharedAssemblyFrameworkPackage>
+    <Use64BitCompiler>true</Use64BitCompiler>
+    <OutOfProcPDB>true</OutOfProcPDB>
   </PropertyGroup>
-
   <ItemGroup>
-	  <Compile Remove="BundleArtifacts\**" />
-	  <EmbeddedResource Remove="BundleArtifacts\**" />
-	  <None Remove="BundleArtifacts\**" />
-	  <Page Remove="BundleArtifacts\**" />
+    <Compile Include="Activation\DefaultActivationHandler.cs" />
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Args\TimelineCellSelectedArgs.cs" />
+    <Compile Include="Args\TimelineCellUnselectedArgs.cs" />
+    <Compile Include="Controls\CalendarItemCommandBarFlyout.cs" />
+    <Compile Include="Controls\CalendarItemControl.xaml.cs">
+      <DependentUpon>CalendarItemControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\CustomCalendarFlipView.cs" />
+    <Compile Include="Controls\DayColumnControl.cs" />
+    <Compile Include="Controls\DayHeaderControl.cs" />
+    <Compile Include="Controls\WinoCalendarControl.cs" />
+    <Compile Include="Controls\WinoCalendarFlipView.cs" />
+    <Compile Include="Controls\WinoCalendarPanel.cs" />
+    <Compile Include="Controls\WinoCalendarTypeSelectorControl.cs" />
+    <Compile Include="Controls\WinoCalendarView.cs" />
+    <Compile Include="Controls\WinoDayTimelineCanvas.cs" />
+    <Compile Include="Helpers\CalendarXamlHelpers.cs" />
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Models\CalendarItemMeasurement.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Selectors\CustomAreaCalendarItemSelector.cs" />
+    <Compile Include="Selectors\WinoCalendarItemTemplateSelector.cs" />
+    <Compile Include="Services\AccountCalendarStateService.cs" />
+    <Compile Include="Services\CalendarAuthenticatorConfig.cs" />
+    <Compile Include="Services\DialogService.cs" />
+    <Compile Include="Services\NavigationService.cs" />
+    <Compile Include="Services\ProviderService.cs" />
+    <Compile Include="Services\SettingsBuilderService.cs" />
+    <Compile Include="Styles\WinoCalendarResources.xaml.cs" />
+    <Compile Include="Views\Abstract\AccountDetailsPageAbstract.cs" />
+    <Compile Include="Views\Abstract\AccountManagementPageAbstract.cs" />
+    <Compile Include="Views\Abstract\AppShellAbstract.cs" />
+    <Compile Include="Views\Abstract\CalendarPageAbstract.cs" />
+    <Compile Include="Views\Abstract\CalendarSettingsPageAbstract.cs" />
+    <Compile Include="Views\Abstract\EventDetailsPageAbstract.cs" />
+    <Compile Include="Views\Abstract\PersonalizationPageAbstract.cs" />
+    <Compile Include="Views\Account\AccountManagementPage.xaml.cs">
+      <DependentUpon>AccountManagementPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\AppShell.xaml.cs">
+      <DependentUpon>AppShell.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CalendarPage.xaml.cs">
+      <DependentUpon>CalendarPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EventDetailsPage.xaml.cs">
+      <DependentUpon>EventDetailsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Settings\AccountDetailsPage.xaml.cs">
+      <DependentUpon>AccountDetailsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Settings\CalendarSettingsPage.xaml.cs">
+      <DependentUpon>CalendarSettingsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Settings\PersonalizationPage.xaml.cs">
+      <DependentUpon>PersonalizationPage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-	  <PRIResource Remove="BundleArtifacts\**" />
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
   </ItemGroup>
-
   <ItemGroup>
     <None Include="Package.StoreAssociation.xml" />
     <Content Include="Assets\LargeTile.scale-100.png" />
@@ -73,6 +226,7 @@
     <Content Include="Assets\Wide310x150Logo.scale-125.png" />
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
+    <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
     <Content Include="Assets\Square150x150Logo.scale-200.png" />
@@ -81,18 +235,120 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" />
-    <PackageReference Include="Microsoft.Identity.Client" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
-    <PackageReference Include="Win2D.uwp" />
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Controls\CalendarItemControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Styles\CalendarThemeResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Styles\DayHeaderControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Styles\WinoCalendarResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Styles\WinoCalendarTypeSelectorControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\WinoCalendarView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\WinoDayTimelineCanvas.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\Account\AccountManagementPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\AppShell.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\CalendarPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\EventDetailsPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\Settings\AccountDetailsPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\Settings\CalendarSettingsPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\Settings\PersonalizationPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Wino.Authentication\Wino.Authentication.csproj" />
-    <ProjectReference Include="..\Wino.Calendar.ViewModels\Wino.Calendar.ViewModels.csproj" />
-    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
-    <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.UWP.csproj" />
-    <ProjectReference Include="..\Wino.Core.ViewModels\Wino.Core.ViewModels.csproj" />
-    <ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
-    <ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
+    <PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives">
+      <Version>8.1.240916</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Identity.Client">
+      <Version>4.66.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.14</Version>
+    </PackageReference>
+    <PackageReference Include="Win2D.uwp">
+      <Version>1.28.1</Version>
+    </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Wino.Calendar.ViewModels\Wino.Calendar.ViewModels.csproj">
+      <Project>{039affa8-c1cc-4e3b-8a31-6814d7557f74}</Project>
+      <Name>Wino.Calendar.ViewModels</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj">
+      <Project>{cf3312e5-5da0-4867-9945-49ea7598af1f}</Project>
+      <Name>Wino.Core.Domain</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.UWP.csproj">
+      <Project>{395f19ba-1e42-495c-9db5-1a6f537fccb8}</Project>
+      <Name>Wino.Core.UWP</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Wino.Core.ViewModels\Wino.Core.ViewModels.csproj">
+      <Project>{53723ae8-7e7e-4d54-adab-0a6033255cc8}</Project>
+      <Name>Wino.Core.ViewModels</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj">
+      <Project>{0c307d7e-256f-448c-8265-5622a812fbcc}</Project>
+      <Name>Wino.Messaging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Wino.Services\Wino.Services.csproj">
+      <Project>{bba49030-7277-48cf-b2fe-3d01cb6b6c81}</Project>
+      <Name>Wino.Services</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

Wino.Core.Domain/BasicTypesJsonContext.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Wino.Core.Domain;
-
-[JsonSerializable(typeof(Dictionary<string, string>))]
-[JsonSerializable(typeof(string))]
-[JsonSerializable(typeof(int))]
-[JsonSerializable(typeof(List<string>))]
-[JsonSerializable(typeof(bool))]
-public partial class BasicTypesJsonContext : JsonSerializerContext;

Wino.Core.Domain/Collections/CalendarEventCollection.cs

@@ -7,8 +7,8 @@ using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Core.Domain.Collections;
-
+namespace Wino.Core.Domain.Collections
+{
     public class CalendarEventCollection
     {
         public event EventHandler<ICalendarItem> CalendarItemAdded;
@@ -80,11 +80,11 @@ public class CalendarEventCollection
             // Multi-day events go to both.
             // Anything else goes to regular.
 
-        if (calendarItem.ItemType == Enums.CalendarItemType.AllDay || calendarItem.ItemType == Enums.CalendarItemType.MultiDayAllDay || calendarItem.ItemType == Enums.CalendarItemType.RecurringAllDay)
+            if (calendarItem.IsAllDayEvent)
             {
                 return [_internalAllDayEvents];
             }
-        else if (calendarItem.ItemType == Enums.CalendarItemType.MultiDay || calendarItem.ItemType == Enums.CalendarItemType.MultiDayAllDay)
+            else if (calendarItem.IsMultiDayEvent)
             {
                 return [_internalRegularEvents, _internalAllDayEvents];
             }
@@ -153,3 +153,4 @@ public class CalendarEventCollection
             CalendarItemsCleared?.Invoke(this, EventArgs.Empty);
         }
     }
+}

Wino.Core.Domain/Collections/DayRangeCollection.cs

@@ -2,8 +2,8 @@
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Core.Domain.Collections;
-
+namespace Wino.Core.Domain.Collections
+{
     public class DayRangeCollection : ObservableRangeCollection<DayRangeRenderModel>
     {
         /// <summary>
@@ -39,3 +39,4 @@ public class DayRangeCollection : ObservableRangeCollection<DayRangeRenderModel>
             }
         }
     }
+}

Wino.Core.Domain/Collections/ObservableRangeCollection.cs

@@ -4,8 +4,8 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 
-namespace Wino.Core.Domain.Collections;
-
+namespace Wino.Core.Domain.Collections
+{
     /// <summary> 
     /// Represents a dynamic data collection that provides notifications when items get added, removed, or when the whole list is refreshed. 
     /// </summary> 
@@ -171,3 +171,4 @@ public class ObservableRangeCollection<T> : ObservableCollection<T>
                 OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, changedItems: changedItems, startingIndex: startingIndex));
         }
     }
+}

Wino.Core.Domain/Constants.cs

@@ -1,5 +1,5 @@
-namespace Wino.Core.Domain;
-
+namespace Wino.Core.Domain
+{
     public static class Constants
     {
         /// <summary>
@@ -8,6 +8,8 @@ public static class Constants
         public const string WinoLocalDraftHeader = "X-Wino-Draft-Id";
         public const string LocalDraftStartPrefix = "localDraft_";
 
+        public const string CalendarEventRecurrenceRuleSeperator = "___";
+
         public const string ToastMailUniqueIdKey = nameof(ToastMailUniqueIdKey);
         public const string ToastActionKey = nameof(ToastActionKey);
 
@@ -18,3 +20,4 @@ public static class Constants
         public const string WinoMailIdentiifer = nameof(WinoMailIdentiifer);
         public const string WinoCalendarIdentifier = nameof(WinoCalendarIdentifier);
     }
+}

Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs

@@ -2,45 +2,17 @@
 using SQLite;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.Domain.Entities.Calendar;
-
+namespace Wino.Core.Domain.Entities.Calendar
+{
     public class AccountCalendar : IAccountCalendar
     {
         [PrimaryKey]
-    public Guid Id { get; set; } = Guid.NewGuid();
-
-    [NotNull]
-    public string RemoteCalendarId { get; set; } = string.Empty;
-
-    [NotNull]
+        public Guid Id { get; set; }
         public Guid AccountId { get; set; }
-
-    [NotNull]
-    public string Name { get; set; } = string.Empty;
-
-    public string? Description { get; set; }
-
-    public string? Location { get; set; }
-
-    public string? TimeZone { get; set; }
-
-    public string? AccessRole { get; set; }
-
-    public bool IsPrimary { get; set; } = false;
-
-    public string? BackgroundColor { get; set; }
-
-    public string? ForegroundColor { get; set; }
-
-    public DateTime CreatedDate { get; set; }
-
-    public DateTime LastModified { get; set; }
-
-    public DateTime? LastSyncTime { get; set; }
-
-    public string? SynchronizationDeltaToken { get; set; }
-
-    public bool IsDeleted { get; set; } = false;
+        public string RemoteCalendarId { get; set; }
+        public string SynchronizationDeltaToken { get; set; }
+        public string Name { get; set; }
+        public bool IsPrimary { get; set; }
         public bool IsExtended { get; set; } = true;
 
         /// <summary>
@@ -48,4 +20,6 @@ public class AccountCalendar : IAccountCalendar
         /// </summary>
         public string TextColorHex { get; set; }
         public string BackgroundColorHex { get; set; }
+        public string TimeZone { get; set; }
+    }
 }

Wino.Core.Domain/Entities/Calendar/CalendarEventAttendee.cs

@@ -2,35 +2,19 @@
 using SQLite;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.Domain.Entities.Calendar;
-
+namespace Wino.Core.Domain.Entities.Calendar
+{
     // TODO: Connect to Contact store with Wino People.
     public class CalendarEventAttendee
     {
         [PrimaryKey]
-    public Guid Id { get; set; } = Guid.NewGuid();
-
-    [NotNull]
-    public Guid EventId { get; set; }
-
-    [NotNull]
-    public string Email { get; set; } = string.Empty;
-
-    public string? DisplayName { get; set; }
-
-    public AttendeeResponseStatus ResponseStatus { get; set; } = AttendeeResponseStatus.NeedsAction;
-
-    public bool IsOptional { get; set; } = false;
-
-    public bool IsOrganizer { get; set; } = false;
-
-    public bool IsSelf { get; set; } = false;
-
-    public string? Comment { get; set; }
-
-    public int? AdditionalGuests { get; set; }
-
-    public DateTime CreatedDate { get; set; }
-
-    public DateTime LastModified { get; set; }
+        public Guid Id { get; set; }
+        public Guid CalendarItemId { get; set; }
+        public string Name { get; set; }
+        public string Email { get; set; }
+        public AttendeeStatus AttendenceStatus { get; set; }
+        public bool IsOrganizer { get; set; }
+        public bool IsOptionalAttendee { get; set; }
+        public string Comment { get; set; }
+    }
 }

Wino.Core.Domain/Entities/Calendar/CalendarItem.cs

@@ -3,90 +3,178 @@ using System.Diagnostics;
 using Itenso.TimePeriod;
 using SQLite;
 using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Helpers;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.Domain.Entities.Calendar;
-
+namespace Wino.Core.Domain.Entities.Calendar
+{
     [DebuggerDisplay("{Title} ({StartDate} - {EndDate})")]
     public class CalendarItem : ICalendarItem
     {
         [PrimaryKey]
-    public Guid Id { get; set; } = Guid.NewGuid();
+        public Guid Id { get; set; }
+        public string RemoteEventId { get; set; }
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public string Location { get; set; }
 
-    [NotNull]
-    public string RemoteEventId { get; set; } = string.Empty;
+        public DateTime StartDate { get; set; }
 
-    [NotNull]
-    public Guid CalendarId { get; set; }
+        public DateTime EndDate
+        {
+            get
+            {
+                return StartDate.AddSeconds(DurationInSeconds);
+            }
+        }
 
-    [Ignore]
-    public IAccountCalendar AssignedCalendar { get; set; }
-
-    [NotNull]
-    public string Title { get; set; } = string.Empty;
-
-    public string? Description { get; set; }
-
-    public string? Location { get; set; }
-    public string? HtmlLink { get; set; }
-
-    public DateTime StartDateTime { get; set; }
-
-    public DateTime EndDateTime { get; set; }
+        public TimeSpan StartDateOffset { get; set; }
+        public TimeSpan EndDateOffset { get; set; }
 
         private ITimePeriod _period;
         public ITimePeriod Period
         {
             get
             {
-            _period ??= new TimeRange(StartDateTime, EndDateTime);
+                _period ??= new TimeRange(StartDate, EndDate);
 
                 return _period;
             }
         }
 
-    public bool IsAllDay { get; set; }
-
-    public string? TimeZone { get; set; }
-
-    public string? RecurrenceRules { get; set; }
-
-    public string? Status { get; set; }
-
-    public string? OrganizerDisplayName { get; set; }
-
-    public string? OrganizerEmail { get; set; }
-
-    public DateTime CreatedDate { get; set; }
-
-    public DateTime LastModified { get; set; }
-
-    public bool IsDeleted { get; set; }
-
-    public string? RecurringEventId { get; set; }
-
-    public string? OriginalStartTime { get; set; }
-
         /// <summary>
-    /// The type of calendar item (Timed, AllDay, MultiDay, etc.)
+        /// Events that starts at midnight and ends at midnight are considered all-day events.
         /// </summary>
-    public CalendarItemType ItemType { get; set; }
-
-    /// <summary>
-    /// Automatically determines and sets the ItemType based on event properties
-    /// </summary>
-    public void DetermineItemType()
+        public bool IsAllDayEvent
         {
-        var hasRecurrence = !string.IsNullOrEmpty(RecurrenceRules);
-        var isCancelled = Status?.ToLowerInvariant() == "cancelled" || IsDeleted;
+            get
+            {
+                return
+                    StartDate.TimeOfDay == TimeSpan.Zero &&
+                    EndDate.TimeOfDay == TimeSpan.Zero;
+            }
+        }
 
-        ItemType = CalendarItemTypeHelper.DetermineItemType(
-            StartDateTime,
-            EndDateTime,
-            IsAllDay,
-            hasRecurrence,
-            isCancelled,
-            Status);
+        /// <summary>
+        /// Events that are either an exceptional instance of a recurring event or occurrences.
+        /// IsOccurrence is used to display occurrence instances of parent recurring events.
+        /// IsOccurrence == false && IsRecurringChild == true => exceptional single instance.
+        /// </summary>
+        public bool IsRecurringChild
+        {
+            get
+            {
+                return RecurringCalendarItemId != null;
+            }
+        }
+
+        /// <summary>
+        /// Events that are either an exceptional instance of a recurring event or occurrences.
+        /// </summary>
+        public bool IsRecurringEvent => IsRecurringChild || IsRecurringParent;
+
+        /// <summary>
+        /// Events that are the master event definition of recurrence events.
+        /// </summary>
+        public bool IsRecurringParent
+        {
+            get
+            {
+                return !string.IsNullOrEmpty(Recurrence) && RecurringCalendarItemId == null;
+            }
+        }
+
+        /// <summary>
+        /// Events that are not all-day events and last more than one day are considered multi-day events.
+        /// </summary>
+        public bool IsMultiDayEvent
+        {
+            get
+            {
+                return Period.Duration.TotalDays >= 1 && !IsAllDayEvent;
+            }
+        }
+
+        public double DurationInSeconds { get; set; }
+        public string Recurrence { get; set; }
+
+        public string OrganizerDisplayName { get; set; }
+        public string OrganizerEmail { get; set; }
+
+        /// <summary>
+        /// The id of the parent calendar item of the recurring event.
+        /// Exceptional instances are stored as a separate calendar item.
+        /// This makes the calendar item a child of the recurring event.
+        /// </summary>
+        public Guid? RecurringCalendarItemId { get; set; }
+
+        /// <summary>
+        /// Indicates read-only events. Default is false.
+        /// </summary>
+        public bool IsLocked { get; set; }
+
+        /// <summary>
+        /// Hidden events must not be displayed to the user.
+        /// This usually happens when a child instance of recurring parent is cancelled after creation.
+        /// </summary>
+        public bool IsHidden { get; set; }
+
+        // TODO
+        public string CustomEventColorHex { get; set; }
+        public string HtmlLink { get; set; }
+        public CalendarItemStatus Status { get; set; }
+        public CalendarItemVisibility Visibility { get; set; }
+        public DateTimeOffset CreatedAt { get; set; }
+        public DateTimeOffset UpdatedAt { get; set; }
+        public Guid CalendarId { get; set; }
+
+        [Ignore]
+        public IAccountCalendar AssignedCalendar { get; set; }
+
+        /// <summary>
+        /// Whether this item does not really exist in the database or not.
+        /// These are used to display occurrence instances of parent recurring events.
+        /// </summary>
+        [Ignore]
+        public bool IsOccurrence { get; set; }
+
+        /// <summary>
+        /// Id to load information related to this event.
+        /// Occurrences tracked by the parent recurring event if they are not exceptional instances.
+        /// Recurring children here are exceptional instances. They have their own info in the database including Id.
+        /// </summary>
+        public Guid EventTrackingId => IsOccurrence ? RecurringCalendarItemId.Value : Id;
+
+        public CalendarItem CreateRecurrence(DateTime startDate, double durationInSeconds)
+        {
+            // Create a copy with the new start date and duration
+
+            return new CalendarItem
+            {
+                Id = Guid.NewGuid(),
+                Title = Title,
+                Description = Description,
+                Location = Location,
+                StartDate = startDate,
+                DurationInSeconds = durationInSeconds,
+                Recurrence = Recurrence,
+                OrganizerDisplayName = OrganizerDisplayName,
+                OrganizerEmail = OrganizerEmail,
+                RecurringCalendarItemId = Id,
+                AssignedCalendar = AssignedCalendar,
+                CalendarId = CalendarId,
+                CreatedAt = CreatedAt,
+                UpdatedAt = UpdatedAt,
+                Visibility = Visibility,
+                Status = Status,
+                CustomEventColorHex = CustomEventColorHex,
+                HtmlLink = HtmlLink,
+                StartDateOffset = StartDateOffset,
+                EndDateOffset = EndDateOffset,
+                RemoteEventId = RemoteEventId,
+                IsHidden = IsHidden,
+                IsLocked = IsLocked,
+                IsOccurrence = true
+            };
+        }
     }
 }

Wino.Core.Domain/Entities/Calendar/Reminder.cs

@@ -2,8 +2,8 @@
 using SQLite;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.Domain.Entities.Calendar;
-
+namespace Wino.Core.Domain.Entities.Calendar
+{
     public class Reminder
     {
         [PrimaryKey]
@@ -13,3 +13,4 @@ public class Reminder
         public DateTimeOffset ReminderTime { get; set; }
         public CalendarItemReminderType ReminderType { get; set; }
     }
+}

Wino.Core.Domain/Entities/Mail/AccountSignature.cs

@@ -1,8 +1,8 @@
 using System;
 using SQLite;
 
-namespace Wino.Core.Domain.Entities.Mail;
-
+namespace Wino.Core.Domain.Entities.Mail
+{
     public class AccountSignature
     {
         [PrimaryKey]
@@ -14,3 +14,4 @@ public class AccountSignature
 
         public Guid MailAccountId { get; set; }
     }
+}

Wino.Core.Domain/Entities/Mail/MailAccountAlias.cs

@@ -1,8 +1,8 @@
 using System;
 using SQLite;
 
-namespace Wino.Core.Domain.Entities.Mail;
-
+namespace Wino.Core.Domain.Entities.Mail
+{
     public class RemoteAccountAlias
     {
         /// <summary>
@@ -60,3 +60,4 @@ public class MailAccountAlias : RemoteAccountAlias
         /// </summary>
         public bool CanDelete => !IsRootAlias;
     }
+}

Wino.Core.Domain/Entities/Mail/MailCopy.cs

@@ -5,8 +5,8 @@ using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 
-namespace Wino.Core.Domain.Entities.Mail;
-
+namespace Wino.Core.Domain.Entities.Mail
+{
     /// <summary>
     /// Summary of the parsed MIME messages.
     /// Wino will do non-network operations on this table and others from the original MIME.
@@ -154,3 +154,4 @@ public class MailCopy : IMailItem
         public IEnumerable<Guid> GetContainingIds() => [UniqueId];
         public override string ToString() => $"{Subject} <-> {Id}";
     }
+}

Wino.Core.Domain/Entities/Mail/MailItemFolder.cs

@@ -5,8 +5,8 @@ using SQLite;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Folders;
 
-namespace Wino.Core.Domain.Entities.Mail;
-
+namespace Wino.Core.Domain.Entities.Mail
+{
     [DebuggerDisplay("{FolderName} - {SpecialFolderType}")]
     public class MailItemFolder : IMailItemFolder
     {
@@ -72,3 +72,4 @@ public class MailItemFolder : IMailItemFolder
 
         public override string ToString() => FolderName;
     }
+}

Wino.Core.Domain/Entities/Mail/MergedInbox.cs

@@ -1,8 +1,8 @@
 using System;
 using SQLite;
 
-namespace Wino.Core.Domain.Entities.Mail;
-
+namespace Wino.Core.Domain.Entities.Mail
+{
     public class MergedInbox
     {
         [PrimaryKey]
@@ -10,3 +10,4 @@ public class MergedInbox
 
         public string Name { get; set; }
     }
+}

Wino.Core.Domain/Entities/Shared/AccountContact.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using SQLite;
 
-namespace Wino.Core.Domain.Entities.Shared;
-
+namespace Wino.Core.Domain.Entities.Shared
+{
     /// <summary>
     /// Back storage for simple name-address book.
     /// These values will be inserted during MIME fetch.
@@ -36,6 +36,14 @@ public class AccountContact : IEquatable<AccountContact>
         /// </summary>
         public bool IsRootContact { get; set; }
 
+        /// <summary>
+        /// Short display name of the contact.
+        /// Eather Name or Address.
+        /// </summary>
+        public string ShortDisplayName => Address == Name || string.IsNullOrWhiteSpace(Name) ? $"{Address.ToLowerInvariant()};" : $"{Name};";
+
+        public string DisplayName => Address == Name || string.IsNullOrWhiteSpace(Name) ? Address.ToLowerInvariant() : $"{Name} <{Address.ToLowerInvariant()}>";
+
         public override bool Equals(object obj)
         {
             return Equals(obj as AccountContact);
@@ -50,7 +58,10 @@ public class AccountContact : IEquatable<AccountContact>
 
         public override int GetHashCode()
         {
-        return HashCode.Combine(Address, Name);
+            int hashCode = -1717786383;
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Address);
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
+            return hashCode;
         }
 
         public static bool operator ==(AccountContact left, AccountContact right)
@@ -63,3 +74,4 @@ public class AccountContact : IEquatable<AccountContact>
             return !(left == right);
         }
     }
+}

Wino.Core.Domain/Entities/Shared/CustomServerInformation.cs

@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using SQLite;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.Domain.Entities.Shared;
-
+namespace Wino.Core.Domain.Entities.Shared
+{
     public class CustomServerInformation
     {
         [PrimaryKey]
@@ -50,25 +49,5 @@ public class CustomServerInformation
         /// Default is 5.
         /// </summary>
         public int MaxConcurrentClients { get; set; }
-
-    public Dictionary<string, string> GetConnectionProperties()
-    {
-        // Printout the public connection properties.
-
-        var connectionProperties = new Dictionary<string, string>
-        {
-            { "IncomingServer", IncomingServer },
-            { "IncomingServerPort", IncomingServerPort },
-            { "IncomingServerSocketOption", IncomingServerSocketOption.ToString() },
-            { "IncomingAuthenticationMethod", IncomingAuthenticationMethod.ToString() },
-            { "OutgoingServer", OutgoingServer },
-            { "OutgoingServerPort", OutgoingServerPort },
-            { "OutgoingServerSocketOption", OutgoingServerSocketOption.ToString() },
-            { "OutgoingAuthenticationMethod", OutgoingAuthenticationMethod.ToString() },
-            { "ProxyServer", ProxyServer },
-            { "ProxyServerPort", ProxyServerPort }
-        };
-
-        return connectionProperties;
     }
 }

Wino.Core.Domain/Entities/Shared/MailAccount.cs

@@ -3,8 +3,8 @@ using SQLite;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.Domain.Entities.Shared;
-
+namespace Wino.Core.Domain.Entities.Shared
+{
     public class MailAccount
     {
         [PrimaryKey]
@@ -108,3 +108,4 @@ public class MailAccount
         /// </summary>
         public bool IsAliasSyncSupported => ProviderType == MailProviderType.Gmail;
     }
+}

Wino.Core.Domain/Entities/Shared/MailAccountPreferences.cs

@@ -1,8 +1,8 @@
 using System;
 using SQLite;
 
-namespace Wino.Core.Domain.Entities.Shared;
-
+namespace Wino.Core.Domain.Entities.Shared
+{
     public class MailAccountPreferences
     {
         [PrimaryKey]
@@ -51,3 +51,4 @@ public class MailAccountPreferences
         /// </summary>
         public Guid? SignatureIdForFollowingMessages { get; set; }
     }
+}