From 04806d2004f247e3a41ad012fb98bcb7add91b6c Mon Sep 17 00:00:00 2001
From: doudou0720 <98651603+doudou0720@users.noreply.github.com>
Date: Sat, 28 Mar 2026 21:35:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ci):=20=E9=87=8D=E6=9E=84=E6=9E=84?=
=?UTF-8?q?=E5=BB=BA=E9=85=8D=E7=BD=AE=E5=92=8CCI=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
统一项目构建输出路径结构，移除冗余的x86 Debug配置
简化CI工作流中的artifact上传逻辑，支持多架构构建
更新PR检查工作流名称以更准确反映其用途
Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
---
.github/workflows/dotnet-desktop.yml | 17 ++++-------
.github/workflows/prcheck.yml | 18 ++++-------
Ink Canvas.sln | 4 +--
Ink Canvas/InkCanvasForClass.csproj | 45 ++++++----------------------
UI.WPF.Modern | 1 +
5 files changed, 23 insertions(+), 62 deletions(-)
create mode 160000 UI.WPF.Modern
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 01c5eaaf..7237097c 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -46,7 +46,7 @@ jobs:
- name: Check if exe file is generated
id: check-exe
run: |
- $exePath = "Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe"
+ $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
if (Test-Path $exePath) {
echo "build_success=true" >> $env:GITHUB_OUTPUT
@@ -69,19 +69,12 @@ jobs:
$version = "debug-$shortSha-$env:GITHUB_RUN_NUMBER"
echo "archive_name=$version" >> $env:GITHUB_OUTPUT
- - name: Upload Artifact(AnyCPU) (if build succeeded)
- if: steps.check-exe.outputs.build_success == 'true' && matrix.architecture == 'AnyCPU'
+ - name: Upload Artifact (if build succeeded)
+ if: steps.check-exe.outputs.build_success == 'true'
uses: actions/upload-artifact@v7
with:
- name: InkCanvasForClass.CE.debug
- path: "Ink Canvas/bin/Debug/net472/*"
-
- - name: Upload Artifact(x86) (if build succeeded)
- if: steps.check-exe.outputs.build_success == 'true' && matrix.architecture == 'x86'
- uses: actions/upload-artifact@v7
- with:
- name: InkCanvasForClass.CE.debug.x86
- path: "Ink Canvas/bin/x86 Debug/net472/*"
+ name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
+ path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*"
- name: Create Summary
if: always()
diff --git a/.github/workflows/prcheck.yml b/.github/workflows/prcheck.yml
index b97db0d3..95031f5e 100644
--- a/.github/workflows/prcheck.yml
+++ b/.github/workflows/prcheck.yml
@@ -1,4 +1,4 @@
-name: .NET Build & Package
+name: PR Check
on:
pull_request:
@@ -43,7 +43,7 @@ jobs:
- name: Check if exe file is generated
id: check-exe
run: |
- $exePath = "Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe"
+ $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
if (Test-Path $exePath) {
echo "build_success=true" >> $env:GITHUB_OUTPUT
@@ -66,19 +66,13 @@ jobs:
$version = "debug-$shortSha-$env:GITHUB_RUN_NUMBER"
echo "archive_name=$version" >> $env:GITHUB_OUTPUT
- - name: Upload Artifact(AnyCPU) (if build succeeded)
- if: steps.check-exe.outputs.build_success == 'true' && matrix.architecture == 'AnyCPU'
+ - name: Upload Artifact (if build succeeded)
+ if: steps.check-exe.outputs.build_success == 'true'
uses: actions/upload-artifact@v7
with:
- name: InkCanvasForClass.CE.debug
- path: "Ink Canvas/bin/Debug/net472/*"
+ name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
+ path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*"
- - name: Upload Artifact(x86) (if build succeeded)
- if: steps.check-exe.outputs.build_success == 'true' && matrix.architecture == 'x86'
- uses: actions/upload-artifact@v7
- with:
- name: InkCanvasForClass.CE.debug.x86
- path: "Ink Canvas/bin/x86 Debug/net472/*"
- name: Create Summary
if: always()
diff --git a/Ink Canvas.sln b/Ink Canvas.sln
index a1386662..133e83bb 100644
--- a/Ink Canvas.sln
+++ b/Ink Canvas.sln
@@ -27,8 +27,8 @@ Global
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.Build.0 = Debug|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.Build.0 = Debug|Any CPU
- {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.ActiveCfg = x86 Debug|AnyCPU
- {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.Build.0 = x86 Debug|AnyCPU
+ {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.ActiveCfg = Debug|x86
+ {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.Build.0 = Debug|x86
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.Build.0 = Release|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM.ActiveCfg = Release|Any CPU
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 44d6678b..39882ad6 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -25,23 +25,17 @@
false
False
true
- Debug;Release;x86 Debug
+ Debug;Release
embedded
- bin\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
AnyCPU
false
-
- embedded
- bin\$(Configuration)\
- x86
- true
-
embedded
- bin\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
AnyCPU
false
@@ -49,21 +43,14 @@
Resources\icc.ico
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- x86
- true
-
-
- bin\$(Platform)\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
full
7.3
x86
true
- bin\$(Platform)\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
pdbonly
7.3
x86
@@ -81,42 +68,28 @@
False
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- ARM64
- false
-
-
- bin\$(Platform)\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
full
7.3
ARM64
false
- bin\$(Platform)\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
pdbonly
7.3
ARM64
false
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- x64
- false
-
-
- bin\$(Platform)\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
full
7.3
x64
false
- bin\$(Platform)\$(Configuration)\
+ bin\$(Configuration)\$(Platform)\
pdbonly
7.3
x64
diff --git a/UI.WPF.Modern b/UI.WPF.Modern
new file mode 160000
index 00000000..d71cbc36
--- /dev/null
+++ b/UI.WPF.Modern
@@ -0,0 +1 @@
+Subproject commit d71cbc3609d51d67f41b9e50570ca4419defb212