From f2f7eecd0427a447f1e8689caddcf560f6e3893d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=80=A1=E9=A3=9E?= <363301617@qq.com>
Date: Thu, 5 Sep 2024 22:55:51 +0800
Subject: [PATCH] Finish task and publish 3.0.905.0 version
1.Finish task and publish 3.0.905.0 version
2.Update Windows App SDK to 1.6.240829007
---
WindowsTools/Properties/AssemblyInfo.cs | 6 +++---
WindowsTools/WindowsTools.csproj | 3 ++-
WindowsToolsPackage/Package.appxmanifest | 2 +-
WindowsToolsShellExtension/Properties/AssemblyInfo.cs | 6 +++---
.../WindowsAPI/PInvoke/Shell32/Shell32Library.cs | 4 ++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/WindowsTools/Properties/AssemblyInfo.cs b/WindowsTools/Properties/AssemblyInfo.cs
index 00cfae39..df9b1184 100644
--- a/WindowsTools/Properties/AssemblyInfo.cs
+++ b/WindowsTools/Properties/AssemblyInfo.cs
@@ -4,8 +4,8 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("Windows 工具箱")]
-[assembly: AssemblyFileVersion("2.9.904.0")]
-[assembly: AssemblyInformationalVersion("2.9.904.0")]
+[assembly: AssemblyFileVersion("3.0.905.0")]
+[assembly: AssemblyInformationalVersion("3.0.905.0")]
[assembly: AssemblyProduct("Windows 工具箱")]
[assembly: AssemblyTitle("Windows 工具箱")]
-[assembly: AssemblyVersion("2.9.904.0")]
+[assembly: AssemblyVersion("3.0.905.0")]
diff --git a/WindowsTools/WindowsTools.csproj b/WindowsTools/WindowsTools.csproj
index 9d88d5a7..4b50d997 100644
--- a/WindowsTools/WindowsTools.csproj
+++ b/WindowsTools/WindowsTools.csproj
@@ -23,6 +23,7 @@
10.0.22621.0
true
true
+ false
False
false
@@ -313,7 +314,7 @@
-
+
diff --git a/WindowsToolsPackage/Package.appxmanifest b/WindowsToolsPackage/Package.appxmanifest
index f68751b4..06fb30cb 100644
--- a/WindowsToolsPackage/Package.appxmanifest
+++ b/WindowsToolsPackage/Package.appxmanifest
@@ -13,7 +13,7 @@
+ Version="3.0.905.0" />
ms-resource:PackageDisplayName
diff --git a/WindowsToolsShellExtension/Properties/AssemblyInfo.cs b/WindowsToolsShellExtension/Properties/AssemblyInfo.cs
index c592c989..598bfed4 100644
--- a/WindowsToolsShellExtension/Properties/AssemblyInfo.cs
+++ b/WindowsToolsShellExtension/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("Windows 工具箱 右键菜单扩展")]
-[assembly: AssemblyFileVersion("2.9.904.0")]
-[assembly: AssemblyInformationalVersion("2.9.904.0")]
+[assembly: AssemblyFileVersion("3.0.905.0")]
+[assembly: AssemblyInformationalVersion("3.0.905.0")]
[assembly: AssemblyProduct("Windows 工具箱 右键菜单扩展")]
[assembly: AssemblyTitle("Windows 工具箱 右键菜单扩展")]
-[assembly: AssemblyVersion("2.9.904.0")]
+[assembly: AssemblyVersion("3.0.905.0")]
// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
diff --git a/WindowsToolsShellExtension/WindowsAPI/PInvoke/Shell32/Shell32Library.cs b/WindowsToolsShellExtension/WindowsAPI/PInvoke/Shell32/Shell32Library.cs
index 01667adb..2cf0e263 100644
--- a/WindowsToolsShellExtension/WindowsAPI/PInvoke/Shell32/Shell32Library.cs
+++ b/WindowsToolsShellExtension/WindowsAPI/PInvoke/Shell32/Shell32Library.cs
@@ -20,8 +20,8 @@ public static partial class Shell32Library
/// 指向 以 null 结尾的字符串的指针，该字符串指定操作) 目录的默认 (。 如果此值为 NULL，则使用当前工作目录。 如果在 lpFile 中提供了相对路径，请不要对 lpDirectory 使用相对路径。
/// 指定应用程序在打开时如何显示应用程序的标志。 如果 lpFile 指定文档文件，则标志将直接传递给关联的应用程序。 由应用程序决定如何处理它。 它可以是在 ShowWindow 函数的 nCmdShow 参数中指定的任何值。
///
- [LibraryImport(Shell32, EntryPoint = "ShellExecuteW", SetLastError = false, StringMarshalling = StringMarshalling.Utf16)]
- public static partial nint ShellExecute(nint hwnd, [MarshalAs(UnmanagedType.LPWStr)] string lpOperation, [MarshalAs(UnmanagedType.LPWStr)] string lpFile, string lpParameters, [MarshalAs(UnmanagedType.LPWStr)] string lpDirectory, int nShowCmd);
+ [LibraryImport(Shell32, EntryPoint = "ShellExecuteW", SetLastError = false, StringMarshalling = StringMarshalling.Utf16), PreserveSig]
+ public static partial int ShellExecute(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string lpOperation, [MarshalAs(UnmanagedType.LPWStr)] string lpFile, string lpParameters, [MarshalAs(UnmanagedType.LPWStr)] string lpDirectory, int nShowCmd);
///
/// 检索由文件夹的 KNOWNFOLDERID 标识的已知文件夹的完整路径。