Merge 4ae34ccb01 into 4e042295d2

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.11</Version>
+        <Version>7.14.10</Version>
     </PropertyGroup>
 
     <PropertyGroup>

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,8 +158,11 @@ public class CheckUpdateViewModel : MyReactiveObject
                 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)
@@ -173,8 +176,11 @@ public class CheckUpdateViewModel : MyReactiveObject
                 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)
@@ -190,8 +196,11 @@ public class CheckUpdateViewModel : MyReactiveObject
             }
         }
         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()
@@ -302,7 +311,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()));