From 64248f5d4dacba6641c5d7ac60f53f4caafe83f3 Mon Sep 17 00:00:00 2001 From: cneicy Date: Fri, 28 Aug 2026 03:49:52 +0800 Subject: [PATCH] =?UTF-8?q?chore(release):=20=E5=AF=B9=E9=BD=90=20ShrinkSD?= =?UTF-8?q?K=202026-08=20=E7=A8=B3=E5=AE=9A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Modules/ShrinkApp.Core | 2 +- Assets/Modules/ShrinkApp.Starter.Basic | 2 +- Assets/Modules/ShrinkCommand.Integration.App | 2 +- .../Modules/ShrinkCommand.Integration.Network | 2 +- Assets/Modules/ShrinkContext.AppAdapter | 2 +- Assets/Modules/ShrinkDataSaver | 2 +- .../Modules/ShrinkDataSaver.Integration.App | 2 +- .../ShrinkDataSaver.Integration.EventBus | 2 +- Assets/Modules/ShrinkInstaller | 2 +- Assets/Modules/ShrinkModFramework | 2 +- Assets/Modules/ShrinkNetwork.Integration.App | 2 +- README.md | 4 +- ...nitialize-ShrinkSdkPackageRepositories.ps1 | 14 +++--- .../Validate-PublishedUpmConsumers.sh | 46 ++++++++++++------- .../Validate-UpmConsumer.ps1 | 1 + 15 files changed, 51 insertions(+), 36 deletions(-) diff --git a/Assets/Modules/ShrinkApp.Core b/Assets/Modules/ShrinkApp.Core index ec91c43..e0191ab 160000 --- a/Assets/Modules/ShrinkApp.Core +++ b/Assets/Modules/ShrinkApp.Core @@ -1 +1 @@ -Subproject commit ec91c434b6dd17815ce3b65e0b493b1d41f0ed0f +Subproject commit e0191abb1e49407d2c9e576dc51b30ee2ac6ed15 diff --git a/Assets/Modules/ShrinkApp.Starter.Basic b/Assets/Modules/ShrinkApp.Starter.Basic index f5e7b89..78cb324 160000 --- a/Assets/Modules/ShrinkApp.Starter.Basic +++ b/Assets/Modules/ShrinkApp.Starter.Basic @@ -1 +1 @@ -Subproject commit f5e7b898c3a6cc77d1ed5724e8e6b2e0ca3a82f9 +Subproject commit 78cb324fe5103f3b97a5ab19c751f5635df771ce diff --git a/Assets/Modules/ShrinkCommand.Integration.App b/Assets/Modules/ShrinkCommand.Integration.App index a51a6d7..aeb6667 160000 --- a/Assets/Modules/ShrinkCommand.Integration.App +++ b/Assets/Modules/ShrinkCommand.Integration.App @@ -1 +1 @@ -Subproject commit a51a6d712ee07171a81d3d8688e4f6f61d4608cb +Subproject commit aeb6667e787513e45af8202f465d744bb519bbde diff --git a/Assets/Modules/ShrinkCommand.Integration.Network b/Assets/Modules/ShrinkCommand.Integration.Network index b312265..2c955bc 160000 --- a/Assets/Modules/ShrinkCommand.Integration.Network +++ b/Assets/Modules/ShrinkCommand.Integration.Network @@ -1 +1 @@ -Subproject commit b312265c907d46c49ce448231c26bbf421d14ec6 +Subproject commit 2c955bcffa95b73ae22f4d64cf332b98205a9dde diff --git a/Assets/Modules/ShrinkContext.AppAdapter b/Assets/Modules/ShrinkContext.AppAdapter index 52bda43..57512d9 160000 --- a/Assets/Modules/ShrinkContext.AppAdapter +++ b/Assets/Modules/ShrinkContext.AppAdapter @@ -1 +1 @@ -Subproject commit 52bda43e3cbe24c87a3c251ea483ca18ad694049 +Subproject commit 57512d9a31a46c3f883ea822167644fbe2c29357 diff --git a/Assets/Modules/ShrinkDataSaver b/Assets/Modules/ShrinkDataSaver index ec87b0b..1bfb99d 160000 --- a/Assets/Modules/ShrinkDataSaver +++ b/Assets/Modules/ShrinkDataSaver @@ -1 +1 @@ -Subproject commit ec87b0bde32c6180542f66b423cc70906cd08ae0 +Subproject commit 1bfb99d4c3767894276ffb68797d8a446444139c diff --git a/Assets/Modules/ShrinkDataSaver.Integration.App b/Assets/Modules/ShrinkDataSaver.Integration.App index fd5c66a..6bf95e1 160000 --- a/Assets/Modules/ShrinkDataSaver.Integration.App +++ b/Assets/Modules/ShrinkDataSaver.Integration.App @@ -1 +1 @@ -Subproject commit fd5c66a6daedbcf2bc88fbb4a3781e3807c7a009 +Subproject commit 6bf95e17a14a5dfa13862fe33cfabcf2d1a39e39 diff --git a/Assets/Modules/ShrinkDataSaver.Integration.EventBus b/Assets/Modules/ShrinkDataSaver.Integration.EventBus index 1486894..af4b838 160000 --- a/Assets/Modules/ShrinkDataSaver.Integration.EventBus +++ b/Assets/Modules/ShrinkDataSaver.Integration.EventBus @@ -1 +1 @@ -Subproject commit 1486894f52c56e0efe2579863029bf3487422e74 +Subproject commit af4b838c25fff7bfb00edb4182fb292a9679e112 diff --git a/Assets/Modules/ShrinkInstaller b/Assets/Modules/ShrinkInstaller index 7096459..885da43 160000 --- a/Assets/Modules/ShrinkInstaller +++ b/Assets/Modules/ShrinkInstaller @@ -1 +1 @@ -Subproject commit 70964597636036c2566eae1d65fa41ee5d3c5f6a +Subproject commit 885da4366d824d7f0e85e94e160f79dd30f587bd diff --git a/Assets/Modules/ShrinkModFramework b/Assets/Modules/ShrinkModFramework index 39f6f97..f6688ce 160000 --- a/Assets/Modules/ShrinkModFramework +++ b/Assets/Modules/ShrinkModFramework @@ -1 +1 @@ -Subproject commit 39f6f97707142d4021f4b7fe6a52a018826e5347 +Subproject commit f6688ce573194ca58c91aff25f76b1199a91c6ee diff --git a/Assets/Modules/ShrinkNetwork.Integration.App b/Assets/Modules/ShrinkNetwork.Integration.App index da7c8af..4711314 160000 --- a/Assets/Modules/ShrinkNetwork.Integration.App +++ b/Assets/Modules/ShrinkNetwork.Integration.App @@ -1 +1 @@ -Subproject commit da7c8af3acaa02e67dcd0578f38ba72e70b707a9 +Subproject commit 471131458dd161829e3be617bd992de3f79625ac diff --git a/README.md b/README.md index b695739..27e2835 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ git submodule update --init --recursive } ``` -然后按精确版本添加包，例如 `com.cneicy.shrink-app-starter-basic: 0.2.0`。Git 备用安装同样必须固定标签，例如： +然后按精确版本添加包，例如 `com.cneicy.shrink-app-starter-basic: 0.2.1`。Git 备用安装同样必须固定标签，例如： ```text https://git.crash.work/ShrinkSDK/ShrinkEventBus.git#v2.0.0 @@ -37,7 +37,7 @@ https://git.crash.work/ShrinkSDK/ShrinkEventBus.git#v2.0.0 也可先通过固定标签安装 Editor 引导包： ```text -https://git.crash.work/ShrinkSDK/Installer.git#v0.2.2 +https://git.crash.work/ShrinkSDK/Installer.git#v0.2.3 ``` 随后在 Unity 打开 `ShrinkSDK/包管理`。UI Toolkit 窗口会显示直接与间接依赖的真实安装状态，并按 Context 组合基础、应用宿主、独立功能和模块集成组织固定版本包与推荐组合。安装器只合并 `com.cneicy` registry 和依赖数据，不写认证信息，也不复制模板到 `Assets`。 diff --git a/Tools/RepositoryMigration/Initialize-ShrinkSdkPackageRepositories.ps1 b/Tools/RepositoryMigration/Initialize-ShrinkSdkPackageRepositories.ps1 index aed836d..a3bb07e 100644 --- a/Tools/RepositoryMigration/Initialize-ShrinkSdkPackageRepositories.ps1 +++ b/Tools/RepositoryMigration/Initialize-ShrinkSdkPackageRepositories.ps1 @@ -40,17 +40,17 @@ $PackageDirectories = @( $DevelopmentHostOnlyDependencies = @{ 'com.cneicy.shrink-command-integration-network' = [ordered]@{ - 'com.cneicy.shrink-command-integration-app' = '0.1.1' - 'com.cneicy.shrink-datasaver-integration-app' = '0.1.1' - 'com.cneicy.shrink-network-integration-app' = '0.1.1' + 'com.cneicy.shrink-command-integration-app' = '0.1.2' + 'com.cneicy.shrink-datasaver-integration-app' = '0.1.2' + 'com.cneicy.shrink-network-integration-app' = '0.1.2' } 'com.cneicy.shrink-context-app-adapter' = [ordered]@{ - 'com.cneicy.shrink-app-starter-basic' = '0.2.0' + 'com.cneicy.shrink-app-starter-basic' = '0.2.1' 'com.cneicy.shrink-command' = '0.2.0' - 'com.cneicy.shrink-command-integration-app' = '0.1.1' - 'com.cneicy.shrink-datasaver-integration-app' = '0.1.1' + 'com.cneicy.shrink-command-integration-app' = '0.1.2' + 'com.cneicy.shrink-datasaver-integration-app' = '0.1.2' 'com.cneicy.shrink-network' = '0.2.1' - 'com.cneicy.shrink-network-integration-app' = '0.1.1' + 'com.cneicy.shrink-network-integration-app' = '0.1.2' } 'com.cneicy.shrink-eventbus-entities' = [ordered]@{ 'com.unity.modules.physics' = '1.0.0' diff --git a/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh b/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh index 659e32f..40a2f52 100644 --- a/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh +++ b/Tools/UpmConsumerValidation/Validate-PublishedUpmConsumers.sh @@ -46,10 +46,14 @@ public static class PublishedUpmConsumerValidator { Run(() => { - VerifyPackage("com.cneicy.shrink-app-starter-basic", "0.2.0", "ShrinkApp.Starter.Basic.Runtime"); - VerifyPackage("com.cneicy.shrink-context-app-adapter", "0.1.3", "ShrinkContext.AppAdapter.Runtime"); + VerifyPackage("com.cneicy.shrink-app-starter-basic", "0.2.1", "ShrinkApp.Starter.Basic.Runtime"); + VerifyPackage("com.cneicy.shrink-context-app-adapter", "0.1.4", "ShrinkContext.AppAdapter.Runtime"); + VerifyPackage("com.cneicy.shrink-context-eventbus-adapter", "0.1.0", "ShrinkContext.EventBusAdapter.Runtime"); + VerifyPackage("com.cneicy.shrink-mod-framework", "0.2.3", "ShrinkModFramework.Runtime"); VerifyPackage("com.cneicy.shrink-tutorial", "0.1.2", "ShrinkTutorial.Runtime"); - RequireManifestValue("com.cneicy.shrink-app-starter-basic", "0.2.0"); + RequireManifestValue("com.cneicy.shrink-app-starter-basic", "0.2.1"); + RequireManifestValue("com.cneicy.shrink-context-eventbus-adapter", "0.1.0"); + RequireManifestValue("com.cneicy.shrink-mod-framework", "0.2.3"); RequireManifestValue("com.cneicy.shrink-tutorial", "0.1.2"); RequireManifestValue("com.cysharp.unitask", UniTaskUrl); RequireRegistry("com.cneicy", RegistryUrl); @@ -60,11 +64,12 @@ public static class PublishedUpmConsumerValidator { Run(() => { - VerifyPackage("com.cneicy.shrink-eventbus", "2.0.0", "ShrinkEventBus.Runtime"); + VerifyPackage("com.cneicy.shrink-mod-framework", "0.2.3", "ShrinkModFramework.Runtime"); RequireManifestValue( - "com.cneicy.shrink-eventbus", - "https://git.crash.work/ShrinkSDK/ShrinkEventBus.git#v2.0.0"); + "com.cneicy.shrink-mod-framework", + "https://git.crash.work/ShrinkSDK/ShrinkModFramework.git#v0.2.3"); RequireManifestValue("com.cysharp.unitask", UniTaskUrl); + RequireRegistry("com.cneicy", RegistryUrl); }); } @@ -72,10 +77,10 @@ public static class PublishedUpmConsumerValidator { try { - VerifyPackage("com.cneicy.shrink-installer", "0.2.2", "ShrinkInstaller.Editor"); + VerifyPackage("com.cneicy.shrink-installer", "0.2.3", "ShrinkInstaller.Editor"); RequireManifestValue( "com.cneicy.shrink-installer", - "https://git.crash.work/ShrinkSDK/Installer.git#v0.2.2"); + "https://git.crash.work/ShrinkSDK/Installer.git#v0.2.3"); var catalog = FindType("ShrinkSDK.Installer.ShrinkSdkPackageCatalog"); var starter = catalog.GetField("StarterBasic", BindingFlags.Static | BindingFlags.NonPublic) @@ -89,7 +94,7 @@ public static class PublishedUpmConsumerValidator roots.SetValue(starter, 0); install.Invoke(null, new object[] { roots }); - RequireManifestValue("com.cneicy.shrink-app-starter-basic", "0.2.0"); + RequireManifestValue("com.cneicy.shrink-app-starter-basic", "0.2.1"); RequireManifestValue("com.cysharp.unitask", UniTaskUrl); RequireRegistry("com.cneicy", RegistryUrl); RequireRegistry("com.example", "https://registry.npmjs.org/"); @@ -105,10 +110,10 @@ public static class PublishedUpmConsumerValidator { Run(() => { - VerifyPackage("com.cneicy.shrink-installer", "0.2.2", "ShrinkInstaller.Editor"); - VerifyPackage("com.cneicy.shrink-app-starter-basic", "0.2.0", "ShrinkApp.Starter.Basic.Runtime"); - VerifyPackage("com.cneicy.shrink-context-app-adapter", "0.1.3", "ShrinkContext.AppAdapter.Runtime"); - RequireManifestValue("com.cneicy.shrink-app-starter-basic", "0.2.0"); + VerifyPackage("com.cneicy.shrink-installer", "0.2.3", "ShrinkInstaller.Editor"); + VerifyPackage("com.cneicy.shrink-app-starter-basic", "0.2.1", "ShrinkApp.Starter.Basic.Runtime"); + VerifyPackage("com.cneicy.shrink-context-app-adapter", "0.1.4", "ShrinkContext.AppAdapter.Runtime"); + RequireManifestValue("com.cneicy.shrink-app-starter-basic", "0.2.1"); RequireManifestValue("com.cysharp.unitask", UniTaskUrl); RequireRegistry("com.cneicy", RegistryUrl); RequireRegistry("com.example", "https://registry.npmjs.org/"); @@ -265,7 +270,9 @@ write_manifest "$registry_project" '{ } ], "dependencies": { - "com.cneicy.shrink-app-starter-basic": "0.2.0", + "com.cneicy.shrink-app-starter-basic": "0.2.1", + "com.cneicy.shrink-context-eventbus-adapter": "0.1.0", + "com.cneicy.shrink-mod-framework": "0.2.3", "com.cneicy.shrink-tutorial": "0.1.2", "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask#7c0f199fe0d3fc528024488ccd671e6c7b27745b", "com.unity.nuget.newtonsoft-json": "3.2.2" @@ -275,8 +282,15 @@ run_unity "$registry_project" PublishedUpmConsumerValidator.VerifyRegistry "$reg git_project="$(prepare_consumer git-tag)" write_manifest "$git_project" '{ + "scopedRegistries": [ + { + "name": "ShrinkSDK", + "url": "https://git.crash.work/api/packages/ShrinkSDK/npm/", + "scopes": ["com.cneicy"] + } + ], "dependencies": { - "com.cneicy.shrink-eventbus": "https://git.crash.work/ShrinkSDK/ShrinkEventBus.git#v2.0.0", + "com.cneicy.shrink-mod-framework": "https://git.crash.work/ShrinkSDK/ShrinkModFramework.git#v0.2.3", "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask#7c0f199fe0d3fc528024488ccd671e6c7b27745b", "com.unity.nuget.newtonsoft-json": "3.2.2" } @@ -293,7 +307,7 @@ write_manifest "$installer_project" '{ } ], "dependencies": { - "com.cneicy.shrink-installer": "https://git.crash.work/ShrinkSDK/Installer.git#v0.2.2", + "com.cneicy.shrink-installer": "https://git.crash.work/ShrinkSDK/Installer.git#v0.2.3", "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.test-framework": "1.1.33" } diff --git a/Tools/UpmConsumerValidation/Validate-UpmConsumer.ps1 b/Tools/UpmConsumerValidation/Validate-UpmConsumer.ps1 index 36ae671..9d896fc 100644 --- a/Tools/UpmConsumerValidation/Validate-UpmConsumer.ps1 +++ b/Tools/UpmConsumerValidation/Validate-UpmConsumer.ps1 @@ -202,6 +202,7 @@ Copy-Item -LiteralPath (Join-Path $script:ResolvedProjectRoot 'ProjectSettings/P $expectedPackages = ($packageRecords.Name | Sort-Object | ForEach-Object { Convert-ToCSharpLiteral $_ }) -join ",`n " $expectedAssemblies = $packageRecords | ForEach-Object { Get-ChildItem -LiteralPath $_.Directory -Recurse -Filter '*.asmdef' -File } | + Where-Object { $_.FullName -notmatch '[\\/][^\\/]+~[\\/]' } | ForEach-Object { (Get-Content -Raw -LiteralPath $_.FullName | ConvertFrom-Json).name } | Sort-Object -Unique | ForEach-Object { Convert-ToCSharpLiteral $_ }