diff --git a/.github/workflows/prcheck.yml b/.github/workflows/prcheck.yml index ca6031a1..6cb4fe13 100644 --- a/.github/workflows/prcheck.yml +++ b/.github/workflows/prcheck.yml @@ -3,7 +3,7 @@ name: PR Check on: pull_request: types: [opened, synchronize] - branches: [ main, beta ] + branches: [ main, net6 ] paths-ignore: - '**/*.md' @@ -43,7 +43,7 @@ jobs: - name: Check if exe file is generated id: check-exe run: | - $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe" + $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net6.0-windows10.0.19041.0\InkCanvasForClass.exe" if (Test-Path $exePath) { echo "build_success=true" >> $env:GITHUB_OUTPUT @@ -71,7 +71,7 @@ jobs: uses: actions/upload-artifact@v7 with: name: InkCanvasForClass.CE.debug.${{ matrix.architecture }} - path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*" + path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net6.0-windows10.0.19041.0/*" - name: Create Summary diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 45e8cbc3..f483bca4 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -236,7 +236,7 @@ jobs: - name: Check if exe file is generated id: check-exe run: | - $exePath = "Ink Canvas\bin\Release\${{ matrix.architecture }}\net472\InkCanvasForClass.exe" + $exePath = "Ink Canvas\bin\Release\${{ matrix.architecture }}\net6.0-windows10.0.19041.0\InkCanvasForClass.exe" if (Test-Path $exePath) { echo "build_success=true" >> $env:GITHUB_OUTPUT @@ -284,7 +284,7 @@ jobs: 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\net6.0-windows10.0.19041.0\*" "release/" -Recurse -Force # 创建压缩包 Compress-Archive -Path "release/*" -DestinationPath $archiveName -Force @@ -750,5 +750,5 @@ jobs: /repos/InkCanvasForClass/community/contents/AutomaticUpdateVersionControl.txt \ -f message="Update AutomaticUpdateVersionControl.txt" \ -f content="$CONTENT" \ - -f branch="beta" \ + -f branch="net6" \ ${SHA:+-f sha="$SHA"} diff --git a/README.md b/README.md index 55f6b773..7bebc726 100644 --- a/README.md +++ b/README.md @@ -55,13 +55,13 @@ 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 Runtime 6.0` 或更高版本。若没有,请[前往官网](https://dotnet.microsoft.com/zh-cn/download/dotnet/6.0)下载安装。 如果仍无法运行,请[安装 `Microsoft Office`](https://www.coolhub.top/archives/11)。 ## ✏️ 贡献指南 -**请注意,在贡献代码时,_务必_ 将所有代码提交到 _beta_ 分支,以保证beta版本总是新于main版本。** +**请注意,在贡献代码时,_务必_ 将所有代码提交到 _net6_ 分支,以保证net6版本总是新于main版本。** ## TODO LIST 1. 预备2.0版本开发 diff --git a/build/InkCanvasForClass CE.iss b/build/InkCanvasForClass CE.iss index d2c54381..576b9a34 100644 --- a/build/InkCanvasForClass CE.iss +++ b/build/InkCanvasForClass CE.iss @@ -59,13 +59,5 @@ Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon -[Code] -function InitializeSetup: Boolean; -begin - 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 - SuppressibleMsgBox('警告:未检测到 .NET Framework 4.7.2 或更高版本。应用程序可能无法正常运行。', mbInformation, MB_OK, IDOK); -end; - [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent \ No newline at end of file