mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-27 02:34:41 +00:00
Compare commits
No commits in common. "ef30d389dcee3202f03a4a8b7b554ad5e1a8c35b" and "4e042295d2651755b6e1fce436aa6c8e069646f9" have entirely different histories.
ef30d389dc
...
4e042295d2
2 changed files with 18 additions and 9 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>7.14.11</Version>
|
<Version>7.14.10</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||||
this.WhenAnyValue(
|
this.WhenAnyValue(
|
||||||
x => x.EnableCheckPreReleaseUpdate,
|
x => x.EnableCheckPreReleaseUpdate,
|
||||||
y => y == true)
|
y => y == true)
|
||||||
.Subscribe(c => _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate);
|
.Subscribe(c => { _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate; });
|
||||||
|
|
||||||
RefreshCheckUpdateItems();
|
RefreshCheckUpdateItems();
|
||||||
}
|
}
|
||||||
|
|
@ -158,8 +158,11 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||||
UpdatedPlusPlus(_geo, "");
|
UpdatedPlusPlus(_geo, "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await new UpdateService().UpdateGeoFileAll(_config, _updateUI)
|
await (new UpdateService()).UpdateGeoFileAll(_config, _updateUI)
|
||||||
.ContinueWith(t => UpdatedPlusPlus(_geo, ""));
|
.ContinueWith(t =>
|
||||||
|
{
|
||||||
|
UpdatedPlusPlus(_geo, "");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task CheckUpdateN(bool preRelease)
|
private async Task CheckUpdateN(bool preRelease)
|
||||||
|
|
@ -173,8 +176,11 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||||
UpdatedPlusPlus(_v2rayN, msg);
|
UpdatedPlusPlus(_v2rayN, msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await new UpdateService().CheckUpdateGuiN(_config, _updateUI, preRelease)
|
await (new UpdateService()).CheckUpdateGuiN(_config, _updateUI, preRelease)
|
||||||
.ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));
|
.ContinueWith(t =>
|
||||||
|
{
|
||||||
|
UpdatedPlusPlus(_v2rayN, "");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease)
|
private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease)
|
||||||
|
|
@ -190,8 +196,11 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);
|
var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);
|
||||||
await new UpdateService().CheckUpdateCore(type, _config, _updateUI, preRelease)
|
await (new UpdateService()).CheckUpdateCore(type, _config, _updateUI, preRelease)
|
||||||
.ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));
|
.ContinueWith(t =>
|
||||||
|
{
|
||||||
|
UpdatedPlusPlus(model.CoreType, "");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task UpdateFinished()
|
private async Task UpdateFinished()
|
||||||
|
|
@ -302,7 +311,7 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||||
|
|
||||||
if (Utils.IsNonWindows())
|
if (Utils.IsNonWindows())
|
||||||
{
|
{
|
||||||
var filesList = new DirectoryInfo(toPath).GetFiles().Select(u => u.FullName).ToList();
|
var filesList = (new DirectoryInfo(toPath)).GetFiles().Select(u => u.FullName).ToList();
|
||||||
foreach (var file in filesList)
|
foreach (var file in filesList)
|
||||||
{
|
{
|
||||||
await Utils.SetLinuxChmod(Path.Combine(toPath, item.CoreType.ToLower()));
|
await Utils.SetLinuxChmod(Path.Combine(toPath, item.CoreType.ToLower()));
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue