diff --git a/Directory.Build.props b/Directory.Build.props index 4026545..18a3280 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,8 @@ diff --git a/GC-BOOT/GC-BOOT.csproj b/GC-BOOT/GC-BOOT.csproj new file mode 100644 index 0000000..b03015a --- /dev/null +++ b/GC-BOOT/GC-BOOT.csproj @@ -0,0 +1,24 @@ + + + + WinExe + enable + true + GC.Boot + GC + app.manifest + + ..\GC\src\Assets\icon.ico + true + + + + + + + + + + + + diff --git a/GC.sln b/GC.sln index 8186988..170e667 100644 --- a/GC.sln +++ b/GC.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC-BOOT", "GC-BOOT", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC", "GC-BOOT\GC.csproj", "{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC", "GC-BOOT\GC-BOOT.csproj", "{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC", "GC", "{3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5}" EndProject @@ -31,6 +31,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EADF0841-BEC EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarthRevolutionModel", "model\earth-revolution\src\EarthRevolutionModel.csproj", "{6BD9C21B-8F06-4F60-A087-696B6F03CC25}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.Core", "GC\src\GC.Core.csproj", "{AB63C416-5783-4FB9-A162-5BBA32E8BFCC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_sdk", "_sdk", "{6C38EF76-7D14-0C76-0B88-84F29EAA96CD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -101,6 +105,30 @@ Global {6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x64.Build.0 = Release|Any CPU {6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x86.ActiveCfg = Release|Any CPU {6BD9C21B-8F06-4F60-A087-696B6F03CC25}.Release|x86.Build.0 = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.ActiveCfg = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.Build.0 = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.ActiveCfg = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.Build.0 = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.Build.0 = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.ActiveCfg = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.Build.0 = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.ActiveCfg = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.Build.0 = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.ActiveCfg = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x64.Build.0 = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.ActiveCfg = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Debug|x86.Build.0 = Debug|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|Any CPU.Build.0 = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.ActiveCfg = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x64.Build.0 = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.ActiveCfg = Release|Any CPU + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -116,5 +144,7 @@ Global {0B92F86C-37C2-3C12-904C-85123CE34F4C} = {62B8A37E-7066-D91A-6443-87D4E6CE63FE} {EADF0841-BEC2-9A74-4322-069D7B5A6EBB} = {0B92F86C-37C2-3C12-904C-85123CE34F4C} {6BD9C21B-8F06-4F60-A087-696B6F03CC25} = {EADF0841-BEC2-9A74-4322-069D7B5A6EBB} + {AB63C416-5783-4FB9-A162-5BBA32E8BFCC} = {09578AA7-0862-3E52-D2AA-D8F7E863B74B} + {6C38EF76-7D14-0C76-0B88-84F29EAA96CD} = {62B8A37E-7066-D91A-6443-87D4E6CE63FE} EndGlobalSection EndGlobal diff --git a/GC-BOOT/App.axaml b/GC/src/App.axaml similarity index 96% rename from GC-BOOT/App.axaml rename to GC/src/App.axaml index 5128788..9f09ac6 100644 --- a/GC-BOOT/App.axaml +++ b/GC/src/App.axaml @@ -43,6 +43,6 @@ - + diff --git a/GC-BOOT/App.axaml.cs b/GC/src/App.axaml.cs similarity index 98% rename from GC-BOOT/App.axaml.cs rename to GC/src/App.axaml.cs index 91db551..2b8a10c 100644 --- a/GC-BOOT/App.axaml.cs +++ b/GC/src/App.axaml.cs @@ -56,7 +56,7 @@ public partial class App : Application try { using var iconStream = Avalonia.Platform.AssetLoader.Open( - new Uri("avares://GC/Assets/icon.png")); + new Uri("avares://GC.Core/Assets/icon.png")); window.Icon = new Avalonia.Controls.WindowIcon(iconStream); } catch { /* 图标缺失不影响启动 */ } diff --git a/GC-BOOT/Assets/i18n/en.json b/GC/src/Assets/i18n/en.json similarity index 100% rename from GC-BOOT/Assets/i18n/en.json rename to GC/src/Assets/i18n/en.json diff --git a/GC-BOOT/Assets/i18n/zh-CN.json b/GC/src/Assets/i18n/zh-CN.json similarity index 100% rename from GC-BOOT/Assets/i18n/zh-CN.json rename to GC/src/Assets/i18n/zh-CN.json diff --git a/GC-BOOT/Assets/icon-1024.png b/GC/src/Assets/icon-1024.png similarity index 100% rename from GC-BOOT/Assets/icon-1024.png rename to GC/src/Assets/icon-1024.png diff --git a/GC-BOOT/Assets/icon-128.png b/GC/src/Assets/icon-128.png similarity index 100% rename from GC-BOOT/Assets/icon-128.png rename to GC/src/Assets/icon-128.png diff --git a/GC-BOOT/Assets/icon-256.png b/GC/src/Assets/icon-256.png similarity index 100% rename from GC-BOOT/Assets/icon-256.png rename to GC/src/Assets/icon-256.png diff --git a/GC-BOOT/Assets/icon-32.png b/GC/src/Assets/icon-32.png similarity index 100% rename from GC-BOOT/Assets/icon-32.png rename to GC/src/Assets/icon-32.png diff --git a/GC-BOOT/Assets/icon-512.png b/GC/src/Assets/icon-512.png similarity index 100% rename from GC-BOOT/Assets/icon-512.png rename to GC/src/Assets/icon-512.png diff --git a/GC-BOOT/Assets/icon-64.png b/GC/src/Assets/icon-64.png similarity index 100% rename from GC-BOOT/Assets/icon-64.png rename to GC/src/Assets/icon-64.png diff --git a/GC-BOOT/Assets/icon.ico b/GC/src/Assets/icon.ico similarity index 100% rename from GC-BOOT/Assets/icon.ico rename to GC/src/Assets/icon.ico diff --git a/GC-BOOT/Assets/icon.png b/GC/src/Assets/icon.png similarity index 100% rename from GC-BOOT/Assets/icon.png rename to GC/src/Assets/icon.png diff --git a/GC-BOOT/GC.csproj b/GC/src/GC.Core.csproj similarity index 60% rename from GC-BOOT/GC.csproj rename to GC/src/GC.Core.csproj index 6fad61d..b7b73fb 100644 --- a/GC-BOOT/GC.csproj +++ b/GC/src/GC.Core.csproj @@ -1,22 +1,18 @@ - WinExe enable true GC - GC - app.manifest - - Assets\icon.ico + GC.Core false - true false - + + @@ -26,9 +22,8 @@ - - + diff --git a/GC-BOOT/Models/AppSettings.cs b/GC/src/Models/AppSettings.cs similarity index 100% rename from GC-BOOT/Models/AppSettings.cs rename to GC/src/Models/AppSettings.cs diff --git a/GC-BOOT/Models/ModelManifest.cs b/GC/src/Models/ModelManifest.cs similarity index 100% rename from GC-BOOT/Models/ModelManifest.cs rename to GC/src/Models/ModelManifest.cs diff --git a/GC-BOOT/Services/AppPaths.cs b/GC/src/Services/AppPaths.cs similarity index 100% rename from GC-BOOT/Services/AppPaths.cs rename to GC/src/Services/AppPaths.cs diff --git a/GC-BOOT/Services/AppServices.cs b/GC/src/Services/AppServices.cs similarity index 100% rename from GC-BOOT/Services/AppServices.cs rename to GC/src/Services/AppServices.cs diff --git a/GC-BOOT/Services/ContributorsService.cs b/GC/src/Services/ContributorsService.cs similarity index 100% rename from GC-BOOT/Services/ContributorsService.cs rename to GC/src/Services/ContributorsService.cs diff --git a/GC-BOOT/Services/DirectoryRemote.cs b/GC/src/Services/DirectoryRemote.cs similarity index 100% rename from GC-BOOT/Services/DirectoryRemote.cs rename to GC/src/Services/DirectoryRemote.cs diff --git a/GC-BOOT/Services/DownloadCenter.cs b/GC/src/Services/DownloadCenter.cs similarity index 100% rename from GC-BOOT/Services/DownloadCenter.cs rename to GC/src/Services/DownloadCenter.cs diff --git a/GC-BOOT/Services/GitCodeReleaseRemote.cs b/GC/src/Services/GitCodeReleaseRemote.cs similarity index 100% rename from GC-BOOT/Services/GitCodeReleaseRemote.cs rename to GC/src/Services/GitCodeReleaseRemote.cs diff --git a/GC-BOOT/Services/GitCodeRemote.cs b/GC/src/Services/GitCodeRemote.cs similarity index 100% rename from GC-BOOT/Services/GitCodeRemote.cs rename to GC/src/Services/GitCodeRemote.cs diff --git a/GC-BOOT/Services/GiteaRemote.cs b/GC/src/Services/GiteaRemote.cs similarity index 100% rename from GC-BOOT/Services/GiteaRemote.cs rename to GC/src/Services/GiteaRemote.cs diff --git a/GC-BOOT/Services/Json.cs b/GC/src/Services/Json.cs similarity index 100% rename from GC-BOOT/Services/Json.cs rename to GC/src/Services/Json.cs diff --git a/GC-BOOT/Services/LauncherUpdateFlow.cs b/GC/src/Services/LauncherUpdateFlow.cs similarity index 100% rename from GC-BOOT/Services/LauncherUpdateFlow.cs rename to GC/src/Services/LauncherUpdateFlow.cs diff --git a/GC-BOOT/Services/LauncherUpdater.cs b/GC/src/Services/LauncherUpdater.cs similarity index 100% rename from GC-BOOT/Services/LauncherUpdater.cs rename to GC/src/Services/LauncherUpdater.cs diff --git a/GC-BOOT/Services/Localization.cs b/GC/src/Services/Localization.cs similarity index 98% rename from GC-BOOT/Services/Localization.cs rename to GC/src/Services/Localization.cs index 96c2059..959cf8b 100644 --- a/GC-BOOT/Services/Localization.cs +++ b/GC/src/Services/Localization.cs @@ -75,7 +75,7 @@ public sealed class L : INotifyPropertyChanged { try { - var uri = new Uri($"avares://GC/Assets/i18n/{code}.json"); + var uri = new Uri($"avares://GC.Core/Assets/i18n/{code}.json"); using var stream = AssetLoader.Open(uri); using var reader = new StreamReader(stream); return JsonSerializer.Deserialize>(reader.ReadToEnd(), diff --git a/GC-BOOT/Services/MemoryBudget.cs b/GC/src/Services/MemoryBudget.cs similarity index 100% rename from GC-BOOT/Services/MemoryBudget.cs rename to GC/src/Services/MemoryBudget.cs diff --git a/GC-BOOT/Services/ModelHost.cs b/GC/src/Services/ModelHost.cs similarity index 100% rename from GC-BOOT/Services/ModelHost.cs rename to GC/src/Services/ModelHost.cs diff --git a/GC-BOOT/Services/ModelInstaller.cs b/GC/src/Services/ModelInstaller.cs similarity index 100% rename from GC-BOOT/Services/ModelInstaller.cs rename to GC/src/Services/ModelInstaller.cs diff --git a/GC-BOOT/Services/ModelRepository.cs b/GC/src/Services/ModelRepository.cs similarity index 100% rename from GC-BOOT/Services/ModelRepository.cs rename to GC/src/Services/ModelRepository.cs diff --git a/GC-BOOT/Services/ModelScanner.cs b/GC/src/Services/ModelScanner.cs similarity index 100% rename from GC-BOOT/Services/ModelScanner.cs rename to GC/src/Services/ModelScanner.cs diff --git a/GC-BOOT/Services/ModelSourceClient.cs b/GC/src/Services/ModelSourceClient.cs similarity index 100% rename from GC-BOOT/Services/ModelSourceClient.cs rename to GC/src/Services/ModelSourceClient.cs diff --git a/GC-BOOT/Services/ReleaseModels.cs b/GC/src/Services/ReleaseModels.cs similarity index 100% rename from GC-BOOT/Services/ReleaseModels.cs rename to GC/src/Services/ReleaseModels.cs diff --git a/GC-BOOT/Services/SettingsService.cs b/GC/src/Services/SettingsService.cs similarity index 100% rename from GC-BOOT/Services/SettingsService.cs rename to GC/src/Services/SettingsService.cs diff --git a/GC-BOOT/Services/Shell.cs b/GC/src/Services/Shell.cs similarity index 100% rename from GC-BOOT/Services/Shell.cs rename to GC/src/Services/Shell.cs diff --git a/GC-BOOT/Services/SourcePreset.cs b/GC/src/Services/SourcePreset.cs similarity index 100% rename from GC-BOOT/Services/SourcePreset.cs rename to GC/src/Services/SourcePreset.cs diff --git a/GC-BOOT/Services/SourceSelector.cs b/GC/src/Services/SourceSelector.cs similarity index 100% rename from GC-BOOT/Services/SourceSelector.cs rename to GC/src/Services/SourceSelector.cs diff --git a/GC-BOOT/Services/UpdateModels.cs b/GC/src/Services/UpdateModels.cs similarity index 100% rename from GC-BOOT/Services/UpdateModels.cs rename to GC/src/Services/UpdateModels.cs diff --git a/GC-BOOT/Services/UpdateService.cs b/GC/src/Services/UpdateService.cs similarity index 100% rename from GC-BOOT/Services/UpdateService.cs rename to GC/src/Services/UpdateService.cs diff --git a/GC-BOOT/Services/VersionUtil.cs b/GC/src/Services/VersionUtil.cs similarity index 100% rename from GC-BOOT/Services/VersionUtil.cs rename to GC/src/Services/VersionUtil.cs diff --git a/GC-BOOT/Services/ZipSafety.cs b/GC/src/Services/ZipSafety.cs similarity index 100% rename from GC-BOOT/Services/ZipSafety.cs rename to GC/src/Services/ZipSafety.cs diff --git a/GC-BOOT/Styles/AppTheme.axaml b/GC/src/Styles/AppTheme.axaml similarity index 100% rename from GC-BOOT/Styles/AppTheme.axaml rename to GC/src/Styles/AppTheme.axaml diff --git a/GC-BOOT/ViewModels/AboutViewModel.cs b/GC/src/ViewModels/AboutViewModel.cs similarity index 100% rename from GC-BOOT/ViewModels/AboutViewModel.cs rename to GC/src/ViewModels/AboutViewModel.cs diff --git a/GC-BOOT/ViewModels/DownloadViewModel.cs b/GC/src/ViewModels/DownloadViewModel.cs similarity index 100% rename from GC-BOOT/ViewModels/DownloadViewModel.cs rename to GC/src/ViewModels/DownloadViewModel.cs diff --git a/GC-BOOT/ViewModels/HomeViewModel.cs b/GC/src/ViewModels/HomeViewModel.cs similarity index 100% rename from GC-BOOT/ViewModels/HomeViewModel.cs rename to GC/src/ViewModels/HomeViewModel.cs diff --git a/GC-BOOT/ViewModels/MainViewModel.cs b/GC/src/ViewModels/MainViewModel.cs similarity index 100% rename from GC-BOOT/ViewModels/MainViewModel.cs rename to GC/src/ViewModels/MainViewModel.cs diff --git a/GC-BOOT/ViewModels/SettingsViewModel.cs b/GC/src/ViewModels/SettingsViewModel.cs similarity index 100% rename from GC-BOOT/ViewModels/SettingsViewModel.cs rename to GC/src/ViewModels/SettingsViewModel.cs diff --git a/GC-BOOT/Views/AboutView.axaml b/GC/src/Views/AboutView.axaml similarity index 100% rename from GC-BOOT/Views/AboutView.axaml rename to GC/src/Views/AboutView.axaml diff --git a/GC-BOOT/Views/AboutView.axaml.cs b/GC/src/Views/AboutView.axaml.cs similarity index 100% rename from GC-BOOT/Views/AboutView.axaml.cs rename to GC/src/Views/AboutView.axaml.cs diff --git a/GC-BOOT/Views/ConfirmWindow.axaml b/GC/src/Views/ConfirmWindow.axaml similarity index 100% rename from GC-BOOT/Views/ConfirmWindow.axaml rename to GC/src/Views/ConfirmWindow.axaml diff --git a/GC-BOOT/Views/ConfirmWindow.axaml.cs b/GC/src/Views/ConfirmWindow.axaml.cs similarity index 100% rename from GC-BOOT/Views/ConfirmWindow.axaml.cs rename to GC/src/Views/ConfirmWindow.axaml.cs diff --git a/GC-BOOT/Views/DownloadView.axaml b/GC/src/Views/DownloadView.axaml similarity index 100% rename from GC-BOOT/Views/DownloadView.axaml rename to GC/src/Views/DownloadView.axaml diff --git a/GC-BOOT/Views/DownloadView.axaml.cs b/GC/src/Views/DownloadView.axaml.cs similarity index 100% rename from GC-BOOT/Views/DownloadView.axaml.cs rename to GC/src/Views/DownloadView.axaml.cs diff --git a/GC-BOOT/Views/HomeView.axaml b/GC/src/Views/HomeView.axaml similarity index 100% rename from GC-BOOT/Views/HomeView.axaml rename to GC/src/Views/HomeView.axaml diff --git a/GC-BOOT/Views/HomeView.axaml.cs b/GC/src/Views/HomeView.axaml.cs similarity index 100% rename from GC-BOOT/Views/HomeView.axaml.cs rename to GC/src/Views/HomeView.axaml.cs diff --git a/GC-BOOT/Views/LoadingWindow.cs b/GC/src/Views/LoadingWindow.cs similarity index 100% rename from GC-BOOT/Views/LoadingWindow.cs rename to GC/src/Views/LoadingWindow.cs diff --git a/GC-BOOT/Views/MainWindow.axaml b/GC/src/Views/MainWindow.axaml similarity index 100% rename from GC-BOOT/Views/MainWindow.axaml rename to GC/src/Views/MainWindow.axaml diff --git a/GC-BOOT/Views/MainWindow.axaml.cs b/GC/src/Views/MainWindow.axaml.cs similarity index 100% rename from GC-BOOT/Views/MainWindow.axaml.cs rename to GC/src/Views/MainWindow.axaml.cs diff --git a/GC-BOOT/Views/SettingsView.axaml b/GC/src/Views/SettingsView.axaml similarity index 100% rename from GC-BOOT/Views/SettingsView.axaml rename to GC/src/Views/SettingsView.axaml diff --git a/GC-BOOT/Views/SettingsView.axaml.cs b/GC/src/Views/SettingsView.axaml.cs similarity index 100% rename from GC-BOOT/Views/SettingsView.axaml.cs rename to GC/src/Views/SettingsView.axaml.cs diff --git a/GC-BOOT/Views/UpdaterWindow.cs b/GC/src/Views/UpdaterWindow.cs similarity index 100% rename from GC-BOOT/Views/UpdaterWindow.cs rename to GC/src/Views/UpdaterWindow.cs diff --git a/GC/src/test/dotnet/GC.Tests/GC.Tests.csproj b/GC/src/test/dotnet/GC.Tests/GC.Tests.csproj index 9117925..6262e72 100644 --- a/GC/src/test/dotnet/GC.Tests/GC.Tests.csproj +++ b/GC/src/test/dotnet/GC.Tests/GC.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/README.md b/README.md index bfd05e6..5d82acb 100644 --- a/README.md +++ b/README.md @@ -56,12 +56,17 @@ Repository/ ├── Directory.Build.props # 公共构建属性 ├── version.json # ★ 自动生成的版本清单(推送到仓库后才生效) ├── build.sh / build.ps1 # 构建脚本 -├── GC/ # 原 src 内容 -│ └── src/test/dotnet/GC.Tests/ # 离屏校验 + --update-test 离线更新链路验证 -├── GC-BOOT/ # 启动器(不实现模型绘制) -│ ├── Models/ Services/ # 清单/设置/目录探测/i18n/模型库/下载/自动更新 -│ ├── ViewModels/ Views/ # 主页、下载、设置和启动更新状态 -│ └── Assets/i18n/ # 启动器界面语言包 +├── GC/ # 启动器主要代码 +│ └── src/ +│ ├── GC.Core.csproj +│ ├── Models/ Services/ # 清单/设置/目录探测/i18n/模型库/下载/自动更新 +│ ├── ViewModels/ Views/ # 主页、下载、设置和启动更新状态 +│ ├── Assets/i18n/ # 启动器界面语言包 +│ └── test/dotnet/GC.Tests/ # 离屏校验 + --update-test 离线更新链路验证 +├── GC-BOOT/ # 轻量启动入口 +│ ├── GC-BOOT.csproj +│ ├── Program.cs +│ └── app.manifest ├── GC-DRAW/PlayerWindow.cs # 通用模型窗口宿主;实际绘制由模型提供 ├── model/ # ★ 模型的一切 │ ├── version.json # 与根 version.json 相同(便于按 model/ 地址读取) diff --git a/build.ps1 b/build.ps1 index 7d94d78..ef16539 100644 --- a/build.ps1 +++ b/build.ps1 @@ -15,7 +15,7 @@ $Root = $PSScriptRoot Set-Location $Root $env:AVALONIA_TELEMETRY_OPTOUT = '1' -$AppProj = 'GC-BOOT/GC.csproj' +$AppProj = 'GC-BOOT/GC-BOOT.csproj' $TestProj = 'GC/src/test/dotnet/GC.Tests/GC.Tests.csproj' $StampProj= 'model/_engine/VersionStamp/VersionStamp.csproj' $Sln = 'GC.sln' diff --git a/build.sh b/build.sh index 10572b6..717be71 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ export AVALONIA_TELEMETRY_OPTOUT=1 ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) cd "$ROOT_DIR" -APP_PROJ="GC-BOOT/GC.csproj" +APP_PROJ="GC-BOOT/GC-BOOT.csproj" PREVIEW_PROJ="model/_engine/PreviewGen/PreviewGen.csproj" STAMP_PROJ="model/_engine/VersionStamp/VersionStamp.csproj" TEST_PROJ="GC/src/test/dotnet/GC.Tests/GC.Tests.csproj" diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index 329f341..b37d561 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -220,7 +220,7 @@ PLIST mv "$f" "$APP/Contents/MacOS/" done # 应用图标:由 Assets/icon-1024.png 生成 .icns - ICONSRC="$ROOT_DIR/GC-BOOT/Assets/icon-1024.png" + ICONSRC="$ROOT_DIR/GC/src/Assets/icon-1024.png" if [ -f "$ICONSRC" ] && command -v iconutil >/dev/null 2>&1; then ICONSET="$DIST/AppIcon.iconset" rm -rf "$ICONSET"; mkdir -p "$ICONSET" diff --git a/model/contour-map/contour-map.json b/model/contour-map/contour-map.json index 04929da..c85fc99 100644 --- a/model/contour-map/contour-map.json +++ b/model/contour-map/contour-map.json @@ -25,6 +25,6 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "updatedAt": "2026-11-14T04:52:33Z", - "build": "6824878fe5" + "updatedAt": "2026-11-14T05:09:30Z", + "build": "257dcfd58f" } diff --git a/model/earth-geography/earth-geography.json b/model/earth-geography/earth-geography.json index 15abb3a..b902ca2 100644 --- a/model/earth-geography/earth-geography.json +++ b/model/earth-geography/earth-geography.json @@ -18,7 +18,7 @@ ], "dataDir": "earth-geography.model", "version": "1.8", - "updatedAt": "2026-11-14T04:52:33Z", + "updatedAt": "2026-11-14T05:09:30Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -26,5 +26,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "e06308cb71" + "build": "3a10607730" } diff --git a/model/earth-revolution/earth-revolution.json b/model/earth-revolution/earth-revolution.json index bd3709e..10a95db 100644 --- a/model/earth-revolution/earth-revolution.json +++ b/model/earth-revolution/earth-revolution.json @@ -24,7 +24,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.6", - "updatedAt": "2026-11-14T04:52:33Z", + "updatedAt": "2026-11-14T05:09:30Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -32,5 +32,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "dfe649ec3c" + "build": "30d5d835df" } diff --git a/model/earth-rotation/earth-rotation.json b/model/earth-rotation/earth-rotation.json index 824bbb2..c18f5bc 100644 --- a/model/earth-rotation/earth-rotation.json +++ b/model/earth-rotation/earth-rotation.json @@ -24,7 +24,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.6", - "updatedAt": "2026-11-14T04:52:33Z", + "updatedAt": "2026-11-14T05:09:30Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -32,5 +32,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "ea8cf4a843" + "build": "aaeef1614c" } diff --git a/model/scale-calculator/scale-calculator.json b/model/scale-calculator/scale-calculator.json index 21edf09..6db8f4a 100644 --- a/model/scale-calculator/scale-calculator.json +++ b/model/scale-calculator/scale-calculator.json @@ -25,7 +25,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.5", - "updatedAt": "2026-11-14T04:52:33Z", + "updatedAt": "2026-11-14T05:09:30Z", "chrome": { "titleBar": "#FFFFFF", "titleBorder": "#E3E8F3", @@ -33,5 +33,5 @@ "button": "#5B6A86", "frame": "#F4F6FB" }, - "build": "139afd4199" + "build": "c41765488d" } diff --git a/model/scale-calculator/src/ScaleCalculatorView.cs b/model/scale-calculator/src/ScaleCalculatorView.cs index 17b12e1..ad01e6e 100644 --- a/model/scale-calculator/src/ScaleCalculatorView.cs +++ b/model/scale-calculator/src/ScaleCalculatorView.cs @@ -17,7 +17,7 @@ namespace NeoRF.ScaleCalculator; /// public sealed partial class ScaleCalculatorView : UserControl { - // 调色(与 GC-BOOT/Styles/AppTheme.axaml 一致) + // 调色(与 GC/src/Styles/AppTheme.axaml 一致) internal static readonly Color CAppBg = Color.Parse("#F4F6FB"); internal static readonly Color CSurface = Color.Parse("#FFFFFF"); internal static readonly Color CSurfaceAlt = Color.Parse("#F7F9FE"); diff --git a/model/version.json b/model/version.json index bafe588..b1045d3 100644 --- a/model/version.json +++ b/model/version.json @@ -1,6 +1,6 @@ { "schema": 1, - "generated": "2026-11-14T04:52:33Z", + "generated": "2026-11-14T05:09:30Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", @@ -34,31 +34,31 @@ { "id": "contour-map", "version": "1.0", - "build": "6824878fe5", + "build": "257dcfd58f", "dir": "model/contour-map" }, { "id": "earth-geography", "version": "1.8", - "build": "e06308cb71", + "build": "3a10607730", "dir": "model/earth-geography" }, { "id": "earth-revolution", "version": "1.6", - "build": "dfe649ec3c", + "build": "30d5d835df", "dir": "model/earth-revolution" }, { "id": "earth-rotation", "version": "1.6", - "build": "ea8cf4a843", + "build": "aaeef1614c", "dir": "model/earth-rotation" }, { "id": "scale-calculator", "version": "1.5", - "build": "139afd4199", + "build": "c41765488d", "dir": "model/scale-calculator" } ] diff --git a/version.json b/version.json index bafe588..b1045d3 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "schema": 1, - "generated": "2026-11-14T04:52:33Z", + "generated": "2026-11-14T05:09:30Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", @@ -34,31 +34,31 @@ { "id": "contour-map", "version": "1.0", - "build": "6824878fe5", + "build": "257dcfd58f", "dir": "model/contour-map" }, { "id": "earth-geography", "version": "1.8", - "build": "e06308cb71", + "build": "3a10607730", "dir": "model/earth-geography" }, { "id": "earth-revolution", "version": "1.6", - "build": "dfe649ec3c", + "build": "30d5d835df", "dir": "model/earth-revolution" }, { "id": "earth-rotation", "version": "1.6", - "build": "ea8cf4a843", + "build": "aaeef1614c", "dir": "model/earth-rotation" }, { "id": "scale-calculator", "version": "1.5", - "build": "139afd4199", + "build": "c41765488d", "dir": "model/scale-calculator" } ]