Compare commits

...

5 commits

Author SHA1 Message Date
2dust
a8eba93ffd up 7.8.0
Some checks are pending
release Linux / build (Release) (push) Waiting to run
release macOS / build (Release) (push) Waiting to run
release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run
release Windows / build (Release) (push) Waiting to run
2025-02-04 14:30:42 +08:00
2dust
4ffe595db6 Code clean 2025-02-04 14:30:28 +08:00
2dust
885587e551 Update Directory.Packages.props 2025-02-04 14:19:56 +08:00
2dust
e986dc189e Fix ProcUtils NoAssociatedProcess issue 2025-02-04 10:30:33 +08:00
2dust
bccab41c8f Update Directory.Build.props 2025-02-04 10:28:49 +08:00
7 changed files with 39 additions and 42 deletions

View file

@ -1,14 +1,14 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>7.7.1</Version> <Version>7.8.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<NoWarn>CA1031;CS1591;NU1507</NoWarn> <NoWarn>CA1031;CS1591;NU1507;CA1416</NoWarn>
<Nullable>annotations</Nullable> <Nullable>annotations</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Authors>2dust</Authors> <Authors>2dust</Authors>

View file

@ -1,11 +1,9 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled> <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled> <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.3" /> <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
<PackageVersion Include="Avalonia.Desktop" Version="11.2.3" /> <PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />
@ -22,7 +20,7 @@
<PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" /> <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
<PackageVersion Include="Semi.Avalonia" Version="11.2.1.4" /> <PackageVersion Include="Semi.Avalonia" Version="11.2.1.4" />
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" /> <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
<PackageVersion Include="Splat.NLog" Version="15.2.22" /> <PackageVersion Include="Splat.NLog" Version="15.3.1" />
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" /> <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
<PackageVersion Include="TaskScheduler" Version="2.11.0" /> <PackageVersion Include="TaskScheduler" Version="2.11.0" />
<PackageVersion Include="WebDav.Client" Version="2.8.0" /> <PackageVersion Include="WebDav.Client" Version="2.8.0" />

View file

@ -24,18 +24,18 @@ public static class ProcUtils
if (arguments.Contains(' ')) if (arguments.Contains(' '))
arguments = arguments.AppendQuotes(); arguments = arguments.AppendQuotes();
Process process = new() Process proc = new()
{ {
StartInfo = new ProcessStartInfo StartInfo = new ProcessStartInfo
{ {
UseShellExecute = true, UseShellExecute = true,
FileName = fileName, FileName = fileName,
Arguments = arguments, Arguments = arguments,
WorkingDirectory = dir WorkingDirectory = dir ?? string.Empty
} }
}; };
process.Start(); proc.Start();
return process.Id; return dir is null ? null : proc.Id;
} }
catch (Exception ex) catch (Exception ex)
{ {

View file

@ -69,7 +69,7 @@ namespace ServiceLib.Handler.SysProxy
} }
return result; return result;
} }
catch (Exception ex) catch
{ {
SetProxyFallback(strProxy, exceptions, type); SetProxyFallback(strProxy, exceptions, type);
return false; return false;

View file

@ -350,7 +350,7 @@ namespace v2rayN.Desktop.Views
//ShowHideWindow(false); //ShowHideWindow(false);
NoticeHandler.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)"); NoticeHandler.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)");
return; await Task.CompletedTask;
//if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) //if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
//{ //{
// //var bytes = QRCodeHelper.CaptureScreen(desktop); // //var bytes = QRCodeHelper.CaptureScreen(desktop);

View file

@ -219,7 +219,7 @@ namespace v2rayN.Desktop.Views
private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e) private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
{ {
e.Row.Header = $" {e.Row.GetIndex() + 1}"; e.Row.Header = $" {e.Row.Index + 1}";
} }
//private void LstProfiles_ColumnHeader_Click(object? sender, RoutedEventArgs e) //private void LstProfiles_ColumnHeader_Click(object? sender, RoutedEventArgs e)

View file

@ -10,7 +10,6 @@ namespace v2rayN
public partial class App : Application public partial class App : Application
{ {
public static EventWaitHandle ProgramStarted; public static EventWaitHandle ProgramStarted;
private static Config _config;
public App() public App()
{ {