Skip to content

Replace SetDefaultDllDirectories call with Assembly attribute #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejstrunz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace SetDefaultDllDirectories call with Assembly attribute #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions ProtonVpn.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Vpn.Tests", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Tests.Common", "src\Tests\ProtonVPN.Tests.Common\ProtonVPN.Tests.Common.csproj", "{A0DA4200-6643-4F2C-8450-65B8CE8A5576}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Native", "src\ProtonVPN.Native\ProtonVPN.Native.csproj", "{CB301B4C-D518-41F5-873B-9B1F145DB4AF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.NetworkFilter", "src\ProtonVPN.NetworkFilter\ProtonVPN.NetworkFilter.csproj", "{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.MarkupValidator", "src\ProtonVPN.MarkupValidator\ProtonVPN.MarkupValidator.csproj", "{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}"
Expand Down Expand Up @@ -660,22 +658,6 @@ Global
{A0DA4200-6643-4F2C-8450-65B8CE8A5576}.Release|x64.Build.0 = Release|Any CPU
{A0DA4200-6643-4F2C-8450-65B8CE8A5576}.Release|x86.ActiveCfg = Release|Any CPU
{A0DA4200-6643-4F2C-8450-65B8CE8A5576}.Release|x86.Build.0 = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|ARM64.Build.0 = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|x64.ActiveCfg = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|x64.Build.0 = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|x86.ActiveCfg = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Debug|x86.Build.0 = Debug|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|Any CPU.Build.0 = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|ARM64.ActiveCfg = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|ARM64.Build.0 = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|x64.ActiveCfg = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|x64.Build.0 = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|x86.ActiveCfg = Release|Any CPU
{CB301B4C-D518-41F5-873B-9B1F145DB4AF}.Release|x86.Build.0 = Release|Any CPU
{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand Down
42 changes: 0 additions & 42 deletions src/ProtonVPN.Native/PInvoke/Kernel32.cs
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/ProtonVPN.Native/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/ProtonVPN.Native/ProtonVPN.Native.csproj
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/ProtonVPN.Service/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@
[assembly: Guid("b23ab123-f51e-49b4-b434-282d8eeb137c")]
[assembly: InternalsVisibleTo("ProtonVPN.Service.Test")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.SafeDirectories)]
1 change: 0 additions & 1 deletion src/ProtonVPN.Service/ProtonVPN.Service.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<ProjectReference Include="..\ProcessCommunication\ProtonVPN.ProcessCommunication.Installers\ProtonVPN.ProcessCommunication.Installers.csproj" />
<ProjectReference Include="..\ProcessCommunication\Server\ProtonVPN.ProcessCommunication.Server.Installers\ProtonVPN.ProcessCommunication.Server.Installers.csproj" />
<ProjectReference Include="..\ProtonVPN.Common.Legacy\ProtonVPN.Common.Legacy.csproj" />
<ProjectReference Include="..\ProtonVPN.Native\ProtonVPN.Native.csproj" />
<ProjectReference Include="..\ProtonVPN.NetworkFilter\ProtonVPN.NetworkFilter.csproj" />
<ProjectReference Include="..\ProtonVPN.Vpn\ProtonVPN.Vpn.csproj" />
<ProjectReference Include="..\Serialization\ProtonVPN.Serialization.Installers\ProtonVPN.Serialization.Installers.csproj" />
Expand Down
7 changes: 0 additions & 7 deletions src/ProtonVPN.Service/Start/Bootstrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
using ProtonVPN.Logging.Contracts;
using ProtonVPN.Logging.Contracts.Events.AppServiceLogs;
using ProtonVPN.Logging.Installers;
using ProtonVPN.Native.PInvoke;
using ProtonVPN.OperatingSystems.Network.Installers;
using ProtonVPN.Service.Settings;
using ProtonVPN.Service.Vpn;
Expand All @@ -56,7 +55,6 @@ public Bootstrapper()

public void Initialize()
{
SetDllDirectories();
Configure();
PrepareDirectories();
Start();
Expand Down Expand Up @@ -148,9 +146,4 @@ private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionE
Resolve<OpenVpnProcess>().Stop();
processes.KillProcesses(config.ClientName);
}

private static void SetDllDirectories()
{
Kernel32.SetDefaultDllDirectories(Kernel32.SetDefaultDllDirectoriesFlags.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
}
}