From 4dd56a4e5d8de97a31cb6c3169edecfcef6ae6c3 Mon Sep 17 00:00:00 2001
From: doudou0720 <98651603+doudou0720@users.noreply.github.com>
Date: Sat, 18 Apr 2026 22:37:52 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E5=B0=86=E9=A1=B9=E7=9B=AE=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=BB=8E=20.NET=20Framewor?=
 =?UTF-8?q?k=20=E8=BF=81=E7=A7=BB=E8=87=B3=20.NET=206?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新 README.md 中的运行环境要求，修改贡献指南中的目标分支
调整 CI/CD 工作流以适配 .NET 6 构建路径
移除安装程序中对 .NET Framework 的依赖检查

Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
---
 .github/workflows/prcheck.yml    | 6 +++---
 .github/workflows/prerelease.yml | 6 +++---
 README.md                        | 4 ++--
 build/InkCanvasForClass CE.iss   | 8 --------
 4 files changed, 8 insertions(+), 16 deletions(-)

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