From 679471c0c2e87057d4926a1a328e9162642b36d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=80=A1=E9=A3=9E?= <363301617@qq.com> Date: Fri, 4 Oct 2024 14:23:14 +0800 Subject: [PATCH] Finish task and publish 5.1.1004.0 version 1.Finish task and publish 5.1.1004.0 version 2.Update dependencies --- GetStoreApp/GetStoreApp.csproj | 4 ++-- GetStoreApp/GetStoreApp.res | Bin 438036 -> 438036 bytes GetStoreApp/Properties/AssemblyInfo.cs | 6 +++--- GetStoreApp/Views/Pages/SettingsPage.xaml.cs | 2 +- GetStoreApp/Views/Windows/MainWindow.xaml.cs | 1 + .../GetStoreAppInstaller.csproj | 4 ++-- GetStoreAppInstaller/GetStoreAppInstaller.res | Bin 438072 -> 438072 bytes GetStoreAppInstaller/Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 6 +++--- GetStoreAppInstaller/TestPage.xaml.cs | 5 +---- .../UI/Backdrop/DesktopAcrylicBackdrop.cs | 1 - .../ComTypes/ICompositorDesktopInterop.cs | 5 +++-- GetStoreAppPackage/Package.appxmanifest | 2 +- .../GetStoreAppShellExtension.csproj | 4 ++-- .../Properties/AssemblyInfo.cs | 6 +++--- GetStoreAppWebView/GetStoreAppWebView.csproj | 4 ++-- GetStoreAppWebView/GetStoreAppWebView.res | Bin 438104 -> 438104 bytes GetStoreAppWidget/GetStoreAppWidget.csproj | 4 ++-- GetStoreAppWidget/GetStoreAppWidget.res | Bin 157684 -> 157684 bytes GetStoreAppWidget/Properties/AssemblyInfo.cs | 6 +++--- ...ft.Management.Deployment.Projection.csproj | 4 ++-- .../Properties/AssemblyInfo.cs | 6 +++--- 22 files changed, 35 insertions(+), 37 deletions(-) diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj index 667869db8..06d9ad4c6 100644 --- a/GetStoreApp/GetStoreApp.csproj +++ b/GetStoreApp/GetStoreApp.csproj @@ -35,7 +35,7 @@ GetStoreApp.res false false - 10.0.26100.45 + 10.0.26100.47 false @@ -165,7 +165,7 @@ - + diff --git a/GetStoreApp/GetStoreApp.res b/GetStoreApp/GetStoreApp.res index 86354e66c8512ac9e321a2ee94c428a3883a7b78..8c7e23a480891833c6730c27a08aa6fed4691b53 100644 GIT binary patch delta 95 zcmbPoPio3NsfHHD7N!>F7M2#)Eo?Hg_!${k85kJeFhl9-+OybNxeXcg7z`NF7M2#)Eo?Hg_!$^j85kH|GDGR<+OybNxeXZf7z`N private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs args) { - if (sender is ToggleSwitch toggleSwitch) + if (sender is ToggleSwitch) { AlwaysShowBackdropService.SetAlwaysShowBackdrop(false); AlwaysShowBackdropValue = false; diff --git a/GetStoreApp/Views/Windows/MainWindow.xaml.cs b/GetStoreApp/Views/Windows/MainWindow.xaml.cs index ba74caf9c..977cb8835 100644 --- a/GetStoreApp/Views/Windows/MainWindow.xaml.cs +++ b/GetStoreApp/Views/Windows/MainWindow.xaml.cs @@ -14,6 +14,7 @@ using GetStoreApp.WindowsAPI.PInvoke.Comctl32; using GetStoreApp.WindowsAPI.PInvoke.User32; using GetStoreApp.WindowsAPI.PInvoke.Uxtheme; +using Microsoft.UI; using Microsoft.UI.Composition.SystemBackdrops; using Microsoft.UI.Content; using Microsoft.UI.Dispatching; diff --git a/GetStoreAppInstaller/GetStoreAppInstaller.csproj b/GetStoreAppInstaller/GetStoreAppInstaller.csproj index 01234a226..f1cb43dab 100644 --- a/GetStoreAppInstaller/GetStoreAppInstaller.csproj +++ b/GetStoreAppInstaller/GetStoreAppInstaller.csproj @@ -37,7 +37,7 @@ true true GetStoreAppInstaller.res - 10.0.26100.45 + 10.0.26100.47 false @@ -68,7 +68,7 @@ - + diff --git a/GetStoreAppInstaller/GetStoreAppInstaller.res b/GetStoreAppInstaller/GetStoreAppInstaller.res index 8f972c19d8090c3f5804b3dc1ea42afb094ef37f..dae77f345a2f50a49beb81bc68e9cfda489949c0 100644 GIT binary patch delta 95 zcmdmSPin_KsfHHD7N!>F7M2#)Eo?Hg_!${k85kJeFhl9-+OybNxeXcg7z`NF7M2#)Eo?Hg_!$^j85kH|GDGR<+OybNxeXZf7z`N this.InitializeComponent(); - - private void ClickHandler(object sender, RoutedEventArgs _) { - (sender as Button).Content = "Clicked"; + InitializeComponent(); } } } diff --git a/GetStoreAppInstaller/UI/Backdrop/DesktopAcrylicBackdrop.cs b/GetStoreAppInstaller/UI/Backdrop/DesktopAcrylicBackdrop.cs index 2417b7bc3..197165bad 100644 --- a/GetStoreAppInstaller/UI/Backdrop/DesktopAcrylicBackdrop.cs +++ b/GetStoreAppInstaller/UI/Backdrop/DesktopAcrylicBackdrop.cs @@ -26,7 +26,6 @@ public sealed partial class DesktopAcrylicBackdrop : SystemBackdrop private bool isInitialized; private bool isWindowClosed; private bool isActivated = true; - private bool useMicaBrush; private bool useDesktopAcrylicBackdrop; private readonly IntPtr windowHandle; diff --git a/GetStoreAppInstaller/WindowsAPI/ComTypes/ICompositorDesktopInterop.cs b/GetStoreAppInstaller/WindowsAPI/ComTypes/ICompositorDesktopInterop.cs index f95166222..f32ac1aef 100644 --- a/GetStoreAppInstaller/WindowsAPI/ComTypes/ICompositorDesktopInterop.cs +++ b/GetStoreAppInstaller/WindowsAPI/ComTypes/ICompositorDesktopInterop.cs @@ -1,10 +1,11 @@ using System; using System.Runtime.InteropServices; +using System.Runtime.InteropServices.Marshalling; namespace WindowsTools.WindowsAPI.ComTypes { - [ComImport, Guid("29E691FA-4567-4DCA-B319-D0F207EB6807"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - public interface ICompositorDesktopInterop + [GeneratedComInterface, Guid("29E691FA-4567-4DCA-B319-D0F207EB6807"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public partial interface ICompositorDesktopInterop { [PreserveSig] int CreateDesktopWindowTarget(IntPtr hwndTarget, [MarshalAs(UnmanagedType.Bool)] bool isTopmost, out IntPtr result); diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest index 1ad05e8aa..a1d0973f6 100644 --- a/GetStoreAppPackage/Package.appxmanifest +++ b/GetStoreAppPackage/Package.appxmanifest @@ -13,7 +13,7 @@ + Version="5.1.1004.0" /> ms-resource:PackageDisplayName diff --git a/GetStoreAppShellExtension/GetStoreAppShellExtension.csproj b/GetStoreAppShellExtension/GetStoreAppShellExtension.csproj index 8e549db59..53b0e7b6f 100644 --- a/GetStoreAppShellExtension/GetStoreAppShellExtension.csproj +++ b/GetStoreAppShellExtension/GetStoreAppShellExtension.csproj @@ -29,7 +29,7 @@ net9.0-windows10.0.26100.0 10.0.19041.0 true - 10.0.26100.45 + 10.0.26100.48 false @@ -44,7 +44,7 @@ - + diff --git a/GetStoreAppShellExtension/Properties/AssemblyInfo.cs b/GetStoreAppShellExtension/Properties/AssemblyInfo.cs index 765b7e23f..8ea6ef603 100644 --- a/GetStoreAppShellExtension/Properties/AssemblyInfo.cs +++ b/GetStoreAppShellExtension/Properties/AssemblyInfo.cs @@ -7,11 +7,11 @@ [assembly: AssemblyCompany("高怡飞")] [assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")] [assembly: AssemblyDescription("获取商店应用 右键菜单扩展")] -[assembly: AssemblyFileVersion("5.0.1001.0")] -[assembly: AssemblyInformationalVersion("5.0.1001.0")] +[assembly: AssemblyFileVersion("5.1.1004.0")] +[assembly: AssemblyInformationalVersion("5.1.1004.0")] [assembly: AssemblyProduct("获取商店应用 右键菜单扩展")] [assembly: AssemblyTitle("获取商店应用 右键菜单扩展")] -[assembly: AssemblyVersion("5.0.1001.0")] +[assembly: AssemblyVersion("5.1.1004.0")] // 应用程序默认区域性的资源控制器设置 [assembly: NeutralResourcesLanguage("en-us")] diff --git a/GetStoreAppWebView/GetStoreAppWebView.csproj b/GetStoreAppWebView/GetStoreAppWebView.csproj index f0933c32a..24fd3a1fc 100644 --- a/GetStoreAppWebView/GetStoreAppWebView.csproj +++ b/GetStoreAppWebView/GetStoreAppWebView.csproj @@ -36,7 +36,7 @@ true true GetStoreAppWebView.res - 10.0.26100.45 + 10.0.26100.48 false @@ -68,7 +68,7 @@ - + diff --git a/GetStoreAppWebView/GetStoreAppWebView.res b/GetStoreAppWebView/GetStoreAppWebView.res index e44eb1422143834d6fd4a93ea6b7dac8a6e5592a..9c133bff58373c59c6d933744675111f99448510 100644 GIT binary patch delta 95 zcmca{PwK`!sfHHD7N!>F7M2#)Eo?Hg_!${k85kJeFhl9-+OybNxeXcg7z`NF7M2#)Eo?Hg_!$^j85kH|GDGR<+OybNxeXZf7z`NGetStoreAppWidget.res false false - 10.0.26100.45 + 10.0.26100.47 false @@ -49,7 +49,7 @@ - + diff --git a/GetStoreAppWidget/GetStoreAppWidget.res b/GetStoreAppWidget/GetStoreAppWidget.res index be8cc0e80b01270c3c018570bccd3e1ddad6f12b..8af1b34601616b05cef9dbb827861811bb8e7d55 100644 GIT binary patch delta 87 zcmexzp7YCj&W0AoElf{>_!${k85kJeFhl9-pM#iMxeXcg7z`N6UWP$C$ PAxx!=C?c0bnG}Tp4YU-F delta 87 zcmexzp7YCj&W0AoElf{>_!$^j85kH|GDGR6UWP$C$ PAxx!=C?c0bnG}Tp3ThO3 diff --git a/GetStoreAppWidget/Properties/AssemblyInfo.cs b/GetStoreAppWidget/Properties/AssemblyInfo.cs index dab3f11ae..be39d9f98 100644 --- a/GetStoreAppWidget/Properties/AssemblyInfo.cs +++ b/GetStoreAppWidget/Properties/AssemblyInfo.cs @@ -7,11 +7,11 @@ [assembly: AssemblyCompany("高怡飞")] [assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")] [assembly: AssemblyDescription("获取商店应用 小组件")] -[assembly: AssemblyFileVersion("5.0.1001.0")] -[assembly: AssemblyInformationalVersion("5.0.1001.0")] +[assembly: AssemblyFileVersion("5.1.1004.0")] +[assembly: AssemblyInformationalVersion("5.1.1004.0")] [assembly: AssemblyProduct("获取商店应用 小组件")] [assembly: AssemblyTitle("获取商店应用 小组件")] -[assembly: AssemblyVersion("5.0.1001.0")] +[assembly: AssemblyVersion("5.1.1004.0")] // 应用程序默认区域性的资源控制器设置 [assembly: NeutralResourcesLanguage("en-us")] diff --git a/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj b/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj index 042f847da..2150aebca 100644 --- a/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj +++ b/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj @@ -28,7 +28,7 @@ net9.0-windows10.0.26100.0 10.0.19041.0 true - 10.0.26100.45 + 10.0.26100.48 false @@ -49,7 +49,7 @@ - + diff --git a/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs b/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs index 5c945ed3d..6840c41a0 100644 --- a/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs +++ b/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs @@ -7,11 +7,11 @@ [assembly: AssemblyCompany("高怡飞")] [assembly: AssemblyCopyright("©Copyright ©2022-2024 高怡飞, All Rights Reserved.")] [assembly: AssemblyDescription("获取商店应用 WinGet WinRT 扩展")] -[assembly: AssemblyFileVersion("5.0.1001.0")] -[assembly: AssemblyInformationalVersion("5.0.1001.0")] +[assembly: AssemblyFileVersion("5.1.1004.0")] +[assembly: AssemblyInformationalVersion("5.1.1004.0")] [assembly: AssemblyProduct("获取商店应用 WinGet WinRT 扩展")] [assembly: AssemblyTitle("获取商店应用 WinGet WinRT 扩展")] -[assembly: AssemblyVersion("5.0.1001.0")] +[assembly: AssemblyVersion("5.1.1004.0")] // 应用程序默认区域性的资源控制器设置 [assembly: NeutralResourcesLanguage("en-us")]