From d59b92b4dd8e8b618d2f62a9749317344d1e8795 Mon Sep 17 00:00:00 2001 From: cneicy Date: Wed, 26 Aug 2026 12:00:41 +0800 Subject: [PATCH] fix(workspace): adopt installer diagnostics patch --- Assets/Editor/ShrinkSdkWorkspaceValidation.cs | 2 +- Assets/Modules/ShrinkInstaller | 2 +- DESIGN.md | 2 +- README.md | 2 +- .../Validate-PublishedUpmConsumers.sh | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Editor/ShrinkSdkWorkspaceValidation.cs b/Assets/Editor/ShrinkSdkWorkspaceValidation.cs index 6d40314..719369b 100644 --- a/Assets/Editor/ShrinkSdkWorkspaceValidation.cs +++ b/Assets/Editor/ShrinkSdkWorkspaceValidation.cs @@ -29,7 +29,7 @@ namespace ShrinkSDK.WorkspaceValidation new ExpectedPackage("ShrinkDataSaver.Integration.EventBus", "com.cneicy.shrink-datasaver-integration-eventbus", "2.1.0"), new ExpectedPackage("ShrinkEventBus", "com.cneicy.shrink-eventbus", "2.0.0"), new ExpectedPackage("ShrinkEventBus.Entities", "com.cneicy.shrink-eventbus-entities", "0.1.0"), - new ExpectedPackage("ShrinkInstaller", "com.cneicy.shrink-installer", "0.1.5"), + new ExpectedPackage("ShrinkInstaller", "com.cneicy.shrink-installer", "0.1.6"), new ExpectedPackage("ShrinkModFramework", "com.cneicy.shrink-mod-framework", "0.2.1"), new ExpectedPackage("ShrinkNetwork", "com.cneicy.shrink-network", "0.2.0"), new ExpectedPackage("ShrinkNetwork.Integration.App", "com.cneicy.shrink-network-integration-app", "0.1.0"), diff --git a/Assets/Modules/ShrinkInstaller b/Assets/Modules/ShrinkInstaller index a4eebd0..c346eef 160000 --- a/Assets/Modules/ShrinkInstaller +++ b/Assets/Modules/ShrinkInstaller @@ -1 +1 @@ -Subproject commit a4eebd039385d8d77efbc2659672f9fa5d2b24b5 +Subproject commit c346eef5b267455c00187085b660ef367436b7e8 diff --git a/DESIGN.md b/DESIGN.md index ee42d96..df46e21 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -104,7 +104,7 @@ ShrinkSDK Workspace/ | `com.cneicy.shrink-network-integration-eventbus` | 0.1.1 | 网络事件广播、裁决结果与 delta 去重 | | `com.cneicy.shrink-network-integration-app` | 0.1.0 | Network App installer/原生 Context 组件 | | `com.cneicy.shrink-shared-codegen` | 0.1.0 | App、Command、Network 共用的 Editor-only IL 后处理注册表生成器 | -| `com.cneicy.shrink-installer` | 0.1.5 | 安全合并公开 registry、显示诊断并固定版本安装 Starter 或选定模块的 Editor 引导包 | +| `com.cneicy.shrink-installer` | 0.1.6 | 安全合并公开 registry、显示诊断并固定版本安装 Starter 或选定模块的 Editor 引导包 | `ShrinkShared.CodeGen` 不反向引用业务 asmdef，只按程序集名与类型全名读取 Cecil 元数据，因此业务包可以依赖它而不形成包循环。 diff --git a/README.md b/README.md index 81b45bb..a66dc72 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ https://git.crash.work/ShrinkSDK/ShrinkEventBus.git#v2.0.0 也可先通过固定标签安装 Editor 引导包： ```text -https://git.crash.work/ShrinkSDK/Installer.git#v0.1.5 +https://git.crash.work/ShrinkSDK/Installer.git#v0.1.6 ``` 随后在 Unity 打开 `ShrinkSDK/Packages`。安装器只合并 `com.cneicy` registry，并将内置目录中的固定版本及其必要的固定 UniTask revision 写入 manifest；它不写认证信息，也不复制模板到 `Assets`。 diff --git a/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh b/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh index 4aded3f..256d9ef 100644 --- a/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh +++ b/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh @@ -72,10 +72,10 @@ public static class PublishedUpmConsumerValidator { try { - VerifyPackage("com.cneicy.shrink-installer", "0.1.5", "ShrinkInstaller.Editor"); + VerifyPackage("com.cneicy.shrink-installer", "0.1.6", "ShrinkInstaller.Editor"); RequireManifestValue( "com.cneicy.shrink-installer", - "https://git.crash.work/ShrinkSDK/Installer.git#v0.1.5"); + "https://git.crash.work/ShrinkSDK/Installer.git#v0.1.6"); var catalog = FindType("ShrinkSDK.Installer.ShrinkSdkPackageCatalog"); var starter = catalog.GetField("StarterBasic", BindingFlags.Static | BindingFlags.NonPublic) @@ -103,7 +103,7 @@ public static class PublishedUpmConsumerValidator { Run(() => { - VerifyPackage("com.cneicy.shrink-installer", "0.1.5", "ShrinkInstaller.Editor"); + VerifyPackage("com.cneicy.shrink-installer", "0.1.6", "ShrinkInstaller.Editor"); VerifyPackage("com.cneicy.shrink-app-starter-basic", "0.1.2", "ShrinkApp.Starter.Basic.Runtime"); VerifyPackage("com.cneicy.shrink-context-app-adapter", "0.1.2", "ShrinkContext.AppAdapter.Runtime"); RequireManifestValue("com.cneicy.shrink-app-starter-basic", "0.1.2"); @@ -291,7 +291,7 @@ write_manifest "$installer_project" '{ } ], "dependencies": { - "com.cneicy.shrink-installer": "https://git.crash.work/ShrinkSDK/Installer.git#v0.1.5", + "com.cneicy.shrink-installer": "https://git.crash.work/ShrinkSDK/Installer.git#v0.1.6", "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.test-framework": "1.1.33" }