From 88d0658fc29f5b7d83ddc5b976417c80d3b25da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=80=A1=E9=A3=9E?= <363301617@qq.com>
Date: Sun, 4 Aug 2024 22:07:07 +0800
Subject: [PATCH] Finish task and publish 4.4.804.0 version(First AOT Version
test)
Finish task and publish 4.4.804.0 version(First AOT Version test)
---
GetStoreApp/GetStoreApp.csproj | 4 ++-
GetStoreApp/GetStoreApp.res | Bin 438024 -> 438024 bytes
GetStoreApp/Properties/AssemblyInfo.cs | 6 ++--
.../Controls/Settings/LanguageService.cs | 2 +-
GetStoreApp/Styles/WinUI/ListView.xaml | 31 ++++++++++++++++++
.../Controls/Download/CompletedControl.xaml | 15 +++++----
.../Download/CompletedControl.xaml.cs | 4 +--
.../Controls/Download/DownloadingControl.xaml | 15 +++++----
.../Download/DownloadingControl.xaml.cs | 4 +--
.../UI/Controls/UWPApp/AppListControl.xaml | 11 ++++---
.../Controls/WinGet/InstalledAppsControl.xaml | 11 ++++---
.../UI/Controls/WinGet/SearchAppsControl.xaml | 11 ++++---
.../WinGet/UpgradableAppsControl.xaml | 11 ++++---
.../About/AppInformationDialog.xaml.cs | 1 -
GetStoreApp/Views/Pages/WinGetPage.xaml | 11 ++++---
GetStoreApp/WinUIApp.xaml | 1 +
.../ComTypes/DODownloadStatusCallback.cs | 3 +-
.../ComTypes/IDODownloadStatusCallback.cs | 3 +-
GetStoreAppPackage/GetStoreAppPackage.wapproj | 2 +-
GetStoreAppPackage/Package.appxmanifest | 2 +-
GetStoreAppWebView/Properties/AssemblyInfo.cs | 6 ++--
.../Properties/AssemblyInfo.cs | 6 ++--
22 files changed, 101 insertions(+), 59 deletions(-)
create mode 100644 GetStoreApp/Styles/WinUI/ListView.xaml
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
index 258682188..91b5d002a 100644
--- a/GetStoreApp/GetStoreApp.csproj
+++ b/GetStoreApp/GetStoreApp.csproj
@@ -25,7 +25,7 @@
False
true
True
- true
+ true
PackageReference
GetStoreApp
win-x86;win-x64;win-arm64
@@ -77,6 +77,7 @@
+
@@ -119,6 +120,7 @@
+
diff --git a/GetStoreApp/GetStoreApp.res b/GetStoreApp/GetStoreApp.res
index a5742a341f5de826b69be09e423b56e1de4acfa7..911990ba980c7b6f28a52aa930d749ec8c8a8504 100644
GIT binary patch
delta 59
zcmeCUC)IIJs-cCkg{g(Pg{6gc3!BU=P8J3h1_lNdW|rxyv)H;BO{Q<0#kQN#WP9#x
Owqiyg{csMOx)1;w2N9(J
delta 59
zcmeCUC)IIJs-cCkg{g(Pg{6gc3!BU=P9_Ex1_lNdW~S+?v)H;Bjizs$#kQN#XnXE#
Owqiyg{csMOx)1;vD-oLj
diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
index 6ea421f79..a303d4236 100644
--- a/GetStoreApp/Properties/AssemblyInfo.cs
+++ b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("获取商店应用")]
-[assembly: AssemblyFileVersion("4.2.804.0")]
-[assembly: AssemblyInformationalVersion("4.2.804.0")]
+[assembly: AssemblyFileVersion("4.4.804.0")]
+[assembly: AssemblyInformationalVersion("4.4.804.0")]
[assembly: AssemblyProduct("获取商店应用")]
[assembly: AssemblyTitle("获取商店应用")]
-[assembly: AssemblyVersion("4.2.804.0")]
+[assembly: AssemblyVersion("4.4.804.0")]
// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
diff --git a/GetStoreApp/Services/Controls/Settings/LanguageService.cs b/GetStoreApp/Services/Controls/Settings/LanguageService.cs
index 7dccc9d28..fb1a24b41 100644
--- a/GetStoreApp/Services/Controls/Settings/LanguageService.cs
+++ b/GetStoreApp/Services/Controls/Settings/LanguageService.cs
@@ -1,9 +1,9 @@
using GetStoreApp.Extensions.DataType.Constant;
using GetStoreApp.Services.Root;
-using Windows.Globalization;
using System;
using System.Collections;
using System.Collections.Generic;
+using Windows.Globalization;
namespace GetStoreApp.Services.Controls.Settings
{
diff --git a/GetStoreApp/Styles/WinUI/ListView.xaml b/GetStoreApp/Styles/WinUI/ListView.xaml
new file mode 100644
index 000000000..2785cad04
--- /dev/null
+++ b/GetStoreApp/Styles/WinUI/ListView.xaml
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/GetStoreApp/UI/Controls/Download/CompletedControl.xaml b/GetStoreApp/UI/Controls/Download/CompletedControl.xaml
index 226bda05e..9ab945b45 100644
--- a/GetStoreApp/UI/Controls/Download/CompletedControl.xaml
+++ b/GetStoreApp/UI/Controls/Download/CompletedControl.xaml
@@ -203,11 +203,12 @@
TextAlignment="Center" />
-
-
+
-
+
-
-
+
+
diff --git a/GetStoreApp/UI/Controls/Download/CompletedControl.xaml.cs b/GetStoreApp/UI/Controls/Download/CompletedControl.xaml.cs
index f568eee4e..4ddc93fb4 100644
--- a/GetStoreApp/UI/Controls/Download/CompletedControl.xaml.cs
+++ b/GetStoreApp/UI/Controls/Download/CompletedControl.xaml.cs
@@ -651,9 +651,9 @@ private void OnCancelClicked(object sender, RoutedEventArgs args)
///
/// 在多选模式下点击项目选择相应的条目
///
- private void OnItemInvoked(object sender, ItemsViewItemInvokedEventArgs args)
+ private void OnItemInvoked(object sender, ItemClickEventArgs args)
{
- CompletedModel completedItem = (CompletedModel)args.InvokedItem;
+ CompletedModel completedItem = (CompletedModel)args.ClickedItem;
int clickedIndex = CompletedCollection.IndexOf(completedItem);
if (clickedIndex >= 0 && clickedIndex < CompletedCollection.Count)
diff --git a/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml b/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml
index 63f08da17..f7fd69d22 100644
--- a/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml
+++ b/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml
@@ -201,11 +201,12 @@
TextAlignment="Center" />
-
-
+
-
+
-
-
+
+
diff --git a/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml.cs b/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml.cs
index 560c03b71..ff2bef5d7 100644
--- a/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml.cs
+++ b/GetStoreApp/UI/Controls/Download/DownloadingControl.xaml.cs
@@ -329,9 +329,9 @@ private void OnCancelClicked(object sender, RoutedEventArgs args)
///
/// 在多选模式下点击项目选择相应的条目
///
- private void OnItemInvoked(object sender, ItemsViewItemInvokedEventArgs args)
+ private void OnItemInvoked(object sender, ItemClickEventArgs args)
{
- DownloadingModel downloadingItem = (DownloadingModel)args.InvokedItem;
+ DownloadingModel downloadingItem = (DownloadingModel)args.ClickedItem;
int clickedIndex = DownloadingCollection.IndexOf(downloadingItem);
if (clickedIndex >= 0 && clickedIndex < DownloadingCollection.Count)
diff --git a/GetStoreApp/UI/Controls/UWPApp/AppListControl.xaml b/GetStoreApp/UI/Controls/UWPApp/AppListControl.xaml
index 777fa449e..f68acd810 100644
--- a/GetStoreApp/UI/Controls/UWPApp/AppListControl.xaml
+++ b/GetStoreApp/UI/Controls/UWPApp/AppListControl.xaml
@@ -339,9 +339,10 @@
TextAlignment="Center" />
-
-
+
-
+
-
-
+
+
diff --git a/GetStoreApp/UI/Controls/WinGet/InstalledAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/InstalledAppsControl.xaml
index 92cf16e3b..a3ab3e0de 100644
--- a/GetStoreApp/UI/Controls/WinGet/InstalledAppsControl.xaml
+++ b/GetStoreApp/UI/Controls/WinGet/InstalledAppsControl.xaml
@@ -244,9 +244,10 @@
TextAlignment="Center" />
-
-
+
-
+
-
-
+
+
diff --git a/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml
index d5adf9cb4..64bf991b5 100644
--- a/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml
+++ b/GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml
@@ -209,9 +209,10 @@
TextAlignment="Center" />
-
-
+
-
+
-
-
+
+
diff --git a/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml b/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml
index e81722ef5..4aefe99c4 100644
--- a/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml
+++ b/GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml
@@ -155,9 +155,10 @@
TextAlignment="Center" />
-
-
+
-
+
-
-
+
+
diff --git a/GetStoreApp/UI/Dialogs/About/AppInformationDialog.xaml.cs b/GetStoreApp/UI/Dialogs/About/AppInformationDialog.xaml.cs
index 6e14622be..5adeba725 100644
--- a/GetStoreApp/UI/Dialogs/About/AppInformationDialog.xaml.cs
+++ b/GetStoreApp/UI/Dialogs/About/AppInformationDialog.xaml.cs
@@ -3,7 +3,6 @@
using GetStoreApp.Helpers.Root;
using GetStoreApp.Services.Root;
using GetStoreApp.UI.TeachingTips;
-using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using System;
using System.Collections.Generic;
diff --git a/GetStoreApp/Views/Pages/WinGetPage.xaml b/GetStoreApp/Views/Pages/WinGetPage.xaml
index 0dd6f7b26..c4b4681cf 100644
--- a/GetStoreApp/Views/Pages/WinGetPage.xaml
+++ b/GetStoreApp/Views/Pages/WinGetPage.xaml
@@ -154,10 +154,11 @@
TextWrapping="WrapWholeWords" />
-
-
+
-
+
-
-
+
+
diff --git a/GetStoreApp/WinUIApp.xaml b/GetStoreApp/WinUIApp.xaml
index c1b466b83..7144546ee 100644
--- a/GetStoreApp/WinUIApp.xaml
+++ b/GetStoreApp/WinUIApp.xaml
@@ -12,6 +12,7 @@
+
diff --git a/GetStoreApp/WindowsAPI/ComTypes/DODownloadStatusCallback.cs b/GetStoreApp/WindowsAPI/ComTypes/DODownloadStatusCallback.cs
index a253eebf2..135cbfa49 100644
--- a/GetStoreApp/WindowsAPI/ComTypes/DODownloadStatusCallback.cs
+++ b/GetStoreApp/WindowsAPI/ComTypes/DODownloadStatusCallback.cs
@@ -17,9 +17,10 @@ public partial class DODownloadStatusCallback : IDODownloadStatusCallback
///
public event Action StatusChanged;
- public void OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status)
+ public int OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status)
{
StatusChanged?.Invoke(this, download, status);
+ return 0;
}
}
}
diff --git a/GetStoreApp/WindowsAPI/ComTypes/IDODownloadStatusCallback.cs b/GetStoreApp/WindowsAPI/ComTypes/IDODownloadStatusCallback.cs
index 86b0a52da..425febef1 100644
--- a/GetStoreApp/WindowsAPI/ComTypes/IDODownloadStatusCallback.cs
+++ b/GetStoreApp/WindowsAPI/ComTypes/IDODownloadStatusCallback.cs
@@ -16,6 +16,7 @@ public partial interface IDODownloadStatusCallback
/// 指向其状态更改的 IDODownload 接口的指针。
/// 指向包含下载状态 的DO_DOWNLOAD_STATUS 结构的指针。
/// 如果函数成功，则返回 S_OK。 否则，它将返回 HRESULT错误代码。
- void OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status);
+ [PreserveSig]
+ int OnStatusChange([MarshalAs(UnmanagedType.Interface)] IDODownload download, ref DO_DOWNLOAD_STATUS status);
}
}
diff --git a/GetStoreAppPackage/GetStoreAppPackage.wapproj b/GetStoreAppPackage/GetStoreAppPackage.wapproj
index e15fb9438..99f4b2287 100644
--- a/GetStoreAppPackage/GetStoreAppPackage.wapproj
+++ b/GetStoreAppPackage/GetStoreAppPackage.wapproj
@@ -38,7 +38,7 @@
0
False
DXFeatureLevel
- x86|x64|arm64
+ x64|arm64
Language=EN-US;ZH-HANS-CN
True
SHA256
diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
index 8ccc92d8e..c3d05be67 100644
--- a/GetStoreAppPackage/Package.appxmanifest
+++ b/GetStoreAppPackage/Package.appxmanifest
@@ -11,7 +11,7 @@
+ Version="4.4.804.0" />
ms-resource:PackageDisplayName
diff --git a/GetStoreAppWebView/Properties/AssemblyInfo.cs b/GetStoreAppWebView/Properties/AssemblyInfo.cs
index 87d4094ae..92ae1ea0c 100644
--- a/GetStoreAppWebView/Properties/AssemblyInfo.cs
+++ b/GetStoreAppWebView/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("网页浏览器")]
-[assembly: AssemblyFileVersion("4.2.804.0")]
-[assembly: AssemblyInformationalVersion("4.2.804.0")]
+[assembly: AssemblyFileVersion("4.4.804.0")]
+[assembly: AssemblyInformationalVersion("4.4.804.0")]
[assembly: AssemblyProduct("网页浏览器")]
[assembly: AssemblyTitle("网页浏览器")]
-[assembly: AssemblyVersion("4.2.804.0")]
+[assembly: AssemblyVersion("4.4.804.0")]
// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
diff --git a/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs b/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs
index d765df4cf..458f0bf50 100644
--- a/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs
+++ b/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs
@@ -4,10 +4,10 @@
// 程序集信息设置
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("©Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
-[assembly: AssemblyFileVersion("4.2.804.0")]
-[assembly: AssemblyInformationalVersion("4.2.804.0")]
+[assembly: AssemblyFileVersion("4.4.804.0")]
+[assembly: AssemblyInformationalVersion("4.4.804.0")]
[assembly: AssemblyProduct("获取商店应用 WinGet WinRT 扩展")]
-[assembly: AssemblyVersion("4.2.804.0")]
+[assembly: AssemblyVersion("4.4.804.0")]
// 设置程序集仅允许在Windows平台上可用
[assembly: SupportedOSPlatform("windows10.0.26100")]
\ No newline at end of file