Fix AnyCPU

MaKrotos · Jan 16, 2024 · f298ed5 · f298ed5
1 parent 660584f
commit f298ed5
Show file tree

Hide file tree

Showing 123 changed files with 259 additions and 431 deletions.
diff --git a/SetupLib/AppUpdater.cs b/SetupLib/AppUpdater.cs
@@ -47,22 +47,10 @@ public async Task<bool> CheckForUpdates()
                     Console.WriteLine("Версия вашего приложения не ниже, чем последняя версия.");
                     return false;
                 }
-                string architecture;
-                if (Environment.Is64BitOperatingSystem)
-                {
-                    architecture = "x64";
-                }
-                else if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
-                {
-                    architecture = "ARM64";
-                }
-                else
-                {
-                    architecture = "x86";
-                }
+
 
                 var msixAsset = release.Assets.FirstOrDefault(asset => asset.Name.EndsWith(".msixbundle"))
-                    ?? release.Assets.FirstOrDefault(asset => asset.Name.Contains(architecture) && asset.Name.EndsWith(".msix")) ?? null;
+                    ?? release.Assets.FirstOrDefault(asset =>  asset.Name.EndsWith(".msix")) ?? null;
 
 
 

diff --git a/VK UI3 (Package)/Images/BadgeLogo.scale-100.png b/VK UI3 (Package)/Images/BadgeLogo.scale-100.png
diff --git a/VK UI3 (Package)/Images/BadgeLogo.scale-125.png b/VK UI3 (Package)/Images/BadgeLogo.scale-125.png
diff --git a/VK UI3 (Package)/Images/BadgeLogo.scale-150.png b/VK UI3 (Package)/Images/BadgeLogo.scale-150.png
diff --git a/VK UI3 (Package)/Images/BadgeLogo.scale-200.png b/VK UI3 (Package)/Images/BadgeLogo.scale-200.png
diff --git a/VK UI3 (Package)/Images/BadgeLogo.scale-400.png b/VK UI3 (Package)/Images/BadgeLogo.scale-400.png
diff --git a/VK UI3 (Package)/Images/LargeTile.scale-100.png b/VK UI3 (Package)/Images/LargeTile.scale-100.png
diff --git a/VK UI3 (Package)/Images/LargeTile.scale-125.png b/VK UI3 (Package)/Images/LargeTile.scale-125.png
diff --git a/VK UI3 (Package)/Images/LargeTile.scale-150.png b/VK UI3 (Package)/Images/LargeTile.scale-150.png
diff --git a/VK UI3 (Package)/Images/LargeTile.scale-200.png b/VK UI3 (Package)/Images/LargeTile.scale-200.png
diff --git a/VK UI3 (Package)/Images/LargeTile.scale-400.png b/VK UI3 (Package)/Images/LargeTile.scale-400.png
diff --git a/VK UI3 (Package)/Images/LockScreenLogo.scale-200.png b/VK UI3 (Package)/Images/LockScreenLogo.scale-200.png
diff --git a/VK UI3 (Package)/Images/SmallTile.scale-100.png b/VK UI3 (Package)/Images/SmallTile.scale-100.png
diff --git a/VK UI3 (Package)/Images/SmallTile.scale-125.png b/VK UI3 (Package)/Images/SmallTile.scale-125.png
diff --git a/VK UI3 (Package)/Images/SmallTile.scale-150.png b/VK UI3 (Package)/Images/SmallTile.scale-150.png
diff --git a/VK UI3 (Package)/Images/SmallTile.scale-200.png b/VK UI3 (Package)/Images/SmallTile.scale-200.png
diff --git a/VK UI3 (Package)/Images/SmallTile.scale-400.png b/VK UI3 (Package)/Images/SmallTile.scale-400.png
diff --git a/VK UI3 (Package)/Images/SplashScreen.scale-100.png b/VK UI3 (Package)/Images/SplashScreen.scale-100.png
diff --git a/VK UI3 (Package)/Images/SplashScreen.scale-125.png b/VK UI3 (Package)/Images/SplashScreen.scale-125.png
diff --git a/VK UI3 (Package)/Images/SplashScreen.scale-150.png b/VK UI3 (Package)/Images/SplashScreen.scale-150.png
diff --git a/VK UI3 (Package)/Images/SplashScreen.scale-200.png b/VK UI3 (Package)/Images/SplashScreen.scale-200.png
diff --git a/VK UI3 (Package)/Images/SplashScreen.scale-400.png b/VK UI3 (Package)/Images/SplashScreen.scale-400.png
diff --git a/VK UI3 (Package)/Images/Square150x150Logo.scale-100.png b/VK UI3 (Package)/Images/Square150x150Logo.scale-100.png
diff --git a/VK UI3 (Package)/Images/Square150x150Logo.scale-125.png b/VK UI3 (Package)/Images/Square150x150Logo.scale-125.png
diff --git a/VK UI3 (Package)/Images/Square150x150Logo.scale-150.png b/VK UI3 (Package)/Images/Square150x150Logo.scale-150.png
diff --git a/VK UI3 (Package)/Images/Square150x150Logo.scale-200.png b/VK UI3 (Package)/Images/Square150x150Logo.scale-200.png
diff --git a/VK UI3 (Package)/Images/Square150x150Logo.scale-400.png b/VK UI3 (Package)/Images/Square150x150Logo.scale-400.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/VK UI3 (Package)/Images/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.scale-100.png b/VK UI3 (Package)/Images/Square44x44Logo.scale-100.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.scale-125.png b/VK UI3 (Package)/Images/Square44x44Logo.scale-125.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.scale-150.png b/VK UI3 (Package)/Images/Square44x44Logo.scale-150.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.scale-200.png b/VK UI3 (Package)/Images/Square44x44Logo.scale-200.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.scale-400.png b/VK UI3 (Package)/Images/Square44x44Logo.scale-400.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.targetsize-16.png b/VK UI3 (Package)/Images/Square44x44Logo.targetsize-16.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.targetsize-24.png b/VK UI3 (Package)/Images/Square44x44Logo.targetsize-24.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/VK UI3 (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.targetsize-256.png b/VK UI3 (Package)/Images/Square44x44Logo.targetsize-256.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.targetsize-32.png b/VK UI3 (Package)/Images/Square44x44Logo.targetsize-32.png
diff --git a/VK UI3 (Package)/Images/Square44x44Logo.targetsize-48.png b/VK UI3 (Package)/Images/Square44x44Logo.targetsize-48.png
diff --git a/VK UI3 (Package)/Images/StoreLogo.backup.png b/VK UI3 (Package)/Images/StoreLogo.backup.png
diff --git a/VK UI3 (Package)/Images/StoreLogo.scale-100.png b/VK UI3 (Package)/Images/StoreLogo.scale-100.png
diff --git a/VK UI3 (Package)/Images/StoreLogo.scale-125.png b/VK UI3 (Package)/Images/StoreLogo.scale-125.png
diff --git a/VK UI3 (Package)/Images/StoreLogo.scale-150.png b/VK UI3 (Package)/Images/StoreLogo.scale-150.png
diff --git a/VK UI3 (Package)/Images/StoreLogo.scale-200.png b/VK UI3 (Package)/Images/StoreLogo.scale-200.png
diff --git a/VK UI3 (Package)/Images/StoreLogo.scale-400.png b/VK UI3 (Package)/Images/StoreLogo.scale-400.png
diff --git a/VK UI3 (Package)/Images/Wide310x150Logo.scale-100.png b/VK UI3 (Package)/Images/Wide310x150Logo.scale-100.png
diff --git a/VK UI3 (Package)/Images/Wide310x150Logo.scale-125.png b/VK UI3 (Package)/Images/Wide310x150Logo.scale-125.png
diff --git a/VK UI3 (Package)/Images/Wide310x150Logo.scale-150.png b/VK UI3 (Package)/Images/Wide310x150Logo.scale-150.png
diff --git a/VK UI3 (Package)/Images/Wide310x150Logo.scale-200.png b/VK UI3 (Package)/Images/Wide310x150Logo.scale-200.png
diff --git a/VK UI3 (Package)/Images/Wide310x150Logo.scale-400.png b/VK UI3 (Package)/Images/Wide310x150Logo.scale-400.png
diff --git a/VK UI3 (Package)/Package.appxmanifest b/VK UI3 (Package)/Package.appxmanifest
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="FDW.VKM"
+    Publisher="CN=FDW"
+    Version="0.1.4.4" />
+
+  <mp:PhoneIdentity PhoneProductId="b7c1f34e-9025-4935-9d7a-7d0a632a368d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>VK M</DisplayName>
+    <PublisherDisplayName>FDW</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="VK M"
+        Description="VK M"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+        <uap:LockScreen Notification="badge" BadgeLogo="Images\BadgeLogo.png"/>
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
diff --git a/VK UI3 (Package)/VK UI3 (Package).wapproj b/VK UI3 (Package)/VK UI3 (Package).wapproj
@@ -0,0 +1,125 @@
+<?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>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+    <PathToXAMLWinRTImplementations>VK UI3\</PathToXAMLWinRTImplementations>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>3074ce09-1e1f-4a30-a782-0d2641345e9d</ProjectGuid>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <AssetTargetFallback>net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <DefaultLanguage>ru-RU</DefaultLanguage>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <EntryPointProjectUniqueName>..\VK UI3\VK UI3.csproj</EntryPointProjectUniqueName>
+    <PackageCertificateThumbprint>235554A939D15E2A8C77BA2F5A0A5CE0EFA6B878</PackageCertificateThumbprint>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\BadgeLogo.scale-100.png" />
+    <Content Include="Images\BadgeLogo.scale-125.png" />
+    <Content Include="Images\BadgeLogo.scale-150.png" />
+    <Content Include="Images\BadgeLogo.scale-200.png" />
+    <Content Include="Images\BadgeLogo.scale-400.png" />
+    <Content Include="Images\LargeTile.scale-100.png" />
+    <Content Include="Images\LargeTile.scale-125.png" />
+    <Content Include="Images\LargeTile.scale-150.png" />
+    <Content Include="Images\LargeTile.scale-200.png" />
+    <Content Include="Images\LargeTile.scale-400.png" />
+    <Content Include="Images\SmallTile.scale-100.png" />
+    <Content Include="Images\SmallTile.scale-125.png" />
+    <Content Include="Images\SmallTile.scale-150.png" />
+    <Content Include="Images\SmallTile.scale-200.png" />
+    <Content Include="Images\SmallTile.scale-400.png" />
+    <Content Include="Images\SplashScreen.scale-100.png" />
+    <Content Include="Images\SplashScreen.scale-125.png" />
+    <Content Include="Images\SplashScreen.scale-150.png" />
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\LockScreenLogo.scale-200.png" />
+    <Content Include="Images\SplashScreen.scale-400.png" />
+    <Content Include="Images\Square150x150Logo.scale-100.png" />
+    <Content Include="Images\Square150x150Logo.scale-125.png" />
+    <Content Include="Images\Square150x150Logo.scale-150.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="Images\Square44x44Logo.scale-100.png" />
+    <Content Include="Images\Square44x44Logo.scale-125.png" />
+    <Content Include="Images\Square44x44Logo.scale-150.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-32.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
+    <Content Include="Images\StoreLogo.scale-100.png" />
+    <Content Include="Images\StoreLogo.scale-125.png" />
+    <Content Include="Images\StoreLogo.scale-150.png" />
+    <Content Include="Images\StoreLogo.scale-200.png" />
+    <Content Include="Images\StoreLogo.scale-400.png" />
+    <Content Include="Images\Wide310x150Logo.scale-100.png" />
+    <Content Include="Images\Wide310x150Logo.scale-125.png" />
+    <Content Include="Images\Wide310x150Logo.scale-150.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+    <Content Include="Images\Wide310x150Logo.scale-400.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\VK UI3\VK UI3.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.4.230913002]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[10.0.22621.755]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
diff --git a/VK UI3.sln b/VK UI3.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34407.89
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VK UI3", "VK UI3\VK UI3.csproj", "{89D346B6-EBA1-47B7-9BD9-D783B9375443}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetupLib", "SetupLib\SetupLib.csproj", "{238AFC25-373E-4F03-85C4-743B673CCEA3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VkNet.AudioBypassService", "VkNet.AudioBypassService\VkNet.AudioBypassService.csproj", "{F7EC83CF-D816-411D-93B8-94F0360FC93F}"
@@ -13,6 +11,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VkNet.Extensions.Dependency
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Setup", "Setup\Setup.csproj", "{3140B7E1-7834-410E-82B5-959B3978FA08}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VK UI3", "VK UI3\VK UI3.csproj", "{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "VK UI3 (Package)", "VK UI3 (Package)\VK UI3 (Package).wapproj", "{3074CE09-1E1F-4A30-A782-0D2641345E9D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,30 +27,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|Any CPU.Build.0 = Release|Any CPU
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|Any CPU.Deploy.0 = Release|Any CPU
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|ARM64.Build.0 = Debug|ARM64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|x64.ActiveCfg = Debug|x64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|x64.Build.0 = Debug|x64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|x64.Deploy.0 = Debug|x64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|x86.ActiveCfg = Debug|x86
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|x86.Build.0 = Debug|x86
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Debug|x86.Deploy.0 = Debug|x86
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|ARM64.ActiveCfg = Release|ARM64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|ARM64.Build.0 = Release|ARM64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|ARM64.Deploy.0 = Release|ARM64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|x64.ActiveCfg = Release|x64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|x64.Build.0 = Release|x64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|x64.Deploy.0 = Release|x64
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|x86.ActiveCfg = Release|x86
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|x86.Build.0 = Release|x86
-		{89D346B6-EBA1-47B7-9BD9-D783B9375443}.Release|x86.Deploy.0 = Release|x86
 		{238AFC25-373E-4F03-85C4-743B673CCEA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{238AFC25-373E-4F03-85C4-743B673CCEA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{238AFC25-373E-4F03-85C4-743B673CCEA3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -113,6 +91,46 @@ Global
 		{3140B7E1-7834-410E-82B5-959B3978FA08}.Release|x64.Build.0 = Release|Any CPU
 		{3140B7E1-7834-410E-82B5-959B3978FA08}.Release|x86.ActiveCfg = Release|Any CPU
 		{3140B7E1-7834-410E-82B5-959B3978FA08}.Release|x86.Build.0 = Release|Any CPU
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|Any CPU.Build.0 = Debug|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|x64.ActiveCfg = Debug|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|x64.Build.0 = Debug|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|x86.ActiveCfg = Debug|x86
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Debug|x86.Build.0 = Debug|x86
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|Any CPU.ActiveCfg = Release|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|Any CPU.Build.0 = Release|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|ARM64.Build.0 = Release|ARM64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|x64.ActiveCfg = Release|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|x64.Build.0 = Release|x64
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|x86.ActiveCfg = Release|x86
+		{721CA9F4-7889-4694-B939-A1A1D3CC2C6D}.Release|x86.Build.0 = Release|x86
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|Any CPU.Build.0 = Debug|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|x64.ActiveCfg = Debug|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|x64.Build.0 = Debug|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|x64.Deploy.0 = Debug|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|x86.ActiveCfg = Debug|x86
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|x86.Build.0 = Debug|x86
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Debug|x86.Deploy.0 = Debug|x86
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|Any CPU.ActiveCfg = Release|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|Any CPU.Build.0 = Release|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|Any CPU.Deploy.0 = Release|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|ARM64.Build.0 = Release|ARM64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|ARM64.Deploy.0 = Release|ARM64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|x64.ActiveCfg = Release|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|x64.Build.0 = Release|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|x64.Deploy.0 = Release|x64
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|x86.ActiveCfg = Release|x86
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|x86.Build.0 = Release|x86
+		{3074CE09-1E1F-4A30-A782-0D2641345E9D}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/VK UI3/Assets/BadgeLogo.scale-100.png b/VK UI3/Assets/BadgeLogo.scale-100.png
diff --git a/VK UI3/Assets/BadgeLogo.scale-125.png b/VK UI3/Assets/BadgeLogo.scale-125.png
diff --git a/VK UI3/Assets/BadgeLogo.scale-150.png b/VK UI3/Assets/BadgeLogo.scale-150.png
diff --git a/VK UI3/Assets/BadgeLogo.scale-200.png b/VK UI3/Assets/BadgeLogo.scale-200.png
diff --git a/VK UI3/Assets/BadgeLogo.scale-400.png b/VK UI3/Assets/BadgeLogo.scale-400.png
diff --git a/VK UI3/Assets/LargeTile.scale-100.png b/VK UI3/Assets/LargeTile.scale-100.png
diff --git a/VK UI3/Assets/LargeTile.scale-125.png b/VK UI3/Assets/LargeTile.scale-125.png
diff --git a/VK UI3/Assets/LargeTile.scale-150.png b/VK UI3/Assets/LargeTile.scale-150.png
diff --git a/VK UI3/Assets/LargeTile.scale-200.png b/VK UI3/Assets/LargeTile.scale-200.png
diff --git a/VK UI3/Assets/LargeTile.scale-400.png b/VK UI3/Assets/LargeTile.scale-400.png
diff --git a/VK UI3/Assets/SmallTile.scale-100.png b/VK UI3/Assets/SmallTile.scale-100.png
diff --git a/VK UI3/Assets/SmallTile.scale-125.png b/VK UI3/Assets/SmallTile.scale-125.png
diff --git a/VK UI3/Assets/SmallTile.scale-150.png b/VK UI3/Assets/SmallTile.scale-150.png
diff --git a/VK UI3/Assets/SmallTile.scale-200.png b/VK UI3/Assets/SmallTile.scale-200.png
diff --git a/VK UI3/Assets/SmallTile.scale-400.png b/VK UI3/Assets/SmallTile.scale-400.png
diff --git a/VK UI3/Assets/SplashScreen.scale-100.png b/VK UI3/Assets/SplashScreen.scale-100.png
diff --git a/VK UI3/Assets/SplashScreen.scale-125.png b/VK UI3/Assets/SplashScreen.scale-125.png
diff --git a/VK UI3/Assets/SplashScreen.scale-150.png b/VK UI3/Assets/SplashScreen.scale-150.png
diff --git a/VK UI3/Assets/SplashScreen.scale-200.png b/VK UI3/Assets/SplashScreen.scale-200.png
diff --git a/VK UI3/Assets/SplashScreen.scale-400.png b/VK UI3/Assets/SplashScreen.scale-400.png
diff --git a/VK UI3/Assets/Square150x150Logo.scale-100.png b/VK UI3/Assets/Square150x150Logo.scale-100.png
diff --git a/VK UI3/Assets/Square150x150Logo.scale-125.png b/VK UI3/Assets/Square150x150Logo.scale-125.png
diff --git a/VK UI3/Assets/Square150x150Logo.scale-150.png b/VK UI3/Assets/Square150x150Logo.scale-150.png
diff --git a/VK UI3/Assets/Square150x150Logo.scale-200.png b/VK UI3/Assets/Square150x150Logo.scale-200.png
diff --git a/VK UI3/Assets/Square150x150Logo.scale-400.png b/VK UI3/Assets/Square150x150Logo.scale-400.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/VK UI3/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/VK UI3/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/VK UI3/Assets/Square44x44Logo.scale-100.png b/VK UI3/Assets/Square44x44Logo.scale-100.png
diff --git a/VK UI3/Assets/Square44x44Logo.scale-125.png b/VK UI3/Assets/Square44x44Logo.scale-125.png
diff --git a/VK UI3/Assets/Square44x44Logo.scale-150.png b/VK UI3/Assets/Square44x44Logo.scale-150.png
diff --git a/VK UI3/Assets/Square44x44Logo.scale-200.png b/VK UI3/Assets/Square44x44Logo.scale-200.png
diff --git a/VK UI3/Assets/Square44x44Logo.scale-400.png b/VK UI3/Assets/Square44x44Logo.scale-400.png
diff --git a/VK UI3/Assets/Square44x44Logo.targetsize-16.png b/VK UI3/Assets/Square44x44Logo.targetsize-16.png
diff --git a/VK UI3/Assets/Square44x44Logo.targetsize-24.png b/VK UI3/Assets/Square44x44Logo.targetsize-24.png
diff --git a/VK UI3/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/VK UI3/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/VK UI3/Assets/Square44x44Logo.targetsize-256.png b/VK UI3/Assets/Square44x44Logo.targetsize-256.png
diff --git a/VK UI3/Assets/Square44x44Logo.targetsize-32.png b/VK UI3/Assets/Square44x44Logo.targetsize-32.png
diff --git a/VK UI3/Assets/Square44x44Logo.targetsize-48.png b/VK UI3/Assets/Square44x44Logo.targetsize-48.png
diff --git a/VK UI3/Assets/StoreLogo.scale-100.png b/VK UI3/Assets/StoreLogo.scale-100.png
diff --git a/VK UI3/Assets/StoreLogo.scale-125.png b/VK UI3/Assets/StoreLogo.scale-125.png
diff --git a/VK UI3/Assets/StoreLogo.scale-150.png b/VK UI3/Assets/StoreLogo.scale-150.png
diff --git a/VK UI3/Assets/StoreLogo.scale-200.png b/VK UI3/Assets/StoreLogo.scale-200.png
diff --git a/VK UI3/Assets/StoreLogo.scale-400.png b/VK UI3/Assets/StoreLogo.scale-400.png
diff --git a/VK UI3/Assets/Wide310x150Logo.scale-100.png b/VK UI3/Assets/Wide310x150Logo.scale-100.png
diff --git a/VK UI3/Assets/Wide310x150Logo.scale-125.png b/VK UI3/Assets/Wide310x150Logo.scale-125.png
diff --git a/VK UI3/Assets/Wide310x150Logo.scale-150.png b/VK UI3/Assets/Wide310x150Logo.scale-150.png
diff --git a/VK UI3/Assets/Wide310x150Logo.scale-200.png b/VK UI3/Assets/Wide310x150Logo.scale-200.png
diff --git a/VK UI3/Assets/Wide310x150Logo.scale-400.png b/VK UI3/Assets/Wide310x150Logo.scale-400.png
diff --git a/VK UI3/MainWindow.xaml.cs b/VK UI3/MainWindow.xaml.cs
@@ -190,17 +190,21 @@ public struct MINMAXINFO
         }
         private static IntPtr SetWindowLong(HWND hWnd, WINDOW_LONG_PTR_INDEX nIndex, IntPtr newProc)
         {
-#if X64
-        return PInvoke.SetWindowLongPtr(hWnd, nIndex, newProc);
-#else
-            return new IntPtr(PInvoke.SetWindowLong(hWnd, nIndex, newProc.ToInt32()));
-#endif
+            if (Environment.Is64BitOperatingSystem)
+            {
+                return PInvoke.SetWindowLongPtr(hWnd, nIndex, newProc);
+            }
+            else
+            {
+                return new IntPtr(PInvoke.SetWindowLong(hWnd, nIndex, newProc.ToInt32()));
+            }
         }
 
 
 
 
 
+
         private IntPtr NewWindowProc(HWND hWnd, uint Msg, WPARAM wParam, IntPtr lParam)
         {
             switch (Msg)

diff --git a/VK UI3/Package.appxmanifest b/VK UI3/Package.appxmanifest