diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..0ab249d5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "v2rayN/GlobalHotKeys"] + path = v2rayN/GlobalHotKeys + url = https://github.com/2dust/GlobalHotKeys diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props index 77930319..da2e149e 100644 --- a/v2rayN/Directory.Packages.props +++ b/v2rayN/Directory.Packages.props @@ -9,9 +9,8 @@ - + - @@ -23,9 +22,9 @@ - + - \ No newline at end of file + diff --git a/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs b/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs index 285bf442..43fdea7f 100644 --- a/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs +++ b/v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs @@ -3,7 +3,6 @@ using Avalonia.Input; using Avalonia.ReactiveUI; using Avalonia.Win32.Input; using GlobalHotKeys; -using GlobalHotKeys.Native.Types; namespace v2rayN.Desktop.Handler { diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj index 5a550837..e488c63a 100644 --- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj +++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj @@ -26,12 +26,12 @@ true - + diff --git a/v2rayN/v2rayN.sln b/v2rayN/v2rayN.sln index 22a2bcce..3af7081a 100644 --- a/v2rayN/v2rayN.sln +++ b/v2rayN/v2rayN.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "v2rayN.Desktop", "v2rayN.De EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AmazTool", "AmazTool\AmazTool.csproj", "{47D68B1C-601C-4C69-873B-FFF0DC13EC97}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlobalHotKeys", "GlobalHotKeys\src\GlobalHotKeys\GlobalHotKeys.csproj", "{CB3DE54F-3A26-AE02-1299-311132C32156}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,6 +35,10 @@ Global {47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Debug|Any CPU.Build.0 = Debug|Any CPU {47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Release|Any CPU.ActiveCfg = Release|Any CPU {47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Release|Any CPU.Build.0 = Release|Any CPU + {CB3DE54F-3A26-AE02-1299-311132C32156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CB3DE54F-3A26-AE02-1299-311132C32156}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CB3DE54F-3A26-AE02-1299-311132C32156}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CB3DE54F-3A26-AE02-1299-311132C32156}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE