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
Gaoyifei1011 · Sep 5, 2024 · f2f7eec · f2f7eec
1 parent 3cadaee
commit f2f7eec
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -23,6 +23,7 @@
     <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
+    <WebView2EnableCsWinRTProjection>false</WebView2EnableCsWinRTProjection>
     <WebView2UseWinRT>False</WebView2UseWinRT>
     <WindowsAppSDKVerifyWinrtRuntimeVersion>false</WindowsAppSDKVerifyWinrtRuntimeVersion>
     <WindowsKitsPath></WindowsKitsPath>
@@ -313,7 +314,7 @@
     <PackageReference Include="Microsoft.UI.Xaml" Version="2.8.6" GeneratePathProperty="true" />
 
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240802000" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" GeneratePathProperty="true" />
     <PackageReference Include="Mile.Xaml" Version="2.3.1064" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />

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

diff --git 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
@@ -20,8 +20,8 @@ public static partial class Shell32Library
         /// <param name="lpDirectory">指向 以 null 结尾的字符串的指针，该字符串指定操作) 目录的默认 (。 如果此值为 NULL，则使用当前工作目录。 如果在 lpFile 中提供了相对路径，请不要对 lpDirectory 使用相对路径。</param>
         /// <param name="nShowCmd">指定应用程序在打开时如何显示应用程序的标志。 如果 lpFile 指定文档文件，则标志将直接传递给关联的应用程序。 由应用程序决定如何处理它。 它可以是在 ShowWindow 函数的 nCmdShow 参数中指定的任何值。</param>
         /// <returns></returns>
-        [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);
 
         /// <summary>
         /// 检索由文件夹的 KNOWNFOLDERID 标识的已知文件夹的完整路径。