From 45835c9328fec211b5758c6e0a47c145989f4a1c Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Mon, 7 Jun 2021 18:15:27 -0400
Subject: [PATCH] chore: bump version to 1.1.2

---
 XIVChat Desktop Installer/Product.wxs         |   3 +-
 .../XIVChat Desktop Installer.wixproj         | 126 +++++++++---------
 XIVChat Desktop/App.xaml.cs                   |  12 +-
 XIVChat Desktop/Notifications.cs              |  21 ---
 XIVChat Desktop/XIVChat Desktop.csproj        |   7 +-
 XIVChatCommon/XIVChatCommon.csproj            |   6 +-
 6 files changed, 79 insertions(+), 96 deletions(-)
 delete mode 100644 XIVChat Desktop/Notifications.cs

diff --git a/XIVChat Desktop Installer/Product.wxs b/XIVChat Desktop Installer/Product.wxs
index 6ac6a13..7a52984 100644
--- a/XIVChat Desktop Installer/Product.wxs	
+++ b/XIVChat Desktop Installer/Product.wxs	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="XIVChat for Windows" Language="1033" Version="1.1.1"
+    <Product Id="*" Name="XIVChat for Windows" Language="1033" Version="1.1.2"
              Manufacturer="XIVChat"
              UpgradeCode="D792BC67-EE1E-46D7-8C68-1A794875E1D1">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
@@ -33,6 +33,7 @@
             </Publish>
         </UI>
         <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
+        <Property Id="REINSTALLMODE" Value="amus"/>
     </Product>
 
     <Fragment>
diff --git a/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj b/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj
index 438ae81..6789d55 100644
--- a/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj	
+++ b/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj	
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-	<InstallerPlatform>x64</InstallerPlatform>
-    <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>6017abe2-e82f-476d-b3da-18b634e092f2</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>XIVChat Desktop Installer</OutputName>
-    <OutputType>Package</OutputType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Product.wxs" />
-    <Compile Include="XIVChat Desktop.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixBalExtension">
-      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
-      <Name>WixBalExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
-  </Target>
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
-  <Target Name="BeforeBuild">
-    <Exec Command="dotnet publish &quot;..\XIVChat Desktop\XIVChat Desktop.csproj&quot; -c $(Configuration)" />
     <PropertyGroup>
-      <LinkerBaseInputPaths>..\XIVChat Desktop\bin\$(Configuration)\netcoreapp3.1\publish</LinkerBaseInputPaths>
-      <DefineConstants>BasePath=..\XIVChat Desktop\bin\$(Configuration)\netcoreapp3.1\publish</DefineConstants>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <InstallerPlatform>x64</InstallerPlatform>
+        <ProductVersion>3.10</ProductVersion>
+        <ProjectGuid>6017abe2-e82f-476d-b3da-18b634e092f2</ProjectGuid>
+        <SchemaVersion>2.0</SchemaVersion>
+        <OutputName>XIVChat Desktop Installer</OutputName>
+        <OutputType>Package</OutputType>
     </PropertyGroup>
-    <HeatDirectory OutputFile="XIVChat Desktop.wxs" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="XIVChat_Desktop" SuppressCom="true" Directory="..\XIVChat Desktop\bin\$(Configuration)\netcoreapp3.1\publish" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath" />
-  </Target>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+        <OutputPath>bin\$(Configuration)\</OutputPath>
+        <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+        <DefineConstants>Debug</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <OutputPath>bin\$(Configuration)\</OutputPath>
+        <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="Product.wxs"/>
+        <Compile Include="XIVChat Desktop.wxs"/>
+    </ItemGroup>
+    <ItemGroup>
+        <WixExtension Include="WixBalExtension">
+            <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
+            <Name>WixBalExtension</Name>
+        </WixExtension>
+        <WixExtension Include="WixUIExtension">
+            <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+            <Name>WixUIExtension</Name>
+        </WixExtension>
+    </ItemGroup>
+    <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' "/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') "/>
+    <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+        <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/"/>
+    </Target>
+    <PropertyGroup>
+        <PreBuildEvent>
+        </PreBuildEvent>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+        <OutputPath>bin\x64\Debug\</OutputPath>
+        <PlatformTarget>x64</PlatformTarget>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+        <OutputPath>bin\x64\Release\</OutputPath>
+        <PlatformTarget>x64</PlatformTarget>
+    </PropertyGroup>
+    <Target Name="BeforeBuild">
+        <Exec Command="dotnet publish &quot;..\XIVChat Desktop\XIVChat Desktop.csproj&quot; -c $(Configuration)"/>
+        <PropertyGroup>
+            <LinkerBaseInputPaths>..\XIVChat Desktop\bin\$(Configuration)\net5.0-windows10.0.18362.0\publish</LinkerBaseInputPaths>
+            <DefineConstants>BasePath=..\XIVChat Desktop\bin\$(Configuration)\net5.0-windows10.0.18362.0\publish</DefineConstants>
+        </PropertyGroup>
+        <HeatDirectory OutputFile="XIVChat Desktop.wxs" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="XIVChat_Desktop" SuppressCom="true" Directory="..\XIVChat Desktop\bin\$(Configuration)\net5.0-windows10.0.18362.0\publish" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath"/>
+    </Target>
+    <!--
+      To modify your build process, add your task inside one of the targets below and uncomment it.
+      Other similar extension points exist, see Wix.targets.
+      <Target Name="BeforeBuild">
+      </Target>
+      <Target Name="AfterBuild">
+      </Target>
+      -->
 </Project>
diff --git a/XIVChat Desktop/App.xaml.cs b/XIVChat Desktop/App.xaml.cs
index 80d40e3..9b1faa5 100644
--- a/XIVChat Desktop/App.xaml.cs	
+++ b/XIVChat Desktop/App.xaml.cs	
@@ -7,6 +7,7 @@ using System.Windows;
 using System.Windows.Markup;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
+using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 using Hardcodet.Wpf.TaskbarNotification;
 using Microsoft.Toolkit.Uwp.Notifications;
@@ -49,8 +50,6 @@ namespace XIVChat_Desktop {
         }
 
         private async void Application_Startup(object sender, StartupEventArgs e) {
-            Notifications.Initialise();
-
             try {
                 this.Config = Configuration.Load() ?? new Configuration();
             } catch (Exception ex) {
@@ -87,7 +86,8 @@ namespace XIVChat_Desktop {
             LocaliseAllElements();
 
             // I guess this gets initialised where you call it the first time, so initialise it on the UI thread
-            this.Dispatcher.Invoke(() => { });
+            this.Dispatcher.Invoke(() => {
+            });
 
             #if RELEASE
             if (string.IsNullOrWhiteSpace(this.Config.LicenceKey) || !(await LicenceWindow.LicenceInfo(this.Config.LicenceKey)).Valid()) {
@@ -172,9 +172,11 @@ namespace XIVChat_Desktop {
 
             var content = builder.GetToastContent();
 
-            var toast = new ToastNotification(content.GetXml());
+            var document = new XmlDocument();
+            document.LoadXml(content.GetContent());
+            var toast = new ToastNotification(document);
 
-            DesktopNotificationManagerCompat.CreateToastNotifier().Show(toast);
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(toast);
         }
 
         private void Notify(string title, string text) {
diff --git a/XIVChat Desktop/Notifications.cs b/XIVChat Desktop/Notifications.cs
deleted file mode 100644
index 3d90e00..0000000
--- a/XIVChat Desktop/Notifications.cs	
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.Uwp.Notifications;
-
-namespace XIVChat_Desktop {
-    public static class Notifications {
-        public static void Initialise() {
-            DesktopNotificationManagerCompat.RegisterAumidAndComServer<XivChatNotificationActivator>("XIVChat.XIVChat_Desktop");
-            DesktopNotificationManagerCompat.RegisterActivator<XivChatNotificationActivator>();
-        }
-    }
-
-
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComSourceInterfaces(typeof(INotificationActivationCallback))]
-    [Guid("F12BCC85-6FEE-4A9A-BBB8-08DFAA7BE1A8"), ComVisible(true)]
-    public class XivChatNotificationActivator : NotificationActivator {
-        public override void OnActivated(string invokedArgs, NotificationUserInput userInput, string appUserModelId) {
-            // TODO: Handle activation
-        }
-    }
-}
diff --git a/XIVChat Desktop/XIVChat Desktop.csproj b/XIVChat Desktop/XIVChat Desktop.csproj
index 8fe2cf9..9d83362 100644
--- a/XIVChat Desktop/XIVChat Desktop.csproj	
+++ b/XIVChat Desktop/XIVChat Desktop.csproj	
@@ -1,14 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
+        <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
         <RootNamespace>XIVChat_Desktop</RootNamespace>
         <UseWPF>true</UseWPF>
         <AssemblyName>XIVChat Desktop</AssemblyName>
         <Nullable>enable</Nullable>
         <Company>XIVChat</Company>
-        <Version>1.1.1</Version>
+        <Version>1.1.2</Version>
         <ApplicationIcon>Resources\logo.ico</ApplicationIcon>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <LangVersion>latest</LangVersion>
diff --git a/XIVChatCommon/XIVChatCommon.csproj b/XIVChatCommon/XIVChatCommon.csproj
index 83600eb..5bd4a62 100644
--- a/XIVChatCommon/XIVChatCommon.csproj
+++ b/XIVChatCommon/XIVChatCommon.csproj
@@ -5,12 +5,12 @@
         <Nullable>enable</Nullable>
         <AssemblyVersion>1.0.0</AssemblyVersion>
         <FileVersion>1.0.0</FileVersion>
-        <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net48;net5.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MessagePack" Version="2.2.85" />
-        <PackageReference Include="Sodium.Core" Version="1.2.3" />
+        <PackageReference Include="MessagePack" Version="2.2.85"/>
+        <PackageReference Include="Sodium.Core" Version="1.2.3"/>
     </ItemGroup>
 
 </Project>