Skip to content

Commit 923a7cd

Browse files
JusterZhuJusterZhu
committed
refactor: flatten src/c#/ → src/, drop Firmware from slnx
- Move all projects and configs from src/c#/ to src/ (no c# layer) - Delete phantom GeneralUpdate.Firmware reference from .slnx - Update CI job paths: ci.yml, dotnet-ci.yaml - Update test .csproj references (7 projects) - Update .gitignore IDE entries - Update slnx test-folder relative paths (../tests/)
1 parent 9d70553 commit 923a7cd

278 files changed

Lines changed: 37 additions & 38 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
dotnet-version: '10.0.x'
2323

2424
- name: Restore
25-
run: dotnet restore ./src/c#/GeneralUpdate.slnx
25+
run: dotnet restore ./src/GeneralUpdate.slnx
2626

2727
- name: Build
28-
run: dotnet build ./src/c#/GeneralUpdate.slnx -c Release --no-restore
28+
run: dotnet build ./src/GeneralUpdate.slnx -c Release --no-restore
2929

3030
- name: Test (Windows)
3131
if: runner.os == 'Windows'
32-
run: dotnet test ./src/c#/GeneralUpdate.slnx -c Release --no-build --filter "FullyQualifiedName!~ConfiginfoBuilderTests&FullyQualifiedName!~CleanBackup_KeepsOnlyRecentVersions&FullyQualifiedName!~SharedMemoryProvider_RoundTrip&FullyQualifiedName!~AutoProvider_ThrowsWhenAllFail&FullyQualifiedName!~DefaultRetryPolicy_ExponentialBackoff&FullyQualifiedName!~SimulatedCrash_ProducesDumpAndReportFiles"
32+
run: dotnet test ./src/GeneralUpdate.slnx -c Release --no-build --filter "FullyQualifiedName!~ConfiginfoBuilderTests&FullyQualifiedName!~CleanBackup_KeepsOnlyRecentVersions&FullyQualifiedName!~SharedMemoryProvider_RoundTrip&FullyQualifiedName!~AutoProvider_ThrowsWhenAllFail&FullyQualifiedName!~DefaultRetryPolicy_ExponentialBackoff&FullyQualifiedName!~SimulatedCrash_ProducesDumpAndReportFiles"
3333

3434
- name: Test (Ubuntu - cross-platform)
3535
if: runner.os == 'Linux'
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: '10.0.x'
5050

5151
- name: Restore
52-
run: dotnet restore ./src/c#/GeneralUpdate.slnx
52+
run: dotnet restore ./src/GeneralUpdate.slnx
5353

5454
- name: Verify AOT compatibility
55-
run: dotnet build ./src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj -c Release -f net10.0 /p:IsAotCompatible=true --no-restore
55+
run: dotnet build ./src/GeneralUpdate.Core/GeneralUpdate.Core.csproj -c Release -f net10.0 /p:IsAotCompatible=true --no-restore

‎.github/workflows/dotnet-ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242
echo "version=$raw" >> $env:GITHUB_OUTPUT
4343
4444
- name: 恢复依赖
45-
run: dotnet restore ./src/c#/GeneralUpdate.slnx # 使用解决方案统一恢复
45+
run: dotnet restore ./src/GeneralUpdate.slnx # 使用解决方案统一恢复
4646

4747
- name: 构建项目（确保生成DLL）
48-
run: dotnet build ./src/c#/GeneralUpdate.slnx -c Release --no-restore # 显式构建，避免重复恢复
48+
run: dotnet build ./src/GeneralUpdate.slnx -c Release --no-restore # 显式构建，避免重复恢复
4949

5050
- name: 打包NuGet包
5151
continue-on-error: true # NuGet包可单独上传，不阻塞Release
@@ -61,7 +61,7 @@ jobs:
6161
$failed = $false
6262
foreach ($project in $projects) {
6363
Write-Host "=== 打包 $project ==="
64-
& dotnet pack ./src/c#/$project/$project.csproj `
64+
& dotnet pack ./src/$project/$project.csproj `
6565
-c Release `
6666
-o ./nupkgs `
6767
-p:Version='${{ steps.normalize.outputs.version }}' `

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,6 @@ FakesAssemblies/
191191
*.txt
192192
*.v3
193193
*.v5
194-
src/c\#/.vs
195-
src/c\#/.idea
196-
src/c\#/global.json
194+
src/.vs
195+
src/.idea
196+
src/global.json

src/c#/Directory.Build.props renamed to src/Directory.Build.props

File renamed without changes.

src/c#/GeneralUpdate.Bowl/Applications/Linux/install.sh renamed to src/GeneralUpdate.Bowl/Applications/Linux/install.sh

File renamed without changes.

src/c#/GeneralUpdate.Bowl/Applications/Linux/procdump-3.3.0-0.cm2.x86_64.rpm renamed to src/GeneralUpdate.Bowl/Applications/Linux/procdump-3.3.0-0.cm2.x86_64.rpm

File renamed without changes.

src/c#/GeneralUpdate.Bowl/Applications/Linux/procdump-3.3.0-0.el8.x86_64.rpm renamed to src/GeneralUpdate.Bowl/Applications/Linux/procdump-3.3.0-0.el8.x86_64.rpm

File renamed without changes.

src/c#/GeneralUpdate.Bowl/Applications/Linux/procdump_3.3.0_amd64.deb renamed to src/GeneralUpdate.Bowl/Applications/Linux/procdump_3.3.0_amd64.deb

File renamed without changes.

src/c#/GeneralUpdate.Bowl/Applications/Windows/export.bat renamed to src/GeneralUpdate.Bowl/Applications/Windows/export.bat

File renamed without changes.

src/c#/GeneralUpdate.Bowl/Applications/Windows/procdump.exe renamed to src/GeneralUpdate.Bowl/Applications/Windows/procdump.exe

File renamed without changes.

0 commit comments

Comments
 (0)