Merge 69e083f76f into ef30d389dc

up 7.14.11
Update CheckUpdateViewModel.cs
2025-10-26 18:24:43 +00:00 · 2025-09-20 11:32:43 +03:00 · 2025-09-20 14:06:55 +08:00 · 2025-09-20 14:06:41 +08:00
2 changed files with 9 additions and 18 deletions
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@ -1,7 +1,7 @@
 <Project>

    <PropertyGroup>
-        <Version>7.14.10</Version>
+        <Version>7.14.11</Version>
    </PropertyGroup>

    <PropertyGroup>
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@ -38,7 +38,7 @@ public class CheckUpdateViewModel : MyReactiveObject
        this.WhenAnyValue(
        x => x.EnableCheckPreReleaseUpdate,
        y => y == true)
-            .Subscribe(c => { _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate; });
+            .Subscribe(c => _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate);

        RefreshCheckUpdateItems();
    }
@ -158,11 +158,8 @@ public class CheckUpdateViewModel : MyReactiveObject
                UpdatedPlusPlus(_geo, "");
            }
        }
-        await (new UpdateService()).UpdateGeoFileAll(_config, _updateUI)
-            .ContinueWith(t =>
-            {
-                UpdatedPlusPlus(_geo, "");
-            });
+        await new UpdateService().UpdateGeoFileAll(_config, _updateUI)
+            .ContinueWith(t => UpdatedPlusPlus(_geo, ""));
    }

    private async Task CheckUpdateN(bool preRelease)
@ -176,11 +173,8 @@ public class CheckUpdateViewModel : MyReactiveObject
                UpdatedPlusPlus(_v2rayN, msg);
            }
        }
-        await (new UpdateService()).CheckUpdateGuiN(_config, _updateUI, preRelease)
-            .ContinueWith(t =>
-            {
-                UpdatedPlusPlus(_v2rayN, "");
-            });
+        await new UpdateService().CheckUpdateGuiN(_config, _updateUI, preRelease)
+            .ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));
    }

    private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease)
@ -196,11 +190,8 @@ public class CheckUpdateViewModel : MyReactiveObject
            }
        }
        var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);
-        await (new UpdateService()).CheckUpdateCore(type, _config, _updateUI, preRelease)
-            .ContinueWith(t =>
-            {
-                UpdatedPlusPlus(model.CoreType, "");
-            });
+        await new UpdateService().CheckUpdateCore(type, _config, _updateUI, preRelease)
+            .ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));
    }

    private async Task UpdateFinished()
@ -311,7 +302,7 @@ public class CheckUpdateViewModel : MyReactiveObject

            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)
                {
                    await Utils.SetLinuxChmod(Path.Combine(toPath, item.CoreType.ToLower()));
Author	SHA1	Message	Date
DHR60	6262931ebf	Merge `69e083f76f` into `ef30d389dc`	2025-09-20 11:32:43 +03:00
2dust	ef30d389dc	up 7.14.11 Some checks are pending release Linux / build (Release) (push) Waiting to run Details release macOS / build (Release) (push) Waiting to run Details release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run Details release Windows / build (Release) (push) Waiting to run Details	2025-09-20 14:06:55 +08:00
2dust	bf8783fed7	Update CheckUpdateViewModel.cs	2025-09-20 14:06:41 +08:00