mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-26 18:24:43 +00:00
Compare commits
5 commits
79a0538ca0
...
a8eba93ffd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a8eba93ffd | ||
|
|
4ffe595db6 | ||
|
|
885587e551 | ||
|
|
e986dc189e | ||
|
|
bccab41c8f |
7 changed files with 39 additions and 42 deletions
|
|
@ -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>
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,30 @@
|
||||||
<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>
|
||||||
|
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
|
||||||
<ItemGroup>
|
<PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />
|
||||||
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
|
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.3" />
|
||||||
<PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />
|
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.3" />
|
||||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.3" />
|
<PackageVersion Include="CliWrap" Version="3.7.1" />
|
||||||
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.3" />
|
<PackageVersion Include="Downloader" Version="3.3.3" />
|
||||||
<PackageVersion Include="CliWrap" Version="3.7.1" />
|
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
|
||||||
<PackageVersion Include="Downloader" Version="3.3.3" />
|
<PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
|
||||||
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
|
<PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
|
||||||
<PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
|
<PackageVersion Include="QRCoder" Version="1.6.0" />
|
||||||
<PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
|
<PackageVersion Include="ReactiveUI" Version="20.1.63" />
|
||||||
<PackageVersion Include="QRCoder" Version="1.6.0" />
|
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
|
||||||
<PackageVersion Include="ReactiveUI" Version="20.1.63" />
|
<PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
|
||||||
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
|
<PackageVersion Include="Semi.Avalonia" Version="11.2.1.4" />
|
||||||
<PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
|
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
|
||||||
<PackageVersion Include="Semi.Avalonia" Version="11.2.1.4" />
|
<PackageVersion Include="Splat.NLog" Version="15.3.1" />
|
||||||
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
|
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
|
||||||
<PackageVersion Include="Splat.NLog" Version="15.2.22" />
|
<PackageVersion Include="TaskScheduler" Version="2.11.0" />
|
||||||
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
|
<PackageVersion Include="WebDav.Client" Version="2.8.0" />
|
||||||
<PackageVersion Include="TaskScheduler" Version="2.11.0" />
|
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
|
||||||
<PackageVersion Include="WebDav.Client" Version="2.8.0" />
|
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
|
||||||
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
|
</ItemGroup>
|
||||||
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
|
|
|
||||||
|
|
@ -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)
|
||||||
|
|
|
||||||
|
|
@ -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()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue