👏we👏love👏merge👏conflicts👏

UnicordDev · Apr 22, 2022 · 9126a12 · 9126a12
1 parent c2b3d4c
commit 9126a12
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 116 deletions.
diff --git a/Libraries/DSharpPlus b/Libraries/DSharpPlus
diff --git a/Libraries/WamWooWam.Core b/Libraries/WamWooWam.Core
diff --git a/Libraries/unicode.net b/Libraries/unicode.net
diff --git a/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest b/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest
@@ -18,7 +18,7 @@
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal.Package/Package.ARM.appxmanifest b/Unicord.Universal.Package/Package.ARM.appxmanifest
@@ -9,15 +9,15 @@
          xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
          xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
 				 IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap">
-  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="1.7.6.0" />
+  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="1.8.0.0" />
   <mp:PhoneIdentity PhoneProductId="5783aabf-3049-421f-ae1d-e88bd89018f2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
     <PublisherDisplayName>Wan Kerr Co. Ltd.</PublisherDisplayName>
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal.Package/Package.Debug.appxmanifest b/Unicord.Universal.Package/Package.Debug.appxmanifest
@@ -10,15 +10,15 @@
          xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
          xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
 				 IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 desktop desktop5 rescap">
-  <Identity Name="24101WamWooWamRD.Unicord.Canary" Publisher="CN=Wan Kerr Co. Ltd." Version="1.7.6.0" />
+  <Identity Name="24101WamWooWamRD.Unicord.Canary" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="1.7.6.0" />
   <mp:PhoneIdentity PhoneProductId="5783aabf-3049-421f-ae1d-e88bd89018f1" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
     <PublisherDisplayName>Wan Kerr Co. Ltd.</PublisherDisplayName>
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal.Package/Package.appxmanifest b/Unicord.Universal.Package/Package.appxmanifest
@@ -9,15 +9,15 @@
          xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
          xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
 				 IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap">
-  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="1.7.6.0" />
+  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="1.8.0.0" />
   <mp:PhoneIdentity PhoneProductId="5783aabf-3049-421f-ae1d-e88bd89018f2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
     <PublisherDisplayName>Wan Kerr Co. Ltd.</PublisherDisplayName>
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal.Package/Unicord.Universal.Package.wapproj b/Unicord.Universal.Package/Unicord.Universal.Package.wapproj
@@ -71,7 +71,7 @@
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
     <ProjectGuid>8e0255b7-b38e-423e-91c7-5637a01c2e13</ProjectGuid>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
@@ -82,7 +82,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>False</GenerateTestArtifacts>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxBundle>Always</AppxBundle>

diff --git a/Unicord.Universal/Controls/AttachmentViewer.xaml.cs b/Unicord.Universal/Controls/AttachmentViewer.xaml.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using DSharpPlus.Entities;
-using Unicord.Universal.Native;
 using Unicord.Universal.Utilities;
 using WamWooWam.Core;
 using Windows.ApplicationModel.DataTransfer;

diff --git a/Unicord.Universal/Package.Debug.appxmanifest b/Unicord.Universal/Package.Debug.appxmanifest
@@ -10,15 +10,15 @@
          xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
          xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
 				 IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 desktop desktop5 rescap">
-  <Identity Name="24101WamWooWamRD.Unicord.Canary" Publisher="CN=Wan Kerr Co. Ltd." Version="1.2.7.0" />
+  <Identity Name="24101WamWooWamRD.Unicord.Canary" Publisher="CN=wamwo" Version="1.2.7.0" />
   <mp:PhoneIdentity PhoneProductId="5783aabf-3049-421f-ae1d-e88bd89018f1" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
     <PublisherDisplayName>Wan Kerr Co. Ltd.</PublisherDisplayName>
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal/Package.appxmanifest b/Unicord.Universal/Package.appxmanifest
@@ -9,15 +9,15 @@
          xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
          xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
 				 IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap">
-  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=Wan Kerr Co. Ltd." Version="1.7.5.0" />
+  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="1.7.5.0" />
   <mp:PhoneIdentity PhoneProductId="5783aabf-3049-421f-ae1d-e88bd89018f2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
     <PublisherDisplayName>Wan Kerr Co. Ltd.</PublisherDisplayName>
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal/Tools.cs b/Unicord.Universal/Tools.cs
@@ -10,7 +10,6 @@
 using DSharpPlus.Net.Serialization;
 using Newtonsoft.Json;
 using Unicord.Universal.Misc;
-using Unicord.Universal.Native;
 using WamWooWam.Core;
 using Windows.ApplicationModel.Contacts;
 using Windows.ApplicationModel.DataTransfer;
@@ -51,15 +50,7 @@ public static string ToFileSizeString(long size)
 
         public static string ToFileSizeString(ulong size)
         {
-            try
-            {
-                return Shlwapi.StrFormatByteSizeEx(size, SFBSFlags.TruncateUndisplayedDecimalDigits);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex);
                 return Files.SizeSuffix((long)size);
-            }
         }
 
         public static Task DownloadToFileAsync(Uri url, StorageFile file)
@@ -217,15 +208,6 @@ public static async Task SendFilesWithProgressAsync(DiscordChannel channel, stri
 
         internal static string GetItemTypeFromExtension(string extension, string fallback = null)
         {
-            try
-            {
-                return Shlwapi.AssocQueryString(ASSOCF.NONE, ASSOCSTR.FRIENDLYAPPNAME, extension, "");
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex);
-            }
-
             return fallback;
         }
 
@@ -339,7 +321,7 @@ public static async Task<List<EmojiGroup>> GetGroupedEmojiAsync(string text, Dis
                     .Select(g => new EmojiGroup(g.Key, g))
                     .ToList();
 
-            var list = guildEmoji != null ? guildEmoji.Where(e => n ? cult.IndexOf(e.GetDiscordName(), text, CompareOptions.IgnoreCase) >= 0 : true)
+            var list = guildEmoji != null ? guildEmoji.Where(e => n ? cult.IndexOf(e.DiscordName, text, CompareOptions.IgnoreCase) >= 0 : true)
                 .GroupBy(e => App.Discord.Guilds.Values.FirstOrDefault(g => g.Emojis.ContainsKey(e.Id)))
                 .OrderBy(g => App.Discord.UserSettings.GuildPositions.IndexOf(g.Key.Id))
                 .Select(g => new EmojiGroup(g.Key, g))

diff --git a/Unicord.Universal/Unicord.Universal.csproj b/Unicord.Universal/Unicord.Universal.csproj
@@ -13,7 +13,7 @@
     <LangVersion>9</LangVersion>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
     <!-- While we technically target 1709, I want to manually target 1703 for Windows Phone support -->
     <AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
     <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
@@ -23,7 +23,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>
     </PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>6BD8C4FCFA3FDEFC732E95AC6319476735CC564B</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>CBB99112037FA88434855C973D1AB39B0D4B2F10</PackageCertificateThumbprint>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x64|arm</AppxBundlePlatforms>
@@ -925,16 +925,16 @@
       <Version>2.8.11</Version>
     </PackageReference>
     <PackageReference Include="Markdig">
-      <Version>0.24.0</Version>
+      <Version>0.30.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter">
-      <Version>4.2.0</Version>
+      <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Analytics">
-      <Version>4.2.0</Version>
+      <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>4.2.0</Version>
+      <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Push">
       <Version>3.4.3</Version>
@@ -943,7 +943,7 @@
       <Version>5.3.200605002</Version>
     </PackageReference> -->
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
+      <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Services.Store.Engagement">
       <Version>10.1901.28001</Version>
@@ -967,7 +967,10 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Drawing.Common">
-      <Version>5.0.2</Version>
+      <Version>6.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Unicord.Universal.Voice">
+      <Version>1.0.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -991,14 +994,6 @@
       <Project>{01A262AF-E652-4381-88C3-2DCD7FDD9D93}</Project>
       <Name>Unicode</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Unicord.Universal.Native\Unicord.Universal.Native.vcxproj">
-      <Project>{2427b481-8e92-433f-8714-53a2cde1bf7f}</Project>
-      <Name>Unicord.Universal.Native</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Unicord.Universal.Voice\Unicord.Universal.Voice.vcxproj">
-      <Project>{e3bc526e-debd-4f76-a669-9adade1d4fc8}</Project>
-      <Name>Unicord.Universal.Voice</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Unicord\Unicord.csproj">
       <Project>{9b4bb6a4-4aa7-4b7c-ac3e-12a52832a245}</Project>
       <Name>Unicord</Name>
@@ -1008,10 +1003,10 @@
     <SDKReference Include="Microsoft.VCLibs, Version=14.0">
       <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
     </SDKReference>
-    <SDKReference Include="WindowsDesktop, Version=10.0.18362.0">
+    <SDKReference Include="WindowsDesktop, Version=10.0.19041.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
-    <SDKReference Include="WindowsMobile, Version=10.0.18362.0">
+    <SDKReference Include="WindowsMobile, Version=10.0.19041.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
+33 −18		DSharpPlus/DiscordClient.cs
+8 −5		DSharpPlus/Entities/DiscordEmoji.cs
+14 −6		DSharpPlus/Entities/DiscordGuild.cs
+4 −1		DSharpPlus/Entities/DiscordReadState.cs
+1 −1		DSharpPlus/Net/Endpoints.cs
+1 −1		DSharpPlus/Properties/AssemblyProperties.cs
+2 −2		WamWooWam.Core/Drawing.cs
+1 −1		WamWooWam.Core/WamWooWam.Core.csproj