Finish task and publish 2.3.826.0 version(Experimental)

Gaoyifei1011 · Aug 26, 2023 · 6f2dcbd · 6f2dcbd
1 parent 94a6a60
commit 6f2dcbd
Show file tree

Hide file tree

Showing 28 changed files with 155 additions and 226 deletions.
diff --git a/Description/README_EN-US.md b/Description/README_EN-US.md
@@ -75,13 +75,16 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 | Console applications (quickly download)                  | Completed                                                                                                          |
 | Program performance optimization                         | Completed                                                                                                          |
 | Interface modernization                                  | Completed                                                                                                          |
+| Package management                                       | Completed                                                                                                          |
 
 All the content of the program has been developed
 
 ------
 
 ### Project References (Sort by alphabetical order)
 
+> * [Microsoft.NET.ILLink.Analyzers](https://github.com/dotnet/linker)&emsp;
+> * [Microsoft.NET.ILLink.Tasks](https://github.com/dotnet/linker)&emsp;
 > * [Microsoft.Windows.CsWinRT](https://github.com/microsoft/cswinrt)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
 > * [Microsoft.WindowsPackageManager.ComInterop](https://github.com/microsoft/winget-cli)&emsp;

diff --git a/Description/README_ZH-CN.md b/Description/README_ZH-CN.md
@@ -75,13 +75,16 @@
 | 控制台应用程序（快速下载）      | 已完成                                                             |
 | 程序性能优化                    | 已完成                                                             |
 | 界面现代化改造                  | 已完成                                                             |
+| 应用包管理                      | 已完成                                                             |
 
 程序所有功能都已开发完成
 
 ------
 
 ### 项目引用（按英文首字母排序）
 
+> * [Microsoft.NET.ILLink.Analyzers](https://github.com/dotnet/linker)&emsp;
+> * [Microsoft.NET.ILLink.Tasks](https://github.com/dotnet/linker)&emsp;
 > * [Microsoft.Windows.CsWinRT](https://github.com/microsoft/cswinrt)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
 > * [Microsoft.WindowsPackageManager.ComInterop](https://github.com/microsoft/winget-cli)&emsp;

diff --git a/Description/StudyReferenceCode.md b/Description/StudyReferenceCode.md
@@ -3,6 +3,7 @@
 
 ------
 
+> * [开发人员主页（DevHome）](https://github.com/microsoft/devhome)&emsp;
 > * [Generating valid tokens to access Limited Access Features in Windows 10](https://www.withinrafael.com/2021/01/04/generating-valid-tokens-to-access-limited-access-features-in-windows-10)&emsp;
 > * [IFileDialog](https://github.com/shigobu/IFileDialog)&emsp;
 > * [Null.ConsoleEx](https://github.com/SlimeNull/Null.ConsoleEx)&emsp;

diff --git a/GetStoreApp/App.xaml b/GetStoreApp/App.xaml
@@ -17,7 +17,6 @@
                 <ResourceDictionary Source="ms-appx:///Styles/InfoBar.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/ListView.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/MenuFlyout.xaml" />
-                <ResourceDictionary Source="ms-appx:///Styles/NavigationView.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/Pivot.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/ScrollBar.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/SplitButton.xaml" />

diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -111,14 +111,14 @@
     <None Include="Assets\ControlIcon\About.png" CopyToOutputDirectory="Never" />
     <None Include="Assets\ControlIcon\Settings.png" CopyToOutputDirectory="Never" />
     <None Remove="Assets\LICENSE" />
+
     <None Remove="Styles\DropDownButton.xaml" />
     <None Remove="Styles\Flyout.xaml" />
     <None Remove="Styles\HyperlinkButton.xaml" />
     <None Remove="Styles\InAppNotification.xaml" />
     <None Remove="Styles\InfoBar.xaml" />
     <None Remove="Styles\ListView.xaml" />
     <None Remove="Styles\MenuFlyout.xaml" />
-    <None Remove="Styles\NavigationView.xaml" />
     <None Remove="Styles\Pivot.xaml" />
     <None Remove="Styles\ScrollBar.xaml" />
     <None Remove="Styles\SplitButton.xaml" />
@@ -193,7 +193,6 @@
     <Page Update="Styles\InfoBar.xaml" Generator="MSBuild:Compile" />
     <Page Update="Styles\ListView.xaml" Generator="MSBuild:Compile" />
     <Page Update="Styles\MenuFlyout.xaml" Generator="MSBuild:Compile" />
-    <Page Update="Styles\NavigationView.xaml" Generator="MSBuild:Compile" />
     <Page Update="Styles\Pivot.xaml" Generator="MSBuild:Compile" />
     <Page Update="Styles\ScrollBar.xaml" Generator="MSBuild:Compile" />
     <Page Update="Styles\SplitButton.xaml" Generator="MSBuild:Compile" />

diff --git a/GetStoreApp/Helpers/Root/ResourceDictionaryHelper.cs b/GetStoreApp/Helpers/Root/ResourceDictionaryHelper.cs
@@ -21,8 +21,6 @@ public static class ResourceDictionaryHelper
 
         public static ResourceDictionary MenuFlyoutResourceDict { get; private set; }
 
-        public static ResourceDictionary NavigationViewResourceDict { get; private set; }
-
         public static ResourceDictionary PivotResourceDict { get; private set; }
 
         public static ResourceDictionary ScrollBarResourceDict { get; private set; }
@@ -41,10 +39,9 @@ public static void InitializeResourceDictionary()
             InfoBarResourceDict = Application.Current.Resources.MergedDictionaries[5];
             ListViewResourceDict = Application.Current.Resources.MergedDictionaries[6];
             MenuFlyoutResourceDict = Application.Current.Resources.MergedDictionaries[7];
-            NavigationViewResourceDict = Application.Current.Resources.MergedDictionaries[8];
-            PivotResourceDict = Application.Current.Resources.MergedDictionaries[9];
-            ScrollBarResourceDict = Application.Current.Resources.MergedDictionaries[10];
-            SplitButtonResourceDict = Application.Current.Resources.MergedDictionaries[11];
+            PivotResourceDict = Application.Current.Resources.MergedDictionaries[8];
+            ScrollBarResourceDict = Application.Current.Resources.MergedDictionaries[9];
+            SplitButtonResourceDict = Application.Current.Resources.MergedDictionaries[10];
         }
     }
 }
diff --git a/GetStoreApp/Helpers/Root/RuntimeHelper.cs b/GetStoreApp/Helpers/Root/RuntimeHelper.cs
@@ -1,5 +1,4 @@
-using GetStoreApp.WindowsAPI.PInvoke;
-using GetStoreApp.WindowsAPI.PInvoke.Advapi32;
+using GetStoreApp.WindowsAPI.PInvoke.Advapi32;
 using GetStoreApp.WindowsAPI.PInvoke.Kernel32;
 using System;
 using System.Runtime.InteropServices;

diff --git a/GetStoreApp/Models/Controls/Download/CompletedModel.cs b/GetStoreApp/Models/Controls/Download/CompletedModel.cs
@@ -1,4 +1,6 @@
-using System.ComponentModel;
+using GetStoreApp.Helpers.Converters;
+using GetStoreApp.Services.Root;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace GetStoreApp.Models.Controls.Download
@@ -8,6 +10,8 @@ namespace GetStoreApp.Models.Controls.Download
     /// </summary>
     public class CompletedModel : INotifyPropertyChanged
     {
+        private static string FileSizeToolTip = ResourceService.GetLocalized("Download/FileSizeToolTip");
+
         /// <summary>
         /// 在多选模式下，该行历史记录是否被选择的标志
         /// </summary>
@@ -128,6 +132,11 @@ public bool InstallError
 
         public event PropertyChangedEventHandler PropertyChanged;
 
+        public string GetCompletedToolTip(double size)
+        {
+            return string.Format(FileSizeToolTip, StringConverterHelper.DownloadSizeFormat(size));
+        }
+
         /// <summary>
         /// 属性值发生变化时通知更改
         /// </summary>

diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 // 程序集信息设置
 [assembly: AssemblyCopyright("Copyright ©2022-2023 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("获取商店应用")]
-[assembly: AssemblyFileVersion("2.2.826.0")]
-[assembly: AssemblyInformationalVersion("2.2.826.0")]
+[assembly: AssemblyFileVersion("2.3.826.0")]
+[assembly: AssemblyInformationalVersion("2.3.826.0")]
 [assembly: AssemblyProduct("获取商店应用")]
 [assembly: AssemblyTitle("获取商店应用")]
-[assembly: AssemblyVersion("2.2.826.0")]
+[assembly: AssemblyVersion("2.3.826.0")]
 
 // 设置程序集对COM组件的访问权限
 [assembly: ComVisible(false)]

diff --git a/GetStoreApp/Strings/en-us/Download.resw b/GetStoreApp/Strings/en-us/Download.resw
@@ -228,6 +228,9 @@
   <data name="FileNotExists" xml:space="preserve">
     <value>The file does not exist</value>
   </data>
+  <data name="FileSizeToolTip" xml:space="preserve">
+    <value>File size: {0}</value>
+  </data>
   <data name="FinishedSizeToolTip" xml:space="preserve">
     <value>Download completed: {0}</value>
   </data>

diff --git a/GetStoreApp/Strings/en-us/WinGet.resw b/GetStoreApp/Strings/en-us/WinGet.resw
@@ -265,7 +265,7 @@
     <value>Sort</value>
   </data>
   <data name="SortByDisplayName" xml:space="preserve">
-    <value>Package name</value>
+    <value>App name</value>
   </data>
   <data name="SortByPublisher" xml:space="preserve">
     <value>Publisher name</value>

diff --git a/GetStoreApp/Strings/zh-hans/Download.resw b/GetStoreApp/Strings/zh-hans/Download.resw
@@ -228,6 +228,9 @@
   <data name="FileNotExists" xml:space="preserve">
     <value>文件不存在</value>
   </data>
+  <data name="FileSizeToolTip" xml:space="preserve">
+    <value>文件大小：{0}</value>
+  </data>
   <data name="FinishedSizeToolTip" xml:space="preserve">
     <value>已下载完成：{0}</value>
   </data>

diff --git a/GetStoreApp/Strings/zh-hans/WinGet.resw b/GetStoreApp/Strings/zh-hans/WinGet.resw
@@ -265,7 +265,7 @@
     <value>排序</value>
   </data>
   <data name="SortByDisplayName" xml:space="preserve">
-    <value>应用包名称</value>
+    <value>应用名称</value>
   </data>
   <data name="SortByPublisher" xml:space="preserve">
     <value>发布者名称</value>

diff --git a/GetStoreApp/Styles/DropDownButton.xaml b/GetStoreApp/Styles/DropDownButton.xaml
@@ -32,7 +32,7 @@
                         BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{ThemeResource ControlCornerRadius}">
+                        CornerRadius="{StaticResource ControlCornerRadius}">
                         <Grid.BackgroundTransition>
                             <BrushTransition Duration="0:0:0.083" />
                         </Grid.BackgroundTransition>

diff --git a/GetStoreApp/Styles/Flyout.xaml b/GetStoreApp/Styles/Flyout.xaml
@@ -14,7 +14,7 @@
         <Setter Property="MaxWidth" Value="{ThemeResource FlyoutThemeMaxWidth}" />
         <Setter Property="MinHeight" Value="{ThemeResource FlyoutThemeMinHeight}" />
         <Setter Property="MaxHeight" Value="{ThemeResource FlyoutThemeMaxHeight}" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="FlyoutPresenter">

diff --git a/GetStoreApp/Styles/InAppNotification.xaml b/GetStoreApp/Styles/InAppNotification.xaml
@@ -13,7 +13,7 @@
         <Setter Property="Background" Value="{ThemeResource SolidBackgroundFillColorTertiaryBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource OverlayCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="notification:InAppNotification">

diff --git a/GetStoreApp/Styles/InfoBar.xaml b/GetStoreApp/Styles/InfoBar.xaml
@@ -10,7 +10,7 @@
         <Setter Property="BorderThickness" Value="{ThemeResource InfoBarBorderThickness}" />
         <Setter Property="AutomationProperties.LandmarkType" Value="Custom" />
         <Setter Property="AutomationProperties.IsDialog" Value="True" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Template">
             <Setter.Value>

diff --git a/GetStoreApp/Styles/MenuFlyout.xaml b/GetStoreApp/Styles/MenuFlyout.xaml
@@ -16,7 +16,7 @@
         <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
         <Setter Property="MaxWidth" Value="{ThemeResource FlyoutThemeMaxWidth}" />
         <Setter Property="MinHeight" Value="{StaticResource MenuFlyoutThemeMinHeight}" />
-        <Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource OverlayCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="MenuFlyoutPresenter">
@@ -57,7 +57,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="MenuFlyoutItem">
@@ -197,7 +197,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="MenuFlyoutItem">
@@ -319,7 +319,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="MenuFlyoutItem">
@@ -416,7 +416,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="MenuFlyoutItem">