提交 f47f2944 编写于 作者: 魔术师Dix's avatar 魔术师Dix

【Fix】更新包时正确处理未拉取的包情况;

上级 467c541c
......@@ -81,6 +81,11 @@ namespace UpmGitTool
SemVersion depVer = SemVersion.Parse(depency.version);
var pkg = AppState.FindPackage(key);
if (!pkg.IsFetchedSucess)
{
Logger.LogWarning($"{key} : 没有拉取到信息将不会安装");
return;
}
var pkgVersion = pkg.Versions;
for (int i = 0; i < pkgVersion.Count; i++)
......@@ -93,11 +98,8 @@ namespace UpmGitTool
}
}
if (pkgVersion.Count > 0)
//没有目标版本,只有安装最新版本;
InstallVersion(pkgVersion[0]);
else
Logger.LogWarning($"{key} : 没有拉取到信息将不会安装");
//没有目标版本,只有安装最新版本;
InstallVersion(pkgVersion[0]);
}
catch (System.Exception ex)
{
......@@ -149,10 +151,13 @@ namespace UpmGitTool
var pkg = AppState.FindPackage(key);
if (!pkg.IsInstalled) return false;//未安装
var installVer = pkg.InstallVersionString;
var depVer = dep.version;
if (IsCurrentVersionNewer(installVer, depVer))//已安装了更新的版本;
return true;
if (pkg.IsFetchedSucess)
{
var installVer = pkg.InstallVersionString;
var depVer = dep.version;
if (IsCurrentVersionNewer(installVer, depVer))//已安装了更新的版本;
return true;
}
return false;
}
......
......@@ -81,7 +81,7 @@ namespace UpmGitTool
InstallPackageId = item.PackageId;
IsGit = item.IsGitUrl;
PackageUrl = item.PackageUrl;
InstallVersionString = item.PackageUrl;
if (!item.IsGitUrl) InstallVersionString = item.PackageUrl;
RefreshInstalledVersion();
}
......@@ -122,6 +122,11 @@ namespace UpmGitTool
#region 包安装信息
/// <summary>
/// 成功从远端拉取到版本;
/// </summary>
public bool IsFetchedSucess => Versions != null && Versions.Count > 0;
/// <summary>
/// 刷新已安装的版本
/// </summary>
......@@ -131,7 +136,7 @@ namespace UpmGitTool
InstallVersion = null;
if (!IsInstalled) return;
if (string.IsNullOrEmpty(InstallPackageId)) return;
if (Versions == null) return;
if (!IsFetchedSucess) return;
foreach (var ver in Versions)
{
......@@ -142,8 +147,8 @@ namespace UpmGitTool
break;
}
}
if (InstallVersion == null) return;
if (InstallVersion == null)
return;
var installVer = InstallVersion.Version;
IsUpgradable = false;
foreach (var ver in Versions)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册