Use Mile.Aria2 to replace the official Aria2

Gaoyifei1011 · Apr 5, 2023 · f552866 · f552866
1 parent 479d773
commit f552866
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 24 deletions.
diff --git a/Description/README_EN-US.md b/Description/README_EN-US.md
@@ -56,9 +56,9 @@ All the content of the program has been developed
 
 ### Project References (Sort by alphabetical order)
 
-> * [Aira2](https://aria2.github.io)&emsp;
-> * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
+> * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
+> * [Mile.Aria2](https://github.com/ProjectMile/Mile.Aria2)&emsp;
 > * [Mile.Xaml](https://github.com/ProjectMile/Mile.Xaml)&emsp;
 
 [Code referenced or used during the learning process](https://github.com/Gaoyifei1011/GetStoreApp/blob/master/Description/StudyReferenceCode.md)&emsp;

diff --git a/Description/README_ZH-CN.md b/Description/README_ZH-CN.md
@@ -56,9 +56,9 @@
 
 ### 项目引用（按英文首字母排序）
 
-> * [Aira2](https://aria2.github.io)&emsp;
-> * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
+> * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
+> * [Mile.Aria2](https://github.com/ProjectMile/Mile.Aria2)&emsp;
 > * [Mile.Xaml](https://github.com/ProjectMile/Mile.Xaml)&emsp;
  
 [学习过程中参考或使用的代码](https://github.com/Gaoyifei1011/GetStoreApp/blob/master/Description/StudyReferenceCode.md)&emsp;

diff --git a/GetStoreApp/Aria2/Aria2cARM64.exe b/GetStoreApp/Aria2/Aria2cARM64.exe
diff --git a/GetStoreApp/Aria2/Aria2cX64.exe b/GetStoreApp/Aria2/Aria2cX64.exe
diff --git a/GetStoreApp/Aria2/Aria2cX86.exe b/GetStoreApp/Aria2/Aria2cX86.exe
diff --git a/GetStoreApp/Aria2/Mile.Aria2.ARM64.exe b/GetStoreApp/Aria2/Mile.Aria2.ARM64.exe
diff --git a/GetStoreApp/Aria2/Mile.Aria2.X64.exe b/GetStoreApp/Aria2/Mile.Aria2.X64.exe
diff --git a/GetStoreApp/Aria2/Mile.Aria2.X86.exe b/GetStoreApp/Aria2/Mile.Aria2.X86.exe
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -15,7 +15,7 @@
     <EnableMsixTooling>false</EnableMsixTooling>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
     <FileAlignment>512</FileAlignment>
-    <FileVersion>1.4.323.0</FileVersion>
+    <FileVersion>1.4.405.0</FileVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
@@ -43,7 +43,7 @@
     <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <TrimMode>partial</TrimMode>
-    <Version>1.4.323.0</Version>
+    <Version>1.4.405.0</Version>
     <UseWindowsForms>False</UseWindowsForms>
     <UseWinUI>true</UseWinUI>
     <UseWPF>False</UseWPF>
@@ -91,17 +91,17 @@
     <Content Include="Aria2\Aria2c.conf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Aria2\Aria2cARM64.exe" Link="Aria2\Aria2c.exe">
+    <Content Include="Aria2\Mile.Aria2.ARM64.exe" Link="Aria2\Mile.Aria2.exe">
       <CopyToOutputDirectory Condition="'$(Platform)'=='x86'">Never</CopyToOutputDirectory>
       <CopyToOutputDirectory Condition="'$(Platform)'=='x64'">Never</CopyToOutputDirectory>
       <CopyToOutputDirectory Condition="'$(Platform)'=='ARM64'">Always</CopyToOutputDirectory>
     </Content>    
-    <Content Include="Aria2\Aria2cX64.exe" Link="Aria2\Aria2c.exe">
+    <Content Include="Aria2\Mile.Aria2.X64.exe" Link="Aria2\Mile.Aria2.exe">
       <CopyToOutputDirectory Condition="'$(Platform)'=='x86'">Never</CopyToOutputDirectory>
       <CopyToOutputDirectory Condition="'$(Platform)'=='x64'">Always</CopyToOutputDirectory>
       <CopyToOutputDirectory Condition="'$(Platform)'=='ARM64'">Never</CopyToOutputDirectory>
     </Content>
-    <Content Include="Aria2\Aria2cX86.exe" Link="Aria2\Aria2c.exe">
+    <Content Include="Aria2\Mile.Aria2.X86.exe" Link="Aria2\Mile.Aria2.exe">
       <CopyToOutputDirectory Condition="'$(Platform)'=='x86'">Always</CopyToOutputDirectory>
       <CopyToOutputDirectory Condition="'$(Platform)'=='x64'">Never</CopyToOutputDirectory>
       <CopyToOutputDirectory Condition="'$(Platform)'=='ARM64'">Never</CopyToOutputDirectory>

diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      生成号
 //      修订号
 //
-[assembly: AssemblyVersion("1.4.323.0")]
-[assembly: AssemblyFileVersion("1.4.323.0")]
+[assembly: AssemblyVersion("1.4.405.0")]
+[assembly: AssemblyFileVersion("1.4.405.0")]
diff --git a/GetStoreApp/Services/Controls/Download/Aria2Service.cs b/GetStoreApp/Services/Controls/Download/Aria2Service.cs
@@ -17,7 +17,7 @@ namespace GetStoreApp.Services.Controls.Download
     /// </summary>
     public static class Aria2Service
     {
-        private static string Aria2FilePath { get; } = string.Format(@"{0}\{1}", InfoHelper.GetAppInstalledLocation(), @"Aria2\Aria2c.exe");
+        private static string Aria2FilePath { get; } = string.Format(@"{0}\{1}", InfoHelper.GetAppInstalledLocation(), @"Aria2\Mile.Aria2.exe");
 
         private static string DefaultAria2ConfPath { get; } = string.Format(@"{0}\{1}", InfoHelper.GetAppInstalledLocation(), @"Aria2\Aria2c.conf");
 

diff --git a/GetStoreApp/Services/Shell/DownloadService.cs b/GetStoreApp/Services/Shell/DownloadService.cs
@@ -147,7 +147,7 @@ private static unsafe void DownloadFile(string fileLink)
                     null,
                     string.Format(
                         @"{0}\{1} --file-allocation=none -d ""{2}"" ""{3}""",
-                        InfoHelper.GetAppInstalledLocation(), @"Aria2\Aria2c.exe",
+                        InfoHelper.GetAppInstalledLocation(), @"Aria2\Mile.Aria2.exe",
                         DownloadOptionsService.DownloadFolder.Path, fileLink
                         ),
                     IntPtr.Zero,

diff --git a/GetStoreApp/Styles/Expander.xaml b/GetStoreApp/Styles/Expander.xaml
@@ -273,13 +273,15 @@
         </Setter>
     </Style>
 
+    <!--  关于页面的扩展器格式  -->
     <Style x:Key="ExpanderAboutStyle" TargetType="Expander">
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="IsExpanded" Value="True" />
         <Setter Property="Padding" Value="16,5,0,5" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     </Style>
 
+    <!--  设置页面的扩展器格式  -->
     <Style x:Key="ExpanderSettingsStyle" TargetType="Expander">
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="IsExpanded" Value="True" />

diff --git a/GetStoreApp/ViewModels/Controls/About/ReferenceViewModel.cs b/GetStoreApp/ViewModels/Controls/About/ReferenceViewModel.cs
@@ -10,10 +10,10 @@ public sealed class ReferenceViewModel
         //项目引用信息
         public Dictionary<string, string> ReferenceDict { get; } = new Dictionary<string, string>
         {
-            {"Aira2","https://aria2.github.io" },
-            {"Microsoft.Windows.SDK.Contracts","https://aka.ms/WinSDKProjectURL" },
             {"Microsoft.WindowsAppSDK","https://github.com/microsoft/windowsappsdk" },
-            {"Mile.Xaml","https://github.com/ProjectMile/Mile.Xaml" },
+            {"Microsoft.Windows.SDK.Contracts","https://aka.ms/WinSDKProjectURL" },
+            {"Mile.Aria2","https://github.com/ProjectMile/Mile.Aria2" },
+            {"Mile.Xaml","https://github.com/ProjectMile/Mile.Xaml" }
         };
     }
 }
diff --git a/GetStoreAppHelper/GetStoreAppHelper.csproj b/GetStoreAppHelper/GetStoreAppHelper.csproj
@@ -10,7 +10,7 @@
     <DisableXbfLineInfo>False</DisableXbfLineInfo>
     <EnableTypeInfoReflection>true</EnableTypeInfoReflection>
     <FileAlignment>512</FileAlignment>
-    <FileVersion>1.4.323.0</FileVersion>
+    <FileVersion>1.4.405.0</FileVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>latest</LangVersion>
     <OutputType>WinExe</OutputType>

diff --git a/GetStoreAppHelper/Properties/AssemblyInfo.cs b/GetStoreAppHelper/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      生成号
 //      修订号
 //
-[assembly: AssemblyVersion("1.4.323.0")]
-[assembly: AssemblyFileVersion("1.4.323.0")]
+[assembly: AssemblyVersion("1.4.405.0")]
+[assembly: AssemblyFileVersion("1.4.405.0")]
diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Gaoyifei1011.GetStoreApp"
     Publisher="CN=高怡飞"
-    Version="1.4.323.0" />
+    Version="1.4.405.0" />
 
   <Properties>
     <DisplayName>ms-resource:PackageDisplayName</DisplayName>
@@ -90,9 +90,9 @@
   </Applications>
 
   <Extensions>
-    <!--aria2c.exe进程预定义的防火墙规则-->
+    <!--Mile.Aria2.exe进程预定义的防火墙规则-->
     <desktop2:Extension Category="windows.firewallRules">
-      <desktop2:FirewallRules Executable="Aria2/Aria2c.exe">
+      <desktop2:FirewallRules Executable="Aria2/Mile.Aria2.exe">
         <desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all"/>
         <desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all"/>
       </desktop2:FirewallRules>

diff --git a/README.md b/README.md
@@ -63,9 +63,9 @@
 
 ### 项目引用（按英文首字母排序）
 
-> * [Aira2](https://aria2.github.io)&emsp;
-> * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
+> * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
+> * [Mile.Aria2](https://github.com/ProjectMile/Mile.Aria2)&emsp;
 > * [Mile.Xaml](https://github.com/ProjectMile/Mile.Xaml)&emsp;
 
 [学习过程中参考或使用的代码](https://github.com/Gaoyifei1011/GetStoreApp/blob/master/Description/StudyReferenceCode.md)&emsp;