Skip to content

Commit a05306f

Browse files
committed
feat: 将 .NET Framework 依赖从 4.7.2 降级至 4.6.2
更新应用配置、安装程序和文档以支持 .NET Framework 4.6.2 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
1 parent 7046ede commit a05306f

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Ink Canvas/App.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup useLegacyV2RuntimeActivationPolicy="true">
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
45
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
5-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
6+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
67
</startup>
78
</configuration>

Ink Canvas/Helpers/SecurityManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public static void ClearPassword(Settings settings)
302302
/// <returns>派生出的密钥字节数组,长度等于 <paramref name="keyBytes"/>。</returns>
303303
private static byte[] DeriveKey(string password, byte[] salt, int keyBytes)
304304
{
305-
// 注意:Rfc2898DeriveBytes 在 net472 默认 HMACSHA1
305+
// 注意:Rfc2898DeriveBytes 在 net462 默认 HMACSHA1
306306
using (var kdf = new Rfc2898DeriveBytes(password, salt, Pbkdf2Iterations))
307307
{
308308
return kdf.GetBytes(keyBytes);

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
4. 如果上述方法不能解决你的问题,请参考这个链接[【点击此处以跳转】](https://www.inkeys.top/tutorial/ppt-com.html)
5656

5757
### 程序无法正常启动
58-
请检查你的电脑上是否安装了 `.Net Framework 4.7.2` 或更高版本。若没有,请[前往官网](https://dotnet.microsoft.com/zh-cn/download/dotnet-framework/thank-you/net472-offline-installer "下载 .Net Framework 4.7.2")下载安装。
58+
请检查你的电脑上是否安装了 `.Net Framework 4.6.2` 或更高版本。若没有,请[前往官网](https://dotnet.microsoft.com/zh-cn/download/dotnet-framework/thank-you/net462-offline-installer "下载 .Net Framework 4.6.2")下载安装。
5959

6060
如果仍无法运行,请[安装 `Microsoft Office`](https://www.coolhub.top/archives/11)
6161

build/InkCanvasForClass CE.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
6363
function InitializeSetup: Boolean;
6464
begin
6565
Result := True; // Always allow setup to continue
66-
if not IsDotNetInstalled(net472, 0) then // Check if .NET Framework version 4.7.2 or compatible is installed
67-
SuppressibleMsgBox('警告:未检测到 .NET Framework 4.7.2 或更高版本。应用程序可能无法正常运行。', mbInformation, MB_OK, IDOK);
66+
if not IsDotNetInstalled(net462, 0) then // Check if .NET Framework version 4.6.2 or compatible is installed
67+
SuppressibleMsgBox('警告:未检测到 .NET Framework 4.6.2 或更高版本。应用程序可能无法正常运行。', mbInformation, MB_OK, IDOK);
6868
end;
6969
7070
[Run]

0 commit comments

Comments
 (0)