Compare commits
5
Commits
v0.2.0
...
2abf367f36
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2abf367f36
|
||
|
|
012728ffac | ||
|
|
885da4366d | ||
|
|
7096459763 | ||
|
|
c42d24bcde |
@@ -0,0 +1,23 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
本文件记录 `ShrinkInstaller` 的包内变更。
|
||||||
|
|
||||||
|
## [0.2.5] - 2026-09-05
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 按 SemVer 比较已安装版本与目录版本;已安装较新版本不再被误判为旧版本,也不会提供降级操作。
|
||||||
|
- 更新内置包目录,使版本与当前 ShrinkSDK 模块清单一致。
|
||||||
|
|
||||||
|
## [0.2.4] - 2026-08-28
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 目录切换到 `ShrinkEventBus 2.0.1` 及其精确依赖链,常用完整套件仍只安装四个直接根。
|
||||||
|
|
||||||
|
## [0.2.3] - 2026-08-28
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 目录固定到 App Core 0.1.3、Context App Adapter 0.1.4、Starter Basic 0.2.1、DataSaver 2.2.2、ModFramework 0.2.3 及对应 Integration 稳定版本。
|
||||||
|
- 常用完整套件继续只安装 Starter、Context EventBus Adapter、ModFramework 与 Tutorial 四个直接根,并固定 UniTask revision。
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 827b7796ca4548bcb5e249b351489ed1
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -36,6 +36,21 @@ public static class ShrinkInstallerDevelopmentValidation
|
|||||||
?.GetValue(null) as IEnumerable;
|
?.GetValue(null) as IEnumerable;
|
||||||
Require(Count(packages) == 20, "包目录数量不是 20。");
|
Require(Count(packages) == 20, "包目录数量不是 20。");
|
||||||
Require(Count(bundles) == 8, "推荐组合数量不是 8。");
|
Require(Count(bundles) == 8, "推荐组合数量不是 8。");
|
||||||
|
Require(BundleContainsInstallRoot(bundles, "基础应用(推荐)",
|
||||||
|
"com.cneicy.shrink-context-eventbus-adapter"),
|
||||||
|
"基础应用组合没有显式安装 Context 事件适配。");
|
||||||
|
Require(BundleContainsInstallRoot(bundles, "常用完整套件",
|
||||||
|
"com.cneicy.shrink-context-eventbus-adapter"),
|
||||||
|
"常用完整套件没有显式安装 Context 事件适配。");
|
||||||
|
Require(BundleContainsInstallRoot(bundles, "常用完整套件",
|
||||||
|
"com.cneicy.shrink-app-starter-basic"),
|
||||||
|
"常用完整套件没有显式安装 Starter。");
|
||||||
|
Require(BundleContainsInstallRoot(bundles, "常用完整套件",
|
||||||
|
"com.cneicy.shrink-mod-framework"),
|
||||||
|
"常用完整套件没有显式安装 ModFramework。");
|
||||||
|
Require(BundleContainsInstallRoot(bundles, "常用完整套件",
|
||||||
|
"com.cneicy.shrink-tutorial"),
|
||||||
|
"常用完整套件没有显式安装 Tutorial。");
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@@ -60,6 +75,32 @@ public static class ShrinkInstallerDevelopmentValidation
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool BundleContainsInstallRoot(IEnumerable bundles, string bundleName, string packageName)
|
||||||
|
{
|
||||||
|
foreach (var bundle in bundles)
|
||||||
|
{
|
||||||
|
var bundleType = bundle.GetType();
|
||||||
|
if (!string.Equals(bundleType.GetProperty("DisplayName")?.GetValue(bundle) as string, bundleName,
|
||||||
|
StringComparison.Ordinal))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var roots = bundleType.GetProperty("InstallRoots")?.GetValue(bundle) as IEnumerable;
|
||||||
|
if (roots == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
foreach (var root in roots)
|
||||||
|
{
|
||||||
|
var value = root.GetType().GetProperty("PackageName")?.GetValue(root) as string;
|
||||||
|
if (string.Equals(value, packageName, StringComparison.Ordinal))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private static Type FindType(string fullName) => AppDomain.CurrentDomain.GetAssemblies()
|
private static Type FindType(string fullName) => AppDomain.CurrentDomain.GetAssemblies()
|
||||||
.Select(assembly => assembly.GetType(fullName, false))
|
.Select(assembly => assembly.GetType(fullName, false))
|
||||||
.FirstOrDefault(type => type != null)
|
.FirstOrDefault(type => type != null)
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
#nullable enable
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace ShrinkSDK.Installer
|
||||||
|
{
|
||||||
|
public enum ShrinkPackageVersionRelation
|
||||||
|
{
|
||||||
|
Unknown,
|
||||||
|
Older,
|
||||||
|
Equal,
|
||||||
|
Newer
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ShrinkPackageVersion
|
||||||
|
{
|
||||||
|
public static ShrinkPackageVersionRelation Classify(string? installedVersion, string? targetVersion)
|
||||||
|
{
|
||||||
|
return TryCompare(installedVersion, targetVersion, out var comparison)
|
||||||
|
? comparison < 0
|
||||||
|
? ShrinkPackageVersionRelation.Older
|
||||||
|
: comparison > 0
|
||||||
|
? ShrinkPackageVersionRelation.Newer
|
||||||
|
: ShrinkPackageVersionRelation.Equal
|
||||||
|
: ShrinkPackageVersionRelation.Unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool TryCompare(string? left, string? right, out int comparison)
|
||||||
|
{
|
||||||
|
comparison = 0;
|
||||||
|
if (!TryParse(left, out var leftVersion) || !TryParse(right, out var rightVersion))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
for (var index = 0; index < 3; index++)
|
||||||
|
{
|
||||||
|
comparison = leftVersion.Core[index].CompareTo(rightVersion.Core[index]);
|
||||||
|
if (comparison != 0)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
comparison = ComparePrerelease(leftVersion.Prerelease, rightVersion.Prerelease);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool TryParse(string? raw, out ParsedVersion version)
|
||||||
|
{
|
||||||
|
version = default;
|
||||||
|
if (string.IsNullOrWhiteSpace(raw))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var value = raw.Trim();
|
||||||
|
if (value.StartsWith("v", StringComparison.OrdinalIgnoreCase))
|
||||||
|
value = value.Substring(1);
|
||||||
|
var buildIndex = value.IndexOf('+');
|
||||||
|
if (buildIndex >= 0)
|
||||||
|
value = value.Substring(0, buildIndex);
|
||||||
|
var prereleaseIndex = value.IndexOf('-');
|
||||||
|
var coreText = prereleaseIndex >= 0 ? value.Substring(0, prereleaseIndex) : value;
|
||||||
|
var prerelease = prereleaseIndex >= 0 ? value.Substring(prereleaseIndex + 1) : string.Empty;
|
||||||
|
var coreParts = coreText.Split('.');
|
||||||
|
if (coreParts.Length is < 1 or > 3)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var core = new int[3];
|
||||||
|
for (var index = 0; index < coreParts.Length; index++)
|
||||||
|
{
|
||||||
|
if (!int.TryParse(coreParts[index], out core[index]) || core[index] < 0)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (prereleaseIndex >= 0 && string.IsNullOrWhiteSpace(prerelease))
|
||||||
|
return false;
|
||||||
|
version = new ParsedVersion(core, prerelease);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int ComparePrerelease(string left, string right)
|
||||||
|
{
|
||||||
|
var leftEmpty = string.IsNullOrEmpty(left);
|
||||||
|
var rightEmpty = string.IsNullOrEmpty(right);
|
||||||
|
if (leftEmpty || rightEmpty)
|
||||||
|
return leftEmpty == rightEmpty ? 0 : leftEmpty ? 1 : -1;
|
||||||
|
|
||||||
|
var leftParts = left.Split('.');
|
||||||
|
var rightParts = right.Split('.');
|
||||||
|
var count = Math.Min(leftParts.Length, rightParts.Length);
|
||||||
|
for (var index = 0; index < count; index++)
|
||||||
|
{
|
||||||
|
var leftNumeric = int.TryParse(leftParts[index], out var leftValue);
|
||||||
|
var rightNumeric = int.TryParse(rightParts[index], out var rightValue);
|
||||||
|
int comparison;
|
||||||
|
if (leftNumeric && rightNumeric)
|
||||||
|
comparison = leftValue.CompareTo(rightValue);
|
||||||
|
else if (leftNumeric != rightNumeric)
|
||||||
|
comparison = leftNumeric ? -1 : 1;
|
||||||
|
else
|
||||||
|
comparison = string.Compare(leftParts[index], rightParts[index], StringComparison.Ordinal);
|
||||||
|
if (comparison != 0)
|
||||||
|
return comparison;
|
||||||
|
}
|
||||||
|
|
||||||
|
return leftParts.Length.CompareTo(rightParts.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly struct ParsedVersion
|
||||||
|
{
|
||||||
|
public ParsedVersion(int[] core, string prerelease)
|
||||||
|
{
|
||||||
|
Core = core;
|
||||||
|
Prerelease = prerelease;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int[] Core { get; }
|
||||||
|
public string Prerelease { get; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e6e04e7ab0ec4fbe87bb30cb04f7ce18
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -20,6 +20,9 @@ namespace ShrinkSDK.Installer
|
|||||||
private ListRequest? _listRequest;
|
private ListRequest? _listRequest;
|
||||||
private bool _resolvePending;
|
private bool _resolvePending;
|
||||||
private double _resolveRequestedAt;
|
private double _resolveRequestedAt;
|
||||||
|
private bool _listRetryPending;
|
||||||
|
private double _nextListRetryAt;
|
||||||
|
private int _listRetryCount;
|
||||||
private HelpBox? _statusBox;
|
private HelpBox? _statusBox;
|
||||||
private Label? _registryState;
|
private Label? _registryState;
|
||||||
private VisualElement? _page;
|
private VisualElement? _page;
|
||||||
@@ -71,14 +74,18 @@ namespace ShrinkSDK.Installer
|
|||||||
header.style.paddingBottom = 10f;
|
header.style.paddingBottom = 10f;
|
||||||
header.style.borderBottomWidth = 1f;
|
header.style.borderBottomWidth = 1f;
|
||||||
header.style.borderBottomColor = new Color(0.25f, 0.25f, 0.25f);
|
header.style.borderBottomColor = new Color(0.25f, 0.25f, 0.25f);
|
||||||
|
header.style.minHeight = 104f;
|
||||||
|
|
||||||
var title = new Label("ShrinkSDK 包管理");
|
var title = new Label("ShrinkSDK 包管理");
|
||||||
title.style.fontSize = 20f;
|
title.style.fontSize = 20f;
|
||||||
title.style.unityFontStyleAndWeight = FontStyle.Bold;
|
title.style.unityFontStyleAndWeight = FontStyle.Bold;
|
||||||
|
title.style.height = 28f;
|
||||||
|
title.style.unityTextAlign = TextAnchor.MiddleLeft;
|
||||||
header.Add(title);
|
header.Add(title);
|
||||||
|
|
||||||
var description = new Label("以 Context 为组合基础,按用途安装固定版本的模块与集成包。");
|
var description = new Label("以 Context 为组合基础,按用途安装固定版本的模块与集成包。");
|
||||||
description.style.marginTop = 4f;
|
description.style.marginTop = 4f;
|
||||||
|
description.style.minHeight = 20f;
|
||||||
description.style.whiteSpace = WhiteSpace.Normal;
|
description.style.whiteSpace = WhiteSpace.Normal;
|
||||||
header.Add(description);
|
header.Add(description);
|
||||||
|
|
||||||
@@ -86,6 +93,7 @@ namespace ShrinkSDK.Installer
|
|||||||
registryRow.style.flexDirection = FlexDirection.Row;
|
registryRow.style.flexDirection = FlexDirection.Row;
|
||||||
registryRow.style.alignItems = Align.Center;
|
registryRow.style.alignItems = Align.Center;
|
||||||
registryRow.style.marginTop = 10f;
|
registryRow.style.marginTop = 10f;
|
||||||
|
registryRow.style.minHeight = 22f;
|
||||||
registryRow.Add(new Label("软件源:"));
|
registryRow.Add(new Label("软件源:"));
|
||||||
|
|
||||||
_registryState = new Label();
|
_registryState = new Label();
|
||||||
@@ -164,16 +172,16 @@ namespace ShrinkSDK.Installer
|
|||||||
title.style.flexGrow = 1f;
|
title.style.flexGrow = 1f;
|
||||||
titleRow.Add(title);
|
titleRow.Add(title);
|
||||||
|
|
||||||
var exact = bundle.Packages.Count(IsExactInstalled);
|
var ready = bundle.Packages.Count(IsInstalledAtLeast);
|
||||||
var button = new Button(() => BeginInstall(bundle.InstallRoots));
|
var button = new Button(() => BeginInstall(bundle.InstallRoots));
|
||||||
if (exact == bundle.Packages.Count)
|
if (ready == bundle.Packages.Count)
|
||||||
{
|
{
|
||||||
button.text = "已完成";
|
button.text = "已完成";
|
||||||
button.SetEnabled(false);
|
button.SetEnabled(false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
button.text = exact > 0 ? "补齐组合" : "安装组合";
|
button.text = ready > 0 ? "补齐组合" : "安装组合";
|
||||||
button.SetEnabled(!IsBusy);
|
button.SetEnabled(!IsBusy);
|
||||||
}
|
}
|
||||||
button.style.width = 100f;
|
button.style.width = 100f;
|
||||||
@@ -185,9 +193,9 @@ namespace ShrinkSDK.Installer
|
|||||||
summary.style.marginTop = 5f;
|
summary.style.marginTop = 5f;
|
||||||
card.Add(summary);
|
card.Add(summary);
|
||||||
|
|
||||||
var progress = new Label($"已就绪 {exact}/{bundle.Packages.Count}");
|
var progress = new Label($"已就绪 {ready}/{bundle.Packages.Count}");
|
||||||
progress.style.marginTop = 8f;
|
progress.style.marginTop = 8f;
|
||||||
progress.style.color = exact == bundle.Packages.Count
|
progress.style.color = ready == bundle.Packages.Count
|
||||||
? new Color(0.35f, 0.75f, 0.45f)
|
? new Color(0.35f, 0.75f, 0.45f)
|
||||||
: new Color(0.65f, 0.65f, 0.65f);
|
: new Color(0.65f, 0.65f, 0.65f);
|
||||||
card.Add(progress);
|
card.Add(progress);
|
||||||
@@ -258,7 +266,7 @@ namespace ShrinkSDK.Installer
|
|||||||
row.Add(name);
|
row.Add(name);
|
||||||
var status = new Label(GetInstalledStatus(package));
|
var status = new Label(GetInstalledStatus(package));
|
||||||
status.style.fontSize = 10f;
|
status.style.fontSize = 10f;
|
||||||
status.style.color = IsExactInstalled(package)
|
status.style.color = IsInstalledAtLeast(package)
|
||||||
? new Color(0.35f, 0.75f, 0.45f)
|
? new Color(0.35f, 0.75f, 0.45f)
|
||||||
: new Color(0.65f, 0.65f, 0.65f);
|
: new Color(0.65f, 0.65f, 0.65f);
|
||||||
row.Add(status);
|
row.Add(status);
|
||||||
@@ -270,13 +278,26 @@ namespace ShrinkSDK.Installer
|
|||||||
var button = new Button(() => BeginInstall(new[] { package }));
|
var button = new Button(() => BeginInstall(new[] { package }));
|
||||||
if (!_installed.TryGetValue(package.PackageName, out var installed))
|
if (!_installed.TryGetValue(package.PackageName, out var installed))
|
||||||
button.text = "安装 " + package.Version;
|
button.text = "安装 " + package.Version;
|
||||||
else if (string.Equals(installed.version, package.Version, StringComparison.Ordinal))
|
|
||||||
{
|
|
||||||
button.text = "已安装 " + installed.version;
|
|
||||||
button.SetEnabled(false);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
button.text = installed.version + " → " + package.Version;
|
{
|
||||||
|
switch (ShrinkPackageVersion.Classify(installed.version, package.Version))
|
||||||
|
{
|
||||||
|
case ShrinkPackageVersionRelation.Equal:
|
||||||
|
button.text = "已安装 " + installed.version;
|
||||||
|
button.SetEnabled(false);
|
||||||
|
break;
|
||||||
|
case ShrinkPackageVersionRelation.Newer:
|
||||||
|
button.text = "较新版本 " + installed.version;
|
||||||
|
button.SetEnabled(false);
|
||||||
|
break;
|
||||||
|
case ShrinkPackageVersionRelation.Older:
|
||||||
|
button.text = "升级 " + installed.version + " → " + package.Version;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
button.text = installed.version + " → " + package.Version;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (IsBusy)
|
if (IsBusy)
|
||||||
button.SetEnabled(false);
|
button.SetEnabled(false);
|
||||||
@@ -318,20 +339,25 @@ namespace ShrinkSDK.Installer
|
|||||||
package.Summary.IndexOf(_searchText, StringComparison.OrdinalIgnoreCase) >= 0 ||
|
package.Summary.IndexOf(_searchText, StringComparison.OrdinalIgnoreCase) >= 0 ||
|
||||||
package.PackageName.IndexOf(_searchText, StringComparison.OrdinalIgnoreCase) >= 0;
|
package.PackageName.IndexOf(_searchText, StringComparison.OrdinalIgnoreCase) >= 0;
|
||||||
|
|
||||||
private bool IsExactInstalled(ShrinkSdkPackageEntry package) =>
|
private bool IsInstalledAtLeast(ShrinkSdkPackageEntry package) =>
|
||||||
_installed.TryGetValue(package.PackageName, out var installed) &&
|
_installed.TryGetValue(package.PackageName, out var installed) &&
|
||||||
string.Equals(installed.version, package.Version, StringComparison.Ordinal);
|
ShrinkPackageVersion.Classify(installed.version, package.Version) is
|
||||||
|
ShrinkPackageVersionRelation.Equal or ShrinkPackageVersionRelation.Newer;
|
||||||
|
|
||||||
private string GetInstalledStatus(ShrinkSdkPackageEntry package)
|
private string GetInstalledStatus(ShrinkSdkPackageEntry package)
|
||||||
{
|
{
|
||||||
if (!_installed.TryGetValue(package.PackageName, out var installed))
|
if (!_installed.TryGetValue(package.PackageName, out var installed))
|
||||||
return "未安装 · " + package.Version;
|
return "未安装 · " + package.Version;
|
||||||
return string.Equals(installed.version, package.Version, StringComparison.Ordinal)
|
return ShrinkPackageVersion.Classify(installed.version, package.Version) switch
|
||||||
? "已安装 " + installed.version
|
{
|
||||||
: "已安装 " + installed.version + " · 固定 " + package.Version;
|
ShrinkPackageVersionRelation.Equal => "已安装 " + installed.version,
|
||||||
|
ShrinkPackageVersionRelation.Newer => "已安装较新版本 " + installed.version,
|
||||||
|
ShrinkPackageVersionRelation.Older => "可升级 " + installed.version + " → " + package.Version,
|
||||||
|
_ => "已安装 " + installed.version + " · 目标 " + package.Version
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IsBusy => _listRequest != null || _resolvePending;
|
private bool IsBusy => _listRequest != null || _resolvePending || _listRetryPending;
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
@@ -342,6 +368,12 @@ namespace ShrinkSDK.Installer
|
|||||||
StartListRequest();
|
StartListRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_listRetryPending && EditorApplication.timeSinceStartup >= _nextListRetryAt)
|
||||||
|
{
|
||||||
|
_listRetryPending = false;
|
||||||
|
StartListRequest();
|
||||||
|
}
|
||||||
|
|
||||||
if (_listRequest == null || !_listRequest.IsCompleted)
|
if (_listRequest == null || !_listRequest.IsCompleted)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -349,12 +381,21 @@ namespace ShrinkSDK.Installer
|
|||||||
_listRequest = null;
|
_listRequest = null;
|
||||||
if (list.Status == StatusCode.Success)
|
if (list.Status == StatusCode.Success)
|
||||||
{
|
{
|
||||||
|
_listRetryCount = 0;
|
||||||
_installed.Clear();
|
_installed.Clear();
|
||||||
foreach (var package in list.Result)
|
foreach (var package in list.Result)
|
||||||
_installed[package.name] = package;
|
_installed[package.name] = package;
|
||||||
var count = _installed.Keys.Count(name => name.StartsWith("com.cneicy.", StringComparison.Ordinal));
|
var count = _installed.Keys.Count(name => name.StartsWith("com.cneicy.", StringComparison.Ordinal));
|
||||||
SetStatus("状态已刷新:当前项目共解析到 " + count + " 个 ShrinkSDK 包。", HelpBoxMessageType.Info);
|
SetStatus("状态已刷新:当前项目共解析到 " + count + " 个 ShrinkSDK 包。", HelpBoxMessageType.Info);
|
||||||
}
|
}
|
||||||
|
else if (string.IsNullOrWhiteSpace(list.Error?.message) && _listRetryCount < 4)
|
||||||
|
{
|
||||||
|
_listRetryCount++;
|
||||||
|
_listRetryPending = true;
|
||||||
|
_nextListRetryAt = EditorApplication.timeSinceStartup + 1d;
|
||||||
|
SetStatus("Unity 正在完成依赖解析,稍后自动重试安装状态(" + _listRetryCount + "/4)。",
|
||||||
|
HelpBoxMessageType.Info);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SetStatus("读取安装状态失败:" + GetRequestError(list.Error), HelpBoxMessageType.Warning);
|
SetStatus("读取安装状态失败:" + GetRequestError(list.Error), HelpBoxMessageType.Warning);
|
||||||
@@ -399,6 +440,8 @@ namespace ShrinkSDK.Installer
|
|||||||
{
|
{
|
||||||
_listRequest = null;
|
_listRequest = null;
|
||||||
Client.Resolve();
|
Client.Resolve();
|
||||||
|
_listRetryPending = false;
|
||||||
|
_listRetryCount = 0;
|
||||||
_resolvePending = true;
|
_resolvePending = true;
|
||||||
_resolveRequestedAt = EditorApplication.timeSinceStartup;
|
_resolveRequestedAt = EditorApplication.timeSinceStartup;
|
||||||
SetStatus(status, HelpBoxMessageType.Info);
|
SetStatus(status, HelpBoxMessageType.Info);
|
||||||
@@ -409,6 +452,7 @@ namespace ShrinkSDK.Installer
|
|||||||
{
|
{
|
||||||
if (IsBusy)
|
if (IsBusy)
|
||||||
return;
|
return;
|
||||||
|
_listRetryCount = 0;
|
||||||
StartListRequest();
|
StartListRequest();
|
||||||
SetStatus("正在读取当前项目的直接与间接依赖。", HelpBoxMessageType.Info);
|
SetStatus("正在读取当前项目的直接与间接依赖。", HelpBoxMessageType.Info);
|
||||||
RenderPage();
|
RenderPage();
|
||||||
|
|||||||
@@ -67,67 +67,70 @@ namespace ShrinkSDK.Installer
|
|||||||
|
|
||||||
internal static readonly ShrinkSdkPackageEntry ContextCore = Package(
|
internal static readonly ShrinkSdkPackageEntry ContextCore = Package(
|
||||||
"Context 核心", "可逆效应、响应式依赖与组件生命周期,是框架的组合基础。",
|
"Context 核心", "可逆效应、响应式依赖与组件生命周期,是框架的组合基础。",
|
||||||
"com.cneicy.shrink-context-core", "0.1.0", ShrinkSdkPackageLayer.Context, true);
|
"com.cneicy.shrink-context-core", "0.2.0", ShrinkSdkPackageLayer.Context, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry ContextAppAdapter = Package(
|
internal static readonly ShrinkSdkPackageEntry ContextAppAdapter = Package(
|
||||||
"Context 应用适配", "用 ContextLoader 承载 ShrinkApp 组合根和运行时诊断。",
|
"Context 应用适配", "用 ContextLoader 承载 ShrinkApp 组合根和运行时诊断。",
|
||||||
"com.cneicy.shrink-context-app-adapter", "0.1.3", ShrinkSdkPackageLayer.Context, true);
|
"com.cneicy.shrink-context-app-adapter", "0.2.0", ShrinkSdkPackageLayer.Context, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry ContextEventBusAdapter = Package(
|
internal static readonly ShrinkSdkPackageEntry ContextEventBusAdapter = Package(
|
||||||
"Context 事件适配", "把事件订阅纳入 Context 的安装与自动撤回。",
|
"Context 事件适配", "把事件订阅纳入 Context 的安装与自动撤回。",
|
||||||
"com.cneicy.shrink-context-eventbus-adapter", "0.1.0", ShrinkSdkPackageLayer.Context, true);
|
"com.cneicy.shrink-context-eventbus-adapter", "0.1.1", ShrinkSdkPackageLayer.Context, true);
|
||||||
|
|
||||||
internal static readonly ShrinkSdkPackageEntry AppCore = Package(
|
internal static readonly ShrinkSdkPackageEntry AppCore = Package(
|
||||||
"应用宿主", "统一启动、服务门面与应用生命周期。",
|
"应用宿主", "统一启动、服务门面与应用生命周期。",
|
||||||
"com.cneicy.shrink-app-core", "0.1.2", ShrinkSdkPackageLayer.Host, true);
|
"com.cneicy.shrink-app-core", "0.2.0", ShrinkSdkPackageLayer.Host, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry StarterBasic = Package(
|
internal static readonly ShrinkSdkPackageEntry StarterBasic = Package(
|
||||||
"基础应用起步包", "默认 Context 组合根,包含命令、存档、网络及其集成。",
|
"基础应用起步包", "默认 Context 组合根,包含命令、存档、网络及其集成。",
|
||||||
"com.cneicy.shrink-app-starter-basic", "0.2.0", ShrinkSdkPackageLayer.Host, true);
|
"com.cneicy.shrink-app-starter-basic", "0.3.0", ShrinkSdkPackageLayer.Host, true);
|
||||||
|
|
||||||
internal static readonly ShrinkSdkPackageEntry Command = Package(
|
internal static readonly ShrinkSdkPackageEntry Command = Package(
|
||||||
"命令系统", "命令路由、参数、权限与自动注册。",
|
"命令系统", "命令路由、参数、权限与自动注册。",
|
||||||
"com.cneicy.shrink-command", "0.2.0", ShrinkSdkPackageLayer.Feature, true);
|
"com.cneicy.shrink-command", "0.3.0", ShrinkSdkPackageLayer.Feature, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry DataSaver = Package(
|
internal static readonly ShrinkSdkPackageEntry DataSaver = Package(
|
||||||
"存档系统", "异步存档、设置、备份恢复与数据观察。",
|
"存档系统", "异步存档、设置、备份恢复与数据观察。",
|
||||||
"com.cneicy.shrink-datasaver", "2.2.1", ShrinkSdkPackageLayer.Feature, true);
|
"com.cneicy.shrink-datasaver", "2.3.0", ShrinkSdkPackageLayer.Feature, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry EventBus = Package(
|
internal static readonly ShrinkSdkPackageEntry EventBus = Package(
|
||||||
"事件总线", "类型安全事件、请求结果、调度与代码生成。",
|
"事件总线", "类型安全事件、请求结果、调度与代码生成。",
|
||||||
"com.cneicy.shrink-eventbus", "2.0.0", ShrinkSdkPackageLayer.Feature, true);
|
"com.cneicy.shrink-eventbus", "2.1.0", ShrinkSdkPackageLayer.Feature, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry EventBusEntities = Package(
|
internal static readonly ShrinkSdkPackageEntry EventBusEntities = Package(
|
||||||
"Entities 事件适配", "将事件总线接入 Unity Entities。",
|
"Entities 事件适配", "将事件总线接入 Unity Entities。",
|
||||||
"com.cneicy.shrink-eventbus-entities", "0.1.0", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-eventbus-entities", "0.1.1", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry ModFramework = Package(
|
internal static readonly ShrinkSdkPackageEntry ModFramework = Package(
|
||||||
"模组框架", "Context 托管的模组生命周期、热替换与外部 DLL 加载。",
|
"模组框架", "Context 托管的模组生命周期、热替换与外部 DLL 加载。",
|
||||||
"com.cneicy.shrink-mod-framework", "0.2.2", ShrinkSdkPackageLayer.Feature, true);
|
"com.cneicy.shrink-mod-framework", "0.3.0", ShrinkSdkPackageLayer.Feature, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry Network = Package(
|
internal static readonly ShrinkSdkPackageEntry Network = Package(
|
||||||
"网络系统", "消息、RPC、权限、序列化与多种传输层。",
|
"网络系统", "消息、RPC、权限、序列化与多种传输层。",
|
||||||
"com.cneicy.shrink-network", "0.2.1", ShrinkSdkPackageLayer.Feature, true);
|
"com.cneicy.shrink-network", "0.3.0", ShrinkSdkPackageLayer.Feature, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry Tutorial = Package(
|
internal static readonly ShrinkSdkPackageEntry Tutorial = Package(
|
||||||
"引导系统", "可复用的步骤式引导、遮罩、锚点与进度存储。",
|
"引导系统", "可复用的步骤式引导、遮罩、锚点与进度存储。",
|
||||||
"com.cneicy.shrink-tutorial", "0.1.2", ShrinkSdkPackageLayer.Feature);
|
"com.cneicy.shrink-tutorial", "0.2.0", ShrinkSdkPackageLayer.Feature);
|
||||||
|
|
||||||
internal static readonly ShrinkSdkPackageEntry CommandApp = Package(
|
internal static readonly ShrinkSdkPackageEntry CommandApp = Package(
|
||||||
"命令 - 应用集成", "以原生 Context 组件向应用宿主发布命令服务。",
|
"命令 - 应用集成", "以原生 Context 组件向应用宿主发布命令服务。",
|
||||||
"com.cneicy.shrink-command-integration-app", "0.1.1", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-command-integration-app", "0.2.0", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry CommandEventBus = Package(
|
internal static readonly ShrinkSdkPackageEntry CommandEventBus = Package(
|
||||||
"命令 - 事件集成", "通过事件总线执行命令并发布执行状态。",
|
"命令 - 事件集成", "通过事件总线执行命令并发布执行状态。",
|
||||||
"com.cneicy.shrink-command-integration-eventbus", "0.1.1", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-command-integration-eventbus", "0.2.0", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry CommandNetwork = Package(
|
internal static readonly ShrinkSdkPackageEntry CommandNetwork = Package(
|
||||||
"命令 - 网络集成", "通过网络 RPC 执行远程命令。",
|
"命令 - 网络集成", "通过网络 RPC 执行远程命令。",
|
||||||
"com.cneicy.shrink-command-integration-network", "0.1.1", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-command-integration-network", "0.2.0", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry DataSaverApp = Package(
|
internal static readonly ShrinkSdkPackageEntry DataSaverApp = Package(
|
||||||
"存档 - 应用集成", "以原生 Context 组件向应用宿主发布存档服务。",
|
"存档 - 应用集成", "以原生 Context 组件向应用宿主发布存档服务。",
|
||||||
"com.cneicy.shrink-datasaver-integration-app", "0.1.1", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-datasaver-integration-app", "0.2.0", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry DataSaverEventBus = Package(
|
internal static readonly ShrinkSdkPackageEntry DataSaverEventBus = Package(
|
||||||
"存档 - 事件集成", "通过事件总线请求读写并观察存档变化。",
|
"存档 - 事件集成", "通过事件总线请求读写并观察存档变化。",
|
||||||
"com.cneicy.shrink-datasaver-integration-eventbus", "2.1.1", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-datasaver-integration-eventbus", "2.2.0", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry NetworkApp = Package(
|
internal static readonly ShrinkSdkPackageEntry NetworkApp = Package(
|
||||||
"网络 - 应用集成", "以原生 Context 组件向应用宿主发布网络服务。",
|
"网络 - 应用集成", "以原生 Context 组件向应用宿主发布网络服务。",
|
||||||
"com.cneicy.shrink-network-integration-app", "0.1.1", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-network-integration-app", "0.2.0", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry NetworkEventBus = Package(
|
internal static readonly ShrinkSdkPackageEntry NetworkEventBus = Package(
|
||||||
"网络 - 事件集成", "把网络消息与事件请求桥接为可撤回的 Context 组件。",
|
"网络 - 事件集成", "把网络消息与事件请求桥接为可撤回的 Context 组件。",
|
||||||
"com.cneicy.shrink-network-integration-eventbus", "0.1.2", ShrinkSdkPackageLayer.Integration, true);
|
"com.cneicy.shrink-network-integration-eventbus", "0.2.0", ShrinkSdkPackageLayer.Integration, true);
|
||||||
internal static readonly ShrinkSdkPackageEntry SharedCodeGen = Package(
|
internal static readonly ShrinkSdkPackageEntry SharedCodeGen = Package(
|
||||||
"共享代码生成", "各功能包使用的编译期注册表基础设施。",
|
"共享代码生成", "各功能包使用的编译期注册表基础设施。",
|
||||||
"com.cneicy.shrink-shared-codegen", "0.1.0", ShrinkSdkPackageLayer.Tooling);
|
"com.cneicy.shrink-shared-codegen", "0.1.0", ShrinkSdkPackageLayer.Tooling);
|
||||||
|
internal static readonly ShrinkSdkPackageEntry RuntimeAbstractions = Package(
|
||||||
|
"运行时抽象", "Unity 与其他 .NET 宿主共用的平台服务合同。",
|
||||||
|
"com.cneicy.shrink-runtime-abstractions", "0.1.0", ShrinkSdkPackageLayer.Tooling);
|
||||||
|
|
||||||
internal static readonly IReadOnlyList<ShrinkSdkPackageEntry> Packages = new[]
|
internal static readonly IReadOnlyList<ShrinkSdkPackageEntry> Packages = new[]
|
||||||
{
|
{
|
||||||
@@ -137,7 +140,7 @@ namespace ShrinkSDK.Installer
|
|||||||
CommandApp, CommandEventBus, CommandNetwork,
|
CommandApp, CommandEventBus, CommandNetwork,
|
||||||
DataSaverApp, DataSaverEventBus,
|
DataSaverApp, DataSaverEventBus,
|
||||||
NetworkApp, NetworkEventBus, EventBusEntities,
|
NetworkApp, NetworkEventBus, EventBusEntities,
|
||||||
SharedCodeGen
|
SharedCodeGen, RuntimeAbstractions
|
||||||
};
|
};
|
||||||
|
|
||||||
internal static readonly IReadOnlyList<ShrinkSdkPackageBundle> Bundles = new[]
|
internal static readonly IReadOnlyList<ShrinkSdkPackageBundle> Bundles = new[]
|
||||||
@@ -153,7 +156,7 @@ namespace ShrinkSDK.Installer
|
|||||||
DataSaverApp, DataSaverEventBus, NetworkApp, NetworkEventBus,
|
DataSaverApp, DataSaverEventBus, NetworkApp, NetworkEventBus,
|
||||||
StarterBasic
|
StarterBasic
|
||||||
},
|
},
|
||||||
new[] { StarterBasic },
|
new[] { StarterBasic, ContextEventBusAdapter },
|
||||||
recommended: true),
|
recommended: true),
|
||||||
new ShrinkSdkPackageBundle(
|
new ShrinkSdkPackageBundle(
|
||||||
"Context 最小基座",
|
"Context 最小基座",
|
||||||
@@ -195,7 +198,7 @@ namespace ShrinkSDK.Installer
|
|||||||
DataSaverApp, DataSaverEventBus, NetworkApp, NetworkEventBus,
|
DataSaverApp, DataSaverEventBus, NetworkApp, NetworkEventBus,
|
||||||
StarterBasic
|
StarterBasic
|
||||||
},
|
},
|
||||||
new[] { StarterBasic, ModFramework, Tutorial })
|
new[] { StarterBasic, ContextEventBusAdapter, ModFramework, Tutorial })
|
||||||
};
|
};
|
||||||
|
|
||||||
internal static IReadOnlyList<ShrinkSdkPackageEntry> DistinctInstallRoots(
|
internal static IReadOnlyList<ShrinkSdkPackageEntry> DistinctInstallRoots(
|
||||||
|
|||||||
@@ -15,5 +15,5 @@
|
|||||||
## 引导地址
|
## 引导地址
|
||||||
|
|
||||||
```text
|
```text
|
||||||
https://git.crash.work/ShrinkSDK/Installer.git#v0.2.0
|
https://git.crash.work/ShrinkSDK/Installer.git#v0.2.3
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 238fc591f33a45dca54d074857959f87
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a5027bfa9e76434983f82652539bc42a
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"name": "ShrinkInstaller.Editor.Tests",
|
||||||
|
"rootNamespace": "ShrinkSDK.Installer.Tests",
|
||||||
|
"references": [
|
||||||
|
"ShrinkInstaller.Editor"
|
||||||
|
],
|
||||||
|
"includePlatforms": [
|
||||||
|
"Editor"
|
||||||
|
],
|
||||||
|
"excludePlatforms": [],
|
||||||
|
"allowUnsafeCode": false,
|
||||||
|
"overrideReferences": false,
|
||||||
|
"autoReferenced": false,
|
||||||
|
"defineConstraints": [
|
||||||
|
"UNITY_INCLUDE_TESTS"
|
||||||
|
],
|
||||||
|
"versionDefines": [],
|
||||||
|
"noEngineReferences": false,
|
||||||
|
"optionalUnityReferences": [
|
||||||
|
"TestAssemblies"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 00a17f283465481592e764466d9c980d
|
||||||
|
AssemblyDefinitionImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
#nullable enable
|
||||||
|
|
||||||
|
using NUnit.Framework;
|
||||||
|
|
||||||
|
namespace ShrinkSDK.Installer.Tests
|
||||||
|
{
|
||||||
|
public sealed class ShrinkPackageVersionTests
|
||||||
|
{
|
||||||
|
[TestCase("1.10.0", "1.9.0", ShrinkPackageVersionRelation.Newer)]
|
||||||
|
[TestCase("2.1.0", "2.1.0", ShrinkPackageVersionRelation.Equal)]
|
||||||
|
[TestCase("2.0.9", "2.1.0", ShrinkPackageVersionRelation.Older)]
|
||||||
|
[TestCase("1.0.0", "1.0.0-preview.9", ShrinkPackageVersionRelation.Newer)]
|
||||||
|
[TestCase("1.0.0-preview.10", "1.0.0-preview.2", ShrinkPackageVersionRelation.Newer)]
|
||||||
|
[TestCase("1.0.0+build.2", "1.0.0+build.1", ShrinkPackageVersionRelation.Equal)]
|
||||||
|
[TestCase("git+https://example.invalid/package", "1.0.0", ShrinkPackageVersionRelation.Unknown)]
|
||||||
|
public void Classify_UsesSemanticVersionOrdering(string installed, string target,
|
||||||
|
ShrinkPackageVersionRelation expected)
|
||||||
|
{
|
||||||
|
Assert.AreEqual(expected, ShrinkPackageVersion.Classify(installed, target));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9152d73a7f3141429d048528d92b1ecf
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+2
-1
@@ -1,10 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "com.cneicy.shrink-installer",
|
"name": "com.cneicy.shrink-installer",
|
||||||
"version": "0.2.0",
|
"version": "0.2.5",
|
||||||
"displayName": "ShrinkSDK 包管理",
|
"displayName": "ShrinkSDK 包管理",
|
||||||
"description": "基于 UI Toolkit 的 ShrinkSDK 固定版本包管理器,提供安装状态、Context 分层与推荐组合。",
|
"description": "基于 UI Toolkit 的 ShrinkSDK 固定版本包管理器,提供安装状态、Context 分层与推荐组合。",
|
||||||
"unity": "2022.3",
|
"unity": "2022.3",
|
||||||
"documentationUrl": "https://git.crash.work/ShrinkSDK/Installer",
|
"documentationUrl": "https://git.crash.work/ShrinkSDK/Installer",
|
||||||
|
"changelogUrl": "https://git.crash.work/ShrinkSDK/Installer/src/branch/main/CHANGELOG.md",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.nuget.newtonsoft-json": "3.2.2"
|
"com.unity.nuget.newtonsoft-json": "3.2.2"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user