feat:Downgrade to .NET Framework 4.6.2 project (#415)
* chore:Init net 462 * feat: 将 .NET Framework 依赖从 4.7.2 降级至 4.6.2 更新应用配置、安装程序和文档以支持 .NET Framework 4.6.2 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> --------- Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
This commit is contained in:
@@ -46,7 +46,7 @@ jobs:
|
|||||||
- name: Check if exe file is generated
|
- name: Check if exe file is generated
|
||||||
id: check-exe
|
id: check-exe
|
||||||
run: |
|
run: |
|
||||||
$exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
|
$exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net462\InkCanvasForClass.exe"
|
||||||
|
|
||||||
if (Test-Path $exePath) {
|
if (Test-Path $exePath) {
|
||||||
echo "build_success=true" >> $env:GITHUB_OUTPUT
|
echo "build_success=true" >> $env:GITHUB_OUTPUT
|
||||||
@@ -74,7 +74,7 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
|
name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
|
||||||
path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*"
|
path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net462/*"
|
||||||
|
|
||||||
- name: Create Summary
|
- name: Create Summary
|
||||||
if: always()
|
if: always()
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ jobs:
|
|||||||
- name: Check if exe file is generated
|
- name: Check if exe file is generated
|
||||||
id: check-exe
|
id: check-exe
|
||||||
run: |
|
run: |
|
||||||
$exePath = "Ink Canvas\bin\Release\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
|
$exePath = "Ink Canvas/bin/Release/${{ matrix.architecture }}/net462/InkCanvasForClass.exe"
|
||||||
|
|
||||||
if (Test-Path $exePath) {
|
if (Test-Path $exePath) {
|
||||||
echo "build_success=true" >> $env:GITHUB_OUTPUT
|
echo "build_success=true" >> $env:GITHUB_OUTPUT
|
||||||
@@ -283,8 +283,8 @@ jobs:
|
|||||||
# 创建发布目录
|
# 创建发布目录
|
||||||
New-Item -ItemType Directory -Path "release" -Force
|
New-Item -ItemType Directory -Path "release" -Force
|
||||||
|
|
||||||
# 复制发布文件(使用架构特定的路径)
|
# 复制发布文件
|
||||||
Copy-Item "Ink Canvas\bin\Release\$architecture\net472\*" "release/" -Recurse -Force
|
Copy-Item "Ink Canvas/bin/Release/$architecture/net462/*" "release/" -Recurse -Force
|
||||||
|
|
||||||
# 创建压缩包
|
# 创建压缩包
|
||||||
Compress-Archive -Path "release/*" -DestinationPath $archiveName -Force
|
Compress-Archive -Path "release/*" -DestinationPath $archiveName -Force
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup useLegacyV2RuntimeActivationPolicy="true">
|
<startup useLegacyV2RuntimeActivationPolicy="true">
|
||||||
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
||||||
</startup>
|
</startup>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
/// <returns>派生出的密钥字节数组,长度等于 <paramref name="keyBytes"/>。</returns>
|
/// <returns>派生出的密钥字节数组,长度等于 <paramref name="keyBytes"/>。</returns>
|
||||||
private static byte[] DeriveKey(string password, byte[] salt, int keyBytes)
|
private static byte[] DeriveKey(string password, byte[] salt, int keyBytes)
|
||||||
{
|
{
|
||||||
// 注意:Rfc2898DeriveBytes 在 net472 默认 HMACSHA1
|
// 注意:Rfc2898DeriveBytes 在 net462 默认 HMACSHA1
|
||||||
using (var kdf = new Rfc2898DeriveBytes(password, salt, Pbkdf2Iterations))
|
using (var kdf = new Rfc2898DeriveBytes(password, salt, Pbkdf2Iterations))
|
||||||
{
|
{
|
||||||
return kdf.GetBytes(keyBytes);
|
return kdf.GetBytes(keyBytes);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<RootNamespace>Ink_Canvas</RootNamespace>
|
<RootNamespace>Ink_Canvas</RootNamespace>
|
||||||
<AssemblyName>InkCanvasForClass</AssemblyName>
|
<AssemblyName>InkCanvasForClass</AssemblyName>
|
||||||
<TargetFramework>net472</TargetFramework>
|
<TargetFramework>net462</TargetFramework>
|
||||||
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
".NETFramework,Version=v4.7.2": {
|
".NETFramework,Version=v4.6.2": {
|
||||||
"AForge.Imaging": {
|
"AForge.Imaging": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[2.2.5, )",
|
"requested": "[2.2.5, )",
|
||||||
@@ -92,7 +92,7 @@
|
|||||||
"resolved": "1.0.3",
|
"resolved": "1.0.3",
|
||||||
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
|
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3"
|
"Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.Office.Interop.PowerPoint": {
|
"Microsoft.Office.Interop.PowerPoint": {
|
||||||
@@ -198,10 +198,10 @@
|
|||||||
"System.Threading.Tasks.Extensions": "4.5.4"
|
"System.Threading.Tasks.Extensions": "4.5.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.NETFramework.ReferenceAssemblies.net472": {
|
"Microsoft.NETFramework.ReferenceAssemblies.net462": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "1.0.3",
|
"resolved": "1.0.3",
|
||||||
"contentHash": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw=="
|
"contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ=="
|
||||||
},
|
},
|
||||||
"Microsoft.Win32.Registry": {
|
"Microsoft.Win32.Registry": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -332,7 +332,7 @@
|
|||||||
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
|
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
".NETFramework,Version=v4.7.2/win": {
|
".NETFramework,Version=v4.6.2/win": {
|
||||||
"Microsoft.Win32.Registry": {
|
"Microsoft.Win32.Registry": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "5.0.0",
|
||||||
@@ -361,7 +361,7 @@
|
|||||||
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
|
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
".NETFramework,Version=v4.7.2/win-arm64": {
|
".NETFramework,Version=v4.6.2/win-arm64": {
|
||||||
"Microsoft.Win32.Registry": {
|
"Microsoft.Win32.Registry": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "5.0.0",
|
||||||
@@ -390,7 +390,7 @@
|
|||||||
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
|
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
".NETFramework,Version=v4.7.2/win-x64": {
|
".NETFramework,Version=v4.6.2/win-x64": {
|
||||||
"Microsoft.Win32.Registry": {
|
"Microsoft.Win32.Registry": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "5.0.0",
|
||||||
@@ -419,7 +419,7 @@
|
|||||||
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
|
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
".NETFramework,Version=v4.7.2/win-x86": {
|
".NETFramework,Version=v4.6.2/win-x86": {
|
||||||
"Microsoft.Win32.Registry": {
|
"Microsoft.Win32.Registry": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "5.0.0",
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
4. 如果上述方法不能解决你的问题,请参考这个链接[【点击此处以跳转】](https://www.inkeys.top/tutorial/ppt-com.html)
|
4. 如果上述方法不能解决你的问题,请参考这个链接[【点击此处以跳转】](https://www.inkeys.top/tutorial/ppt-com.html)
|
||||||
|
|
||||||
### 程序无法正常启动
|
### 程序无法正常启动
|
||||||
请检查你的电脑上是否安装了 `.Net Framework 4.7.2` 或更高版本。若没有,请[前往官网](https://dotnet.microsoft.com/zh-cn/download/dotnet-framework/thank-you/net472-offline-installer "下载 .Net Framework 4.7.2")下载安装。
|
请检查你的电脑上是否安装了 `.Net Framework 4.6.2` 或更高版本。若没有,请[前往官网](https://dotnet.microsoft.com/zh-cn/download/dotnet-framework/thank-you/net462-offline-installer "下载 .Net Framework 4.6.2")下载安装。
|
||||||
|
|
||||||
如果仍无法运行,请[安装 `Microsoft Office`](https://www.coolhub.top/archives/11)。
|
如果仍无法运行,请[安装 `Microsoft Office`](https://www.coolhub.top/archives/11)。
|
||||||
|
|
||||||
|
|||||||
@@ -63,8 +63,8 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
|
|||||||
function InitializeSetup: Boolean;
|
function InitializeSetup: Boolean;
|
||||||
begin
|
begin
|
||||||
Result := True; // Always allow setup to continue
|
Result := True; // Always allow setup to continue
|
||||||
if not IsDotNetInstalled(net472, 0) then // Check if .NET Framework version 4.7.2 or compatible is installed
|
if not IsDotNetInstalled(net462, 0) then // Check if .NET Framework version 4.6.2 or compatible is installed
|
||||||
SuppressibleMsgBox('警告:未检测到 .NET Framework 4.7.2 或更高版本。应用程序可能无法正常运行。', mbInformation, MB_OK, IDOK);
|
SuppressibleMsgBox('警告:未检测到 .NET Framework 4.6.2 或更高版本。应用程序可能无法正常运行。', mbInformation, MB_OK, IDOK);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
[Run]
|
[Run]
|
||||||
|
|||||||
Reference in New Issue
Block a user