Finish task and publish 3.1.1003.0 version

1.Finish task and publish 3.1.1003.0 version 2.Disable code warning 3.Import AppxPackaging.dll API
Gaoyifei1011 · Oct 3, 2024 · 4d12cb1 · 4d12cb1
1 parent 1ec4086
commit 4d12cb1
Show file tree

Hide file tree

Showing 63 changed files with 520 additions and 114 deletions.
diff --git a/Description/README_EN-US.md b/Description/README_EN-US.md
@@ -79,6 +79,7 @@ A toolbox that integrates multiple gadgets.
 ### Project References (Sort by alphabetical order)
 
 > * [Microsoft.UI.Xaml](https://github.com/microsoft/microsoft-ui-xaml)&emsp;
+> * [Microsoft.Windows.SDK.BuildTools](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
 > * [Mile.Xaml](https://github.com/ProjectMile/Mile.Xaml)&emsp;

diff --git a/Description/README_ZH-CN.md b/Description/README_ZH-CN.md
@@ -79,6 +79,7 @@
 ### 项目引用（按英文首字母排序）
 
 > * [Microsoft.UI.Xaml](https://github.com/microsoft/microsoft-ui-xaml)&emsp;
+> * [Microsoft.Windows.SDK.BuildTools](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
 > * [Mile.Xaml](https://github.com/ProjectMile/Mile.Xaml)&emsp;

diff --git a/README.md b/README.md
@@ -86,6 +86,7 @@
 ### 项目引用（按英文首字母排序）
 
 > * [Microsoft.UI.Xaml](https://github.com/microsoft/microsoft-ui-xaml)&emsp;
+> * [Microsoft.Windows.SDK.BuildTools](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.Windows.SDK.Contracts](https://aka.ms/WinSDKProjectURL)&emsp;
 > * [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk)&emsp;
 > * [Mile.Xaml](https://github.com/ProjectMile/Mile.Xaml)&emsp;

diff --git a/WindowsTools/Helpers/Backdrop/BackdropHelper.cs b/WindowsTools/Helpers/Backdrop/BackdropHelper.cs
@@ -8,6 +8,9 @@
 using WindowsTools.WindowsAPI.ComTypes;
 using WindowsTools.WindowsAPI.PInvoke.Combase;
 
+// 抑制 CA1806 警告
+#pragma warning disable CA1806
+
 namespace WindowsTools.Helpers.Backdrop
 {
     /// <summary>

diff --git a/WindowsTools/Helpers/Root/FeatureAccessHelper.cs b/WindowsTools/Helpers/Root/FeatureAccessHelper.cs
@@ -4,6 +4,9 @@
 using System.Text;
 using WindowsTools.WindowsAPI.PInvoke.Kernel32;
 
+// 抑制 CA1806 警告
+#pragma warning disable CA1806
+
 namespace WindowsTools.Helpers.Root
 {
     /// <summary>

diff --git a/WindowsTools/Models/DownloadModel.cs b/WindowsTools/Models/DownloadModel.cs
@@ -3,6 +3,9 @@
 using Windows.UI.Xaml;
 using WindowsTools.Extensions.DataType.Enums;
 
+// 抑制 CA1822 警告
+#pragma warning disable CA1822
+
 namespace WindowsTools.Models
 {
     public sealed class DownloadModel : INotifyPropertyChanged

diff --git a/WindowsTools/Program.cs b/WindowsTools/Program.cs
@@ -11,6 +11,9 @@
 using WindowsTools.Views.Windows;
 using WindowsTools.WindowsAPI.ComTypes;
 
+// 抑制 CA1806 警告
+#pragma warning disable CA1806
+
 namespace WindowsTools
 {
     /// <summary>

diff --git a/WindowsTools/Properties/AssemblyInfo.cs b/WindowsTools/Properties/AssemblyInfo.cs
@@ -1,11 +1,15 @@
 using System.Reflection;
+using System.Resources;
 
 // 程序集信息设置
 [assembly: AssemblyCompany("高怡飞")]
 [assembly: AssemblyCopyright("Copyright ©2024 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("Windows 工具箱")]
-[assembly: AssemblyFileVersion("3.0.1001.0")]
-[assembly: AssemblyInformationalVersion("3.0.1001.0")]
+[assembly: AssemblyFileVersion("3.1.1003.0")]
+[assembly: AssemblyInformationalVersion("3.1.1003.0")]
 [assembly: AssemblyProduct("Windows 工具箱")]
 [assembly: AssemblyTitle("Windows 工具箱")]
-[assembly: AssemblyVersion("3.0.1001.0")]
+[assembly: AssemblyVersion("3.1.1003.0")]
+
+// 应用程序默认区域性的资源控制器设置
+[assembly: NeutralResourcesLanguage("en-us")]
diff --git a/WindowsTools/Services/Controls/Download/DeliveryOptimizationService.cs b/WindowsTools/Services/Controls/Download/DeliveryOptimizationService.cs
@@ -9,6 +9,9 @@
 using WindowsTools.WindowsAPI.ComTypes;
 using WindowsTools.WindowsAPI.PInvoke.Ole32;
 
+// 抑制 CA1806 警告
+#pragma warning disable CA1806
+
 namespace WindowsTools.Services.Controls.Download
 {
     /// <summary>

diff --git a/WindowsTools/Services/Controls/Settings/DownloadOptionsService.cs b/WindowsTools/Services/Controls/Settings/DownloadOptionsService.cs
@@ -7,6 +7,9 @@
 using WindowsTools.Services.Root;
 using WindowsTools.WindowsAPI.PInvoke.Shell32;
 
+// 抑制 CA1806 警告
+#pragma warning disable CA1806
+
 namespace WindowsTools.Services.Controls.Settings
 {
     /// <summary>

diff --git a/WindowsTools/Services/Controls/Settings/LanguageService.cs b/WindowsTools/Services/Controls/Settings/LanguageService.cs
@@ -3,11 +3,13 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Reflection;
+using System.Runtime.InteropServices.ComTypes;
 using System.Windows.Forms;
 using Windows.Globalization;
 using WindowsTools.Extensions.DataType.Constant;
 using WindowsTools.Services.Root;
+using WindowsTools.WindowsAPI.ComTypes;
+using WindowsTools.WindowsAPI.PInvoke.Shlwapi;
 
 namespace WindowsTools.Services.Controls.Settings
 {
@@ -16,8 +18,9 @@ namespace WindowsTools.Services.Controls.Settings
     /// </summary>
     public static class LanguageService
     {
-        private static readonly string resourceFileName = string.Format("{0}.resources.dll", Assembly.GetExecutingAssembly().GetName().Name);
         private static readonly string settingsKey = ConfigKey.LanguageKey;
+        private static readonly Guid CLSID_AppxFactory = new("5842A140-FF9F-4166-8F5C-62F5B7B0C781");
+        private static readonly IAppxFactory appxFactory = Activator.CreateInstance(Type.GetTypeFromCLSID(CLSID_AppxFactory)) as IAppxFactory;
         private static DictionaryEntry defaultAppLanguage;
 
         public static DictionaryEntry AppLanguage { get; private set; }
@@ -35,15 +38,32 @@ private static void InitializeLanguageList()
         {
             try
             {
-                string[] resourceFolder = Directory.GetFiles(AppContext.BaseDirectory, resourceFileName, SearchOption.AllDirectories);
+                if (ShlwapiLibrary.SHCreateStreamOnFileEx(Path.Combine(AppContext.BaseDirectory, "AppxManifest.xml"), STGM.STGM_SHARE_DENY_READ | STGM.STGM_SHARE_EXCLUSIVE, 0, false, null, out IStream stream) is 0)
+                {
+                    appxFactory.CreateManifestReader(stream, out IAppxManifestReader2 appxManifestReader);
+
+                    if (appxManifestReader.GetQualifiedResources(out IAppxManifestQualifiedResourcesEnumerator appxManifestQualifiedResourcesEnumerator) is 0)
+                    {
+                        while (appxManifestQualifiedResourcesEnumerator.GetHasCurrent(out bool hasCurrent) is 0 && (hasCurrent is true))
+                        {
+                            if (appxManifestQualifiedResourcesEnumerator.GetCurrent(out IAppxManifestQualifiedResource appxManifestQualifiedResource) is 0 && appxManifestQualifiedResource.GetLanguage(out string language) is 0)
+                            {
+                                AppLanguagesList.Add(language);
+                            }
+
+                            appxManifestQualifiedResourcesEnumerator.MoveNext(out _);
+                        }
+                    }
+                }
 
-                foreach (string file in resourceFolder)
+                if (AppLanguagesList.Count is 0)
                 {
-                    AppLanguagesList.Add(Path.GetFileName(Path.GetDirectoryName(file)));
+                    AppLanguagesList.Add("en-us");
                 }
+
                 AppLanguagesList.Sort();
             }
-            catch
+            catch (Exception)
             {
                 AppLanguagesList.Clear();
                 AppLanguagesList.Add("en-us");

diff --git a/WindowsTools/Services/Root/LogService.cs b/WindowsTools/Services/Root/LogService.cs
@@ -7,6 +7,9 @@
 using System.Threading.Tasks;
 using WindowsTools.WindowsAPI.PInvoke.Shell32;
 
+// 抑制 CA1806 警告
+#pragma warning disable CA1806
+
 namespace WindowsTools.Services.Root
 {
     /// <summary>

diff --git a/WindowsTools/Services/Root/SystemTrayService.cs b/WindowsTools/Services/Root/SystemTrayService.cs
@@ -7,6 +7,9 @@
 using WindowsTools.Services.Controls.Settings;
 using WindowsTools.WindowsAPI.PInvoke.Uxtheme;
 
+// 抑制 CA1806，IDE0060 警告
+#pragma warning disable CA1806,IDE0060
+
 namespace WindowsTools.Services.Root
 {
     /// <summary>

diff --git a/WindowsTools/Services/Shell/ShellMenuService.cs b/WindowsTools/Services/Shell/ShellMenuService.cs
@@ -8,6 +8,9 @@
 using WindowsTools.Services.Root;
 using WindowsTools.WindowsAPI.PInvoke.Shell32;
 
+// 抑制 CA1806 警告
+#pragma warning disable CA1806
+
 namespace WindowsTools.Services.Shell
 {
     /// <summary>

diff --git a/WindowsTools/UI/Backdrop/ColorSourceEffect.cs b/WindowsTools/UI/Backdrop/ColorSourceEffect.cs
@@ -8,7 +8,7 @@
 namespace WindowsTools.UI.Backdrop
 {
     [Guid("61C23C20-AE69-4D8E-94CF-50078DF638F2")]
-    public class ColorSourceEffect : IGraphicsEffect, IGraphicsEffectSource, IGraphicsEffectD2D1Interop
+    public sealed class ColorSourceEffect : IGraphicsEffect, IGraphicsEffectSource, IGraphicsEffectD2D1Interop
     {
         public Color Color { get; set; } = Color.FromArgb(255, 255, 255, 255);
 

diff --git a/WindowsTools/UI/Backdrop/CompositeEffect.cs b/WindowsTools/UI/Backdrop/CompositeEffect.cs
@@ -8,7 +8,7 @@
 namespace WindowsTools.UI.Backdrop
 {
     [Guid("48FC9F51-F6AC-48F1-8B58-3B28AC46F76D")]
-    public class CompositeEffect : IGraphicsEffect, IGraphicsEffectSource, IGraphicsEffectD2D1Interop
+    public sealed class CompositeEffect : IGraphicsEffect, IGraphicsEffectSource, IGraphicsEffectD2D1Interop
     {
         public CanvasComposite Mode { get; set; } = CanvasComposite.SourceOver;
 

diff --git a/WindowsTools/UI/Backdrop/CrossFadeEffect.cs b/WindowsTools/UI/Backdrop/CrossFadeEffect.cs
@@ -7,7 +7,7 @@
 namespace WindowsTools.UI.Backdrop
 {
     [Guid("12F575E8-4DB1-485F-9A84-03A07DD3829F")]
-    public class CrossFadeEffect : IGraphicsEffect, IGraphicsEffectSource, IGraphicsEffectD2D1Interop
+    public sealed class CrossFadeEffect : IGraphicsEffect, IGraphicsEffectSource, IGraphicsEffectD2D1Interop
     {
         public float CrossFade { get; set; } = 0.5f;
 

diff --git a/WindowsTools/UI/Backdrop/DesktopAcrylicBackdrop.cs b/WindowsTools/UI/Backdrop/DesktopAcrylicBackdrop.cs
@@ -665,7 +665,7 @@ private void UpdateBrush()
         /// <summary>
         /// 创建 DesktopAcrylic 背景色
         /// </summary>
-        private CompositionBrush BuildDesktopAcrylicEffectBrush(Compositor compositor, Color tintColor, float tintOpacity, float luminosityOpacity)
+        private CompositionEffectBrush BuildDesktopAcrylicEffectBrush(Compositor compositor, Color tintColor, float tintOpacity, float luminosityOpacity)
         {
             Color convertedLuminosityColor = ColorConversion.GetEffectiveLuminosityColor(tintColor, tintOpacity, luminosityOpacity);
             Color convertedTintColor = ColorConversion.GetEffectiveTintColor(tintColor, tintOpacity, luminosityOpacity);
@@ -780,7 +780,7 @@ private CompositionBrush BuildDesktopAcrylicEffectBrush(Compositor compositor, C
         /// <summary>
         /// 创建回退色切换时的动画颜色
         /// </summary>
-        private CompositionBrush CreateCrossFadeEffectBrush(Compositor compositor, CompositionBrush from, CompositionBrush to)
+        private CompositionEffectBrush CreateCrossFadeEffectBrush(Compositor compositor, CompositionBrush from, CompositionBrush to)
         {
             CrossFadeEffect crossFadeEffect = new()
             {

diff --git a/WindowsTools/UI/Backdrop/MicaBackdrop.cs b/WindowsTools/UI/Backdrop/MicaBackdrop.cs
@@ -12,6 +12,9 @@
 using WindowsTools.WindowsAPI.PInvoke.Kernel32;
 using WindowsTools.WindowsAPI.PInvoke.User32;
 
+// 抑制 CA1822 警告
+#pragma warning disable CA1822
+
 namespace WindowsTools.UI.Backdrop
 {
     /// <summary>
@@ -592,7 +595,7 @@ private void UpdateBrush()
         /// <summary>
         /// 创建 Mica 背景色
         /// </summary>
-        private CompositionBrush BuildMicaEffectBrush(Compositor compositor, Color tintColor, float tintOpacity, float luminosityOpacity)
+        private CompositionEffectBrush BuildMicaEffectBrush(Compositor compositor, Color tintColor, float tintOpacity, float luminosityOpacity)
         {
             // Tint Color.
             ColorSourceEffect tintColorEffect = new()
@@ -654,7 +657,7 @@ private CompositionBrush BuildMicaEffectBrush(Compositor compositor, Color tintC
         /// <summary>
         /// 创建回退色切换时的动画颜色
         /// </summary>
-        private CompositionBrush CreateCrossFadeEffectBrush(Compositor compositor, CompositionBrush from, CompositionBrush to)
+        private CompositionEffectBrush CreateCrossFadeEffectBrush(Compositor compositor, CompositionBrush from, CompositionBrush to)
         {
             CrossFadeEffect crossFadeEffect = new()
             {

diff --git a/WindowsTools/UI/Backdrop/OpacityEffect.cs b/WindowsTools/UI/Backdrop/OpacityEffect.cs
@@ -21,11 +21,6 @@ public int GetEffectId(out Guid id)
             return 0;
         }
 
-        public static bool IsSupported
-        {
-            get { return true; }
-        }
-
         public int GetNamedPropertyMapping(string name, out uint index, out GRAPHICS_EFFECT_PROPERTY_MAPPING mapping)
         {
             switch (name)

diff --git a/WindowsTools/UI/Backdrop/SystemBackdrop.cs b/WindowsTools/UI/Backdrop/SystemBackdrop.cs
@@ -4,6 +4,9 @@
 using Windows.UI.Composition.Desktop;
 using Windows.UI.Xaml;
 
+// 抑制 CA1822 警告
+#pragma warning disable CA1822
+
 namespace WindowsTools.UI.Backdrop
 {
     /// <summary>

diff --git a/WindowsTools/UI/Dialogs/OperationFailedDialog.xaml.cs b/WindowsTools/UI/Dialogs/OperationFailedDialog.xaml.cs
@@ -9,8 +9,8 @@
 using WindowsTools.Strings;
 using WindowsTools.UI.TeachingTips;
 
-// 抑制 IDE0060 警告
-#pragma warning disable IDE0060
+// 抑制 CA1822，IDE0060 警告
+#pragma warning disable CA1822,IDE0060
 
 namespace WindowsTools.UI.Dialogs
 {

diff --git a/WindowsTools/UI/Dialogs/RestartAppsDialog.xaml.cs b/WindowsTools/UI/Dialogs/RestartAppsDialog.xaml.cs
@@ -1,8 +1,8 @@
 using System.Windows.Forms;
 using Windows.UI.Xaml.Controls;
 
-// 抑制 IDE0060 警告
-#pragma warning disable IDE0060
+// 抑制 CA1822，IDE0060 警告
+#pragma warning disable CA1822,IDE0060
 
 namespace WindowsTools.UI.Dialogs
 {

diff --git a/WindowsTools/Views/Pages/AboutPage.xaml.cs b/WindowsTools/Views/Pages/AboutPage.xaml.cs
@@ -26,8 +26,8 @@
 using WindowsTools.UI.TeachingTips;
 using WindowsTools.WindowsAPI.PInvoke.Kernel32;
 
-// 抑制 IDE0060 警告
-#pragma warning disable IDE0060
+// 抑制 CA1806，IDE0060 警告
+#pragma warning disable CA1806,IDE0060
 
 namespace WindowsTools.Views.Pages
 {
@@ -58,6 +58,7 @@ public bool IsChecking
         private ListDictionary ReferenceList { get; } = new()
         {
             { "Microsoft.UI.Xaml", "https://github.com/microsoft/microsoft-ui-xaml"},
+            { "Microsoft.Windows.SDK.BuildTools", "https://aka.ms/WinSDKProjectURL"},
             { "Microsoft.Windows.SDK.Contracts", "https://aka.ms/WinSDKProjectURL"},
             { "Microsoft.WindowsAppSDK", "https://github.com/microsoft/windowsappsdk"},
             { "Mile.Xaml", "https://github.com/ProjectMile/Mile.Xaml"},

diff --git a/WindowsTools/Views/Pages/CodeScannerPage.xaml.cs b/WindowsTools/Views/Pages/CodeScannerPage.xaml.cs
@@ -28,8 +28,8 @@
 using ZXing.Common;
 using ZXing.QrCode;
 
-// 抑制 IDE0060 警告
-#pragma warning disable IDE0060
+// 抑制 CA1822，IDE0060 警告
+#pragma warning disable CA1822,IDE0060
 
 namespace WindowsTools.Views.Pages
 {

diff --git a/WindowsTools/Views/Pages/DownloadManagerPage.xaml.cs b/WindowsTools/Views/Pages/DownloadManagerPage.xaml.cs
@@ -30,8 +30,8 @@
 using WindowsTools.WindowsAPI.ComTypes;
 using WindowsTools.WindowsAPI.PInvoke.Shell32;
 
-// 抑制 IDE0060 警告
-#pragma warning disable IDE0060
+// 抑制 CA1806，IDE0060 警告
+#pragma warning disable CA1806,IDE0060
 
 namespace WindowsTools.Views.Pages
 {

diff --git a/WindowsTools/Views/Pages/FileNamePage.xaml.cs b/WindowsTools/Views/Pages/FileNamePage.xaml.cs
@@ -23,8 +23,8 @@
 using WindowsTools.UI.TeachingTips;
 using WindowsTools.WindowsAPI.ComTypes;
 
-// 抑制 IDE0060 警告
-#pragma warning disable IDE0060
+// 抑制 CA1806，IDE0060 警告
+#pragma warning disable CA1806,IDE0060
 
 namespace WindowsTools.Views.Pages
 {