Finish task and publish 2.0.530.0 version

1.Finish task and publish 2.0.530.0 version 2.Update Readme.md
Gaoyifei1011 · May 30, 2023 · 2f1939f · 2f1939f
1 parent 37a026a
commit 2f1939f
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 64 deletions.
diff --git a/Description/README_EN-US.md b/Description/README_EN-US.md
@@ -15,6 +15,7 @@ The Microsoft Store provides a distribution, download, and update channel for ap
 > * Bypass Microsoft Store downloads and deploy Microsoft Store apps offline
 > * Access the historical links that have been successfully obtained and the download tasks that were added
 > * Access the web version (when there is a problem with the interface) and download it using the app's built-in download tool
+> * Install, uninstall, and upgrade the WinGet package
 
 Note: The app can't bypass the Microsoft Store's billing channels, and if the app you're getting is a paid app, download it after purchasing it from the Microsoft Store.
 
@@ -23,16 +24,21 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 ### Screenshot of the app
 
 #### <p align="center">The app successfully gets the interface</p>
-![image](https://user-images.githubusercontent.com/49179966/235411271-19757110-c06f-41f8-94cd-a5f6c46d9d27.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/75d5bc77-2680-4692-9f2e-fa1126c44ea5)
+
+#### <p align="center">WinGet package management interface</p>
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/9788e38e-4614-4f4f-b080-ed9c72c57995)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/5938b36c-d4db-4784-b020-02251422875c)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/59a56868-7762-4db8-b8b9-31cad199c97f)
 #### <p align="center">History Record</p>
-![image](https://user-images.githubusercontent.com/49179966/235411326-0a2dfcb8-dc5a-4178-98a3-f3864e69ad21.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/2a00ef92-ca15-4679-a962-49a5396aee96)
 #### <p align="center">Download Management</p>
-![image](https://user-images.githubusercontent.com/49179966/213075014-8141a1ca-c589-43c1-ab6d-68dd5215feea.png)
-![image](https://user-images.githubusercontent.com/49179966/235411434-a6b49f2e-c4fc-43cb-a06e-face5580ed27.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/2177ee35-80a8-49fc-9c99-b82fb92fe470)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/7764c08f-e1b8-4bdd-ab25-e8f9cee94f50)
 #### <p align="center">Access Webpage</p>
-![image](https://user-images.githubusercontent.com/49179966/235411495-5507b27c-68a4-480f-abf0-d419889b173b.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/f3d50960-0afe-43ff-bc1a-bc257633f001)
 #### <p align="center">Application Descriptions</p>
-![image](https://user-images.githubusercontent.com/49179966/235411549-e5cd3413-e2cd-4d27-8813-93bb090832de.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/0743b5a6-30a4-4f71-9b4e-a38c3bc58061)
 
 ------
 
@@ -41,7 +47,7 @@ Note: The app can't bypass the Microsoft Store's billing channels, and if the ap
 | Project progress                                         | Development progress                                                                                               |
 | ---------------------------------------------------------| -------------------------------------------------------------------------------------------------------------------|
 | Microsoft Store link to get                              | Completed                                                                                                          |
-| WinGet package to get                                    | Processing([#1](https://github.com/Gaoyifei1011/GetStoreApp/issues/1))                                             |
+| WinGet package to get                                    | Completed                                                                                                          |
 | History (records used links)                             | Completed                                                                                                          |
 | Download the file from the generated link                | Completed                                                                                                          |
 | Deploy the app offline after the download is complete    | Completed                                                                                                          |
@@ -80,8 +86,9 @@ All the content of the program has been developed
 #### <p align="center">Tools that must be installed</p>
 
 > * [Microsoft Visual Studio 2022](https://visualstudio.microsoft.com/) 
-> * . NET Desktop Development (Installed in Visual Studio Installer, .NET SDK Version 7.0 and .NET Framework SDK 4.8.1)
-> * [Microsoft Edge WebView2 Runtime](https://developer.microsoft.com/zh-cn/microsoft-edge/webview2/)(install recommendedly)
+> * . NET Desktop Development (Installed in Visual Studio Installer, .NET SDK Version 7.0)
+> * [WinGet package manager](https://www.microsoft.com/store/productId/9NBLGGH4NNS1) (install recommendedly)
+> * [Microsoft Edge WebView2 Runtime](https://developer.microsoft.com/zh-cn/microsoft-edge/webview2/) (install recommendedly)
 
 #### <p align="center">Compilation steps</p>
 
@@ -121,7 +128,7 @@ All the content of the program has been developed
 ### Other content
 
 > * This is the first small project I personally practiced when learning C#, because the advanced content about C# is not very deep, so there are many deficiencies in code content and quality, I hope to cover more.
-> * The project runs for 10 months from May 20, 2020 to March 20, 2023.
+> * The project will last 12 months and 10 days from 20 May 2020 to 30 May 2023.
 > * This project is an open source project licensed under the MIT license, and you may modify, distribute, or merge copies with new copies. If you use the project, please do not use it for illegal purposes, and the developer will not be held responsible.
 
 ------

diff --git a/Description/README_ZH-CN.md b/Description/README_ZH-CN.md
@@ -15,6 +15,7 @@
 > * 绕开微软商店下载并离线部署 Microsoft Store 应用
 > * 访问已经成功获取的历史链接和添加的下载任务
 > * 访问网页版（接口出现问题时），并使用应用内置的下载工具下载
+> * WinGet 程序包的安装、卸载和升级
 
 注意：该应用不能绕过微软商店的付费渠道，如果您要获取的应用是付费应用，请从微软商店购买后下载。
 
@@ -23,17 +24,20 @@
 ### 应用截图
 
 #### <p align="center">应用成功获取界面</p>
-![image](https://user-images.githubusercontent.com/49179966/235410865-f0d02daa-b7ac-40f2-8ca6-1143366edb2f.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/441a6ad2-7829-4986-994e-f140f0b60853)
+#### <p align="center">WinGet 程序包管理界面</p>
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/28200b23-8704-40d8-92ec-767eb38c57c3)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/91ae5f3b-eb7b-4c95-b603-0487fadd1534)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/d177cbec-1438-4496-9d6b-6cd8a2708493)
 #### <p align="center">历史记录</p>
-![image](https://user-images.githubusercontent.com/49179966/235410882-4d1da348-9e1f-4f7c-be1a-9921ff5b8b74.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/0aee441e-3714-4bf3-b817-8cb8cb516737)
 #### <p align="center">下载管理</p>
-![image](https://user-images.githubusercontent.com/49179966/235410909-a9ff827e-64fe-4e12-b647-f84fe8894ac6.png)
-![image](https://user-images.githubusercontent.com/49179966/235410932-63265a8c-46c8-4127-9d5f-04bcf8a2c2a0.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/42a5139a-f845-48f9-8b64-30efbadda13c)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/dc6bdb4a-1c6a-4c3c-be46-93db03c5b1fa)
 #### <p align="center">访问网页版</p>
-![image](https://user-images.githubusercontent.com/49179966/235410984-65e66521-4095-404b-96f8-7e7043257bba.png)
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/6cad3ee4-9b81-49e0-8c8e-00492de005a2)
 #### <p align="center">应用说明</p>
-![image](https://user-images.githubusercontent.com/49179966/235411005-1209fd25-c0f8-483c-8a0d-f6f679630156.png)
-
+![image](https://github.com/Gaoyifei1011/GetStoreApp/assets/49179966/3a48382d-a53f-4960-951d-ee9f16a7a7d9)
 
 ------
 
@@ -42,7 +46,7 @@
 | 项目内容                        | 开发进展                                                           |
 | --------------------------------| -------------------------------------------------------------------|
 | 微软商店链接获取                | 已完成                                                             |
-| WinGet 程序包获取               | 进行中([#1](https://github.com/Gaoyifei1011/GetStoreApp/issues/1)) |
+| WinGet 程序包获取               | 已完成                                                             |
 | 历史记录（记录使用过的链接）    | 已完成                                                             |
 | 通过生成的链接下载文件          | 已完成                                                             |
 | 下载完成后离线部署应用          | 已完成                                                             |
@@ -81,7 +85,8 @@
 #### <p align="center">必须安装的工具</p>
 
 > * [Microsoft Visual Studio 2022](https://visualstudio.microsoft.com/) 
-> * .NET桌面开发（Visual Studio Installer中安装，.NET SDK 版本 7.0 和 .NET Framework SDK 4.8.1）
+> * .NET桌面开发（Visual Studio Installer中安装，.NET SDK 版本 7.0）
+> * [WinGet 程序包管理器](https://www.microsoft.com/store/productId/9NBLGGH4NNS1) （推荐安装）
 > * [Microsoft Edge WebView2 运行时](https://developer.microsoft.com/zh-cn/microsoft-edge/webview2/) （推荐安装）
 
 #### <p align="center">编译步骤</p>
@@ -122,7 +127,7 @@
 ### 其他内容
 
 > * 这是我个人在学习c#时自己动手实践的第一个小项目，由于在关于c#的高级内容中涉及的并不是很深，所以在代码内容和质量上存在着很多的欠缺，希望能多多包涵。
-> * 该项目自2020年5月20日起，到2023年3月20日结束，共历时10个月。
+> * 该项目自2020年5月20日起，到2023年5月30日结束，共历时12个月零10天。
 > * 该项目是基于MIT协议许可的开源项目，您可以修改、分发该项目或将副本与新副本合并。如果您使用了该项目，请勿用于非法用途，本开发者不会承担任何责任。
 
 ------

diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -15,7 +15,7 @@
     <DisableXbfLineInfo>False</DisableXbfLineInfo>
     <EnableMsixTooling>false</EnableMsixTooling>
     <FileAlignment>512</FileAlignment>
-    <FileVersion>2.0.529.0</FileVersion>
+    <FileVersion>2.0.530.0</FileVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
     <ImplicitUsings>disable</ImplicitUsings>
@@ -24,7 +24,6 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Optimize>False</Optimize>
     <OutputType>WinExe</OutputType>
-    <PackageIcon>Assets\GetStoreApp.png</PackageIcon>
     <Platforms>x86;x64;ARM64</Platforms>
     <Product>获取商店应用 桌面程序</Product>
     <PublishProtocol>FileSystem</PublishProtocol>
@@ -40,7 +39,7 @@
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <TrimMode>partial</TrimMode>
     <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
-    <Version>2.0.529.0</Version>
+    <Version>2.0.530.0</Version>
     <UseWinUI>true</UseWinUI>
     <WindowsAppSDKDeploymentManagerInitialize>false</WindowsAppSDKDeploymentManagerInitialize>
     <WindowsAppSDKSelfContained>false</WindowsAppSDKSelfContained>

diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -9,11 +9,11 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyDescription("获取商店应用 桌面程序")]
-[assembly: AssemblyFileVersion("2.0.529.0")]
+[assembly: AssemblyFileVersion("2.0.530.0")]
 [assembly: AssemblyProduct("获取商店应用 桌面程序")]
 [assembly: AssemblyTitle("获取商店应用")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.0.529.0")]
+[assembly: AssemblyVersion("2.0.530.0")]
 
 // 设置程序集对COM组件的访问权限
 [assembly: ComVisible(false)]

diff --git a/GetStoreApp/UI/Controls/About/ReferenceControl.xaml b/GetStoreApp/UI/Controls/About/ReferenceControl.xaml
@@ -1,13 +1,13 @@
 <UserControl
     x:Class="GetStoreApp.UI.Controls.About.ReferenceControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:aboutViewModel="using:GetStoreApp.ViewModels.Controls.About"
-    xmlns:collections="using:GetStoreApp.Views.CustomControls.Collections"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:format="using:GetStoreApp.Converters.Formats"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:format="using:GetStoreApp.Converters.Formats"
     xmlns:root="using:GetStoreApp.Services.Root"
+    xmlns:aboutViewModel="using:GetStoreApp.ViewModels.Controls.About"
+    xmlns:collections="using:GetStoreApp.Views.CustomControls.Collections"
     mc:Ignorable="d">
 
     <UserControl.DataContext>
@@ -28,7 +28,7 @@
                 Padding="0"
                 HorizontalAlignment="Stretch"
                 HorizontalContentAlignment="Stretch"
-                DesiredWidth="280"
+                DesiredWidth="260"
                 ItemContainerStyle="{StaticResource GridViewItemStyle}"
                 ItemsSource="{x:Bind ViewModel.ReferenceDict}"
                 OneRowModeEnabled="False"

diff --git a/GetStoreApp/UI/Controls/About/ThanksControl.xaml b/GetStoreApp/UI/Controls/About/ThanksControl.xaml
@@ -1,13 +1,13 @@
 <UserControl
     x:Class="GetStoreApp.UI.Controls.About.ThanksControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:aboutViewModel="using:GetStoreApp.ViewModels.Controls.About"
-    xmlns:collections="using:GetStoreApp.Views.CustomControls.Collections"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:format="using:GetStoreApp.Converters.Formats"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:format="using:GetStoreApp.Converters.Formats"
     xmlns:root="using:GetStoreApp.Services.Root"
+    xmlns:aboutViewModel="using:GetStoreApp.ViewModels.Controls.About"
+    xmlns:collections="using:GetStoreApp.Views.CustomControls.Collections"
     mc:Ignorable="d">
 
     <UserControl.DataContext>
@@ -35,7 +35,7 @@
                     Padding="0"
                     HorizontalAlignment="Stretch"
                     HorizontalContentAlignment="Stretch"
-                    DesiredWidth="280"
+                    DesiredWidth="260"
                     ItemContainerStyle="{StaticResource GridViewItemStyle}"
                     ItemsSource="{x:Bind ViewModel.ThanksDict}"
                     OneRowModeEnabled="False"

diff --git a/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml b/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml
@@ -394,6 +394,7 @@
                                     </Button>
 
                                     <Button
+                                        controlExtensions:CursorHelper.Cursor="Hand"
                                         xmlns:controlExtensions="using:GetStoreApp.Helpers.Controls.Extensions"
                                         Command="{Binding ElementName=DownloadingRoot, Path=DataContext.DeleteCommand, Mode=OneTime}"
                                         CommandParameter="{Binding}"

diff --git a/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml
@@ -300,15 +300,6 @@
 
                                         <basicInput:ExtendedSplitButton.Flyout>
                                             <menusAndToolbars:AdaptiveMenuFlyout>
-                                                <MenuFlyoutItem
-                                                    x:Name="StopDownload"
-                                                    x:Load="{x:Bind IsInstalling, Mode=OneWay}"
-                                                    Text="{x:Bind root:ResourceService.GetLocalized('WinGet/StopDownload')}">
-                                                    <MenuFlyoutItem.Icon>
-                                                        <FontIcon Glyph="&#xE711;" Style="{StaticResource SegoeFluentStyle}" />
-                                                    </MenuFlyoutItem.Icon>
-                                                </MenuFlyoutItem>
-
                                                 <MenuFlyoutItem
                                                     Command="{Binding ElementName=SearchAppsRoot, Path=DataContext.CopyInstallTextCommand}"
                                                     CommandParameter="{x:Bind AppID}"

diff --git a/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml
@@ -263,15 +263,6 @@
 
                                     <basicInput:ExtendedSplitButton.Flyout>
                                         <menusAndToolbars:AdaptiveMenuFlyout>
-                                            <MenuFlyoutItem
-                                                x:Name="StopDownload"
-                                                x:Load="{x:Bind IsUpgrading, Mode=OneWay}"
-                                                Text="{x:Bind root:ResourceService.GetLocalized('WinGet/StopDownload')}">
-                                                <MenuFlyoutItem.Icon>
-                                                    <FontIcon Glyph="&#xE711;" Style="{StaticResource SegoeFluentStyle}" />
-                                                </MenuFlyoutItem.Icon>
-                                            </MenuFlyoutItem>
-
                                             <MenuFlyoutItem
                                                 Command="{Binding ElementName=UpgradableAppsRoot, Path=DataContext.CopyUpgradeTextCommand}"
                                                 CommandParameter="{x:Bind AppID}"

diff --git a/GetStoreApp/Views/Pages/WinGetPage.xaml b/GetStoreApp/Views/Pages/WinGetPage.xaml
@@ -68,12 +68,14 @@
                                 <Grid
                                     Width="300"
                                     Height="100"
+                                    Padding="20"
                                     Visibility="{x:Bind ViewModel.InstallingAppsList.Count, Converter={StaticResource IntToVisibilityConverter}, ConverterParameter=Reverse, Mode=OneWay}">
                                     <TextBlock
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Text="{x:Bind root:ResourceService.GetLocalized('WinGet/InstallingAppsListEmpty')}"
-                                        TextAlignment="Center" />
+                                        TextAlignment="Center"
+                                        TextWrapping="WrapWholeWords" />
                                 </Grid>
                                 <ScrollViewer
                                     Width="300"

diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Gaoyifei1011.GetStoreApp"
     Publisher="CN=高怡飞"
-    Version="2.0.529.0" />
+    Version="2.0.530.0" />
 
   <Properties>
     <DisplayName>ms-resource:PackageDisplayName</DisplayName>