v0.1.20更新

Paving-Base · Nov 25, 2022 · 905d554 · 905d554
1 parent d655bcc
commit 905d554
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 52 deletions.
diff --git a/APKInstaller.sln b/APKInstaller.sln
@@ -14,26 +14,21 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|arm64 = Debug|arm64
+		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|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|Any CPU.Build.0 = Debug|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|ARM.ActiveCfg = Debug|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|ARM.Build.0 = Debug|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|ARM.Deploy.0 = Debug|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|arm64.ActiveCfg = Debug|arm64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|arm64.Build.0 = Debug|arm64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|arm64.Deploy.0 = Debug|arm64
+		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|x64.ActiveCfg = Debug|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|x64.Build.0 = Debug|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Debug|x64.Deploy.0 = Debug|x64
@@ -43,12 +38,9 @@ Global
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|Any CPU.ActiveCfg = Release|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|Any CPU.Build.0 = Release|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|Any CPU.Deploy.0 = Release|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|ARM.ActiveCfg = Release|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|ARM.Build.0 = Release|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|ARM.Deploy.0 = Release|x64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|arm64.ActiveCfg = Release|arm64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|arm64.Build.0 = Release|arm64
-		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|arm64.Deploy.0 = Release|arm64
+		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|ARM64.Build.0 = Release|ARM64
+		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|ARM64.Deploy.0 = Release|ARM64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|x64.ActiveCfg = Release|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|x64.Build.0 = Release|x64
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|x64.Deploy.0 = Release|x64
@@ -57,40 +49,32 @@ Global
 		{DA7A7229-52EB-4054-BFD6-B454D694FBEC}.Release|x86.Deploy.0 = Release|x86
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|arm64.Build.0 = Debug|Any CPU
+		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Debug|x86.Build.0 = Debug|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|ARM.Build.0 = Release|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|arm64.Build.0 = Release|Any CPU
+		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|ARM64.Build.0 = Release|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|x64.Build.0 = Release|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|x86.ActiveCfg = Release|Any CPU
 		{A4B1E6D3-CFEF-4369-9B5F-197E3F921FD2}.Release|x86.Build.0 = Release|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|arm64.Build.0 = Debug|Any CPU
+		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Debug|x86.Build.0 = Debug|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|ARM.Build.0 = Release|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|arm64.Build.0 = Release|Any CPU
+		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|ARM64.Build.0 = Release|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|x64.ActiveCfg = Release|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|x64.Build.0 = Release|Any CPU
 		{ACD2CC04-7C62-4056-8523-633FB69552C5}.Release|x86.ActiveCfg = Release|Any CPU

diff --git a/APKInstaller/APKInstaller/APKInstaller.csproj b/APKInstaller/APKInstaller/APKInstaller.csproj
@@ -10,7 +10,7 @@
     <LangVersion>preview</LangVersion>
     <OutputType>WinExe</OutputType>
     <PackageProjectUrl>https://github.com/Paving-Base/APK-Installer</PackageProjectUrl>
-    <Platforms>x86;x64;arm64</Platforms>
+    <Platforms>x86;x64;ARM64</Platforms>
     <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
     <RepositoryUrl>https://github.com/Paving-Base/APK-Installer</RepositoryUrl>
     <RootNamespace>APKInstaller</RootNamespace>
@@ -35,12 +35,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <AllowedReferenceRelatedFileExtensions>.allowedextension</AllowedReferenceRelatedFileExtensions>
-    <DebugType>embedded</DebugType>
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Remove="AppPackages\**" />
     <EmbeddedResource Remove="AppPackages\**" />

diff --git a/APKInstaller/APKInstaller/Controls/CapabilitiesInfoControl.xaml b/APKInstaller/APKInstaller/Controls/CapabilitiesInfoControl.xaml
@@ -46,7 +46,7 @@
                     Visibility="Collapsed" />
             </Grid>
         </ScrollViewer>
-        <Button
+        <HyperlinkButton
             x:Name="MoreButton"
             x:Uid="/CapabilitiesInfoControl/MoreButton"
             Grid.Row="2"
@@ -55,7 +55,6 @@
             Background="Transparent"
             BorderThickness="0"
             Click="MoreButton_Click"
-            Foreground="{StaticResource SystemAccentColor}"
             TabIndex="4"
             UseSystemFocusVisuals="True" />
     </Grid>

diff --git a/APKInstaller/APKInstaller/Helpers/SettingsHelper.cs b/APKInstaller/APKInstaller/Helpers/SettingsHelper.cs
@@ -11,6 +11,7 @@
 using Windows.ApplicationModel;
 using Windows.Storage;
 using Windows.UI.ViewManagement;
+using IObjectSerializer = CommunityToolkit.Common.Helpers.IObjectSerializer;
 
 namespace APKInstaller.Helpers
 {
@@ -136,9 +137,9 @@ private static LoggingConfiguration GetDefaultReleaseConfiguration()
         }
     }
 
-    public class SystemTextJsonObjectSerializer : CommunityToolkit.Common.Helpers.IObjectSerializer
+    public class SystemTextJsonObjectSerializer : IObjectSerializer
     {
-        string CommunityToolkit.Common.Helpers.IObjectSerializer.Serialize<T>(T value) => JsonSerializer.Serialize(value);
+        string IObjectSerializer.Serialize<T>(T value) => JsonSerializer.Serialize(value);
 
         public T Deserialize<T>(string value) => JsonSerializer.Deserialize<T>(value);
     }

diff --git a/APKInstaller/APKInstaller/Helpers/UpdateHelper.cs b/APKInstaller/APKInstaller/Helpers/UpdateHelper.cs
@@ -1,5 +1,6 @@
 using APKInstaller.Models;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -69,15 +70,15 @@ public static class UpdateHelper
 
         private static SystemVersionInfo GetAsVersionInfo(string version)
         {
-            System.Collections.Generic.List<int> nums = GetVersionNumbers(version).Split('.').Select(int.Parse).ToList();
+            List<int> nums = GetVersionNumbers(version).Split('.').Select(int.Parse).ToList();
 
             return nums.Count <= 1
                 ? new SystemVersionInfo(nums[0], 0, 0, 0)
                 : nums.Count <= 2
                     ? new SystemVersionInfo(nums[0], nums[1], 0, 0)
                     : nums.Count <= 3
-                                    ? new SystemVersionInfo(nums[0], nums[1], nums[2], 0)
-                                    : new SystemVersionInfo(nums[0], nums[1], nums[2], nums[3]);
+                        ? new SystemVersionInfo(nums[0], nums[1], nums[2], 0)
+                        : new SystemVersionInfo(nums[0], nums[1], nums[2], nums[3]);
         }
 
         private static string GetVersionNumbers(string version)

diff --git a/APKInstaller/APKInstaller/Properties/PublishProfiles/win10-arm64.pubxml b/APKInstaller/APKInstaller/Properties/PublishProfiles/win10-arm64.pubxml
@@ -14,7 +14,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
     <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
     <!-- See https://github.com/microsoft/CsWinRT/issues/373 -->
-    <PublishTrimmed Condition="'$(SelfContained)' == 'True' And '$(PublishReadyToRun)' == 'True'">True</PublishTrimmed>
+    <PublishTrimmed>$(SelfContained)</PublishTrimmed>
     <BuiltInComInteropSupport>$(PublishTrimmed)</BuiltInComInteropSupport>
   </PropertyGroup>
 </Project>
diff --git a/APKInstaller/APKInstaller/Properties/PublishProfiles/win10-x64.pubxml b/APKInstaller/APKInstaller/Properties/PublishProfiles/win10-x64.pubxml
@@ -8,13 +8,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>x64</Platform>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <PublishDir>bin\$(Platform)\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-    <SelfContained Condition="'$(Configuration)' == 'Debug'">True</SelfContained>
+    <SelfContained Condition="'$(Configuration)' == 'Debug'">False</SelfContained>
     <SelfContained Condition="'$(Configuration)' != 'Debug'">True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">True</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
     <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
     <!-- See https://github.com/microsoft/CsWinRT/issues/373 -->
-    <PublishTrimmed Condition="'$(SelfContained)' == 'True' And '$(PublishReadyToRun)' == 'True'">True</PublishTrimmed>
+    <PublishTrimmed>$(SelfContained)</PublishTrimmed>
     <BuiltInComInteropSupport>$(PublishTrimmed)</BuiltInComInteropSupport>
   </PropertyGroup>
 </Project>
diff --git a/APKInstaller/APKInstaller/Properties/PublishProfiles/win10-x86.pubxml b/APKInstaller/APKInstaller/Properties/PublishProfiles/win10-x86.pubxml
@@ -14,7 +14,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
     <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
     <!-- See https://github.com/microsoft/CsWinRT/issues/373 -->
-    <PublishTrimmed Condition="'$(SelfContained)' == 'True' And '$(PublishReadyToRun)' == 'True'">True</PublishTrimmed>
+    <PublishTrimmed>$(SelfContained)</PublishTrimmed>
     <BuiltInComInteropSupport>$(PublishTrimmed)</BuiltInComInteropSupport>
   </PropertyGroup>
 </Project>
diff --git a/build.ps1 b/build.ps1
@@ -4,4 +4,4 @@ dotnet restore
 
 msbuild /p:Configuration=Release /p:Platform=x64 /p:AppxPackageDir=AppPackages/ /p:UapAppxPackageBuildMode=StoreUpload /p:AppxBundle=Never /p:GenerateAppxPackageOnBuild=true
 msbuild /p:Configuration=Release /p:Platform=x86 /p:AppxPackageDir=AppPackages/ /p:UapAppxPackageBuildMode=StoreUpload /p:AppxBundle=Never /p:GenerateAppxPackageOnBuild=true
-msbuild /p:Configuration=Release /p:Platform=arm64 /p:AppxPackageDir=AppPackages/ /p:UapAppxPackageBuildMode=StoreUpload /p:AppxBundle=Never /p:GenerateAppxPackageOnBuild=true
+msbuild /p:Configuration=Release /p:Platform=ARM64 /p:AppxPackageDir=AppPackages/ /p:UapAppxPackageBuildMode=StoreUpload /p:AppxBundle=Never /p:GenerateAppxPackageOnBuild=true