Skip to content

Commit 9f34532

Browse files
mindaugasveblauskasmindaugasveblauskas
committed
Merge branch 'release/1.22.1'
2 parents f13de12 + 90dc7a6 commit 9f34532

File tree

315 files changed

+9451
-2280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

315 files changed

+9451
-2280
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,4 +260,7 @@ dotnet_naming_symbols.constant_fields.required_modifiers=const
260260
dotnet_naming_style.pascal_case_style.capitalization=pascal_case
261261

262262
# ReSharper inspection severities
263-
resharper_arrange_this_qualifier_highlighting=hint
263+
resharper_arrange_this_qualifier_highlighting=hint
264+
265+
# IDE1006: Naming Styles
266+
dotnet_diagnostic.IDE1006.severity = warning

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "src/srp"]
22
path = src/srp
33
url = https://github.com/ProtonMail/go-srp
4+
[submodule "src/ProtonVPN.LocalAgent"]
5+
path = src/ProtonVPN.LocalAgent
6+
url = https://gitlab.protontech.ch/ProtonVPN/development/clients-shared.git

‎ProtonVPN.RestoreInternet/App.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
55
</startup>
6+
<runtime>
7+
<enforceFIPSPolicy enabled="false" />
8+
</runtime>
69
</configuration>

‎ProtonVpn.sln‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.RestoreInternet",
102102
{BBCBB464-BDCB-49CD-830F-965D07CE1446} = {BBCBB464-BDCB-49CD-830F-965D07CE1446}
103103
EndProjectSection
104104
EndProject
105+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Crypto", "src\ProtonVPN.Crypto\ProtonVPN.Crypto.csproj", "{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}"
106+
EndProject
107+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Crypto.Test", "test\ProtonVPN.Crypto.Test\ProtonVPN.Crypto.Test.csproj", "{7D608265-3330-4747-B5B4-9673A119FE6C}"
108+
EndProject
109+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.WireGuardService", "src\ProtonVPN.WireguardService\ProtonVPN.WireGuardService.csproj", "{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}"
110+
EndProject
105111
Global
106112
GlobalSection(SolutionConfigurationPlatforms) = preSolution
107113
Debug|Any CPU = Debug|Any CPU
@@ -492,6 +498,42 @@ Global
492498
{8D07769D-0AAE-4224-AECB-DF68567F6B00}.Release|x64.Build.0 = Release|Any CPU
493499
{8D07769D-0AAE-4224-AECB-DF68567F6B00}.Release|x86.ActiveCfg = Release|Any CPU
494500
{8D07769D-0AAE-4224-AECB-DF68567F6B00}.Release|x86.Build.0 = Release|Any CPU
501+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
502+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
503+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Debug|x64.ActiveCfg = Debug|Any CPU
504+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Debug|x64.Build.0 = Debug|Any CPU
505+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Debug|x86.ActiveCfg = Debug|Any CPU
506+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Debug|x86.Build.0 = Debug|Any CPU
507+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
508+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Release|Any CPU.Build.0 = Release|Any CPU
509+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Release|x64.ActiveCfg = Release|Any CPU
510+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Release|x64.Build.0 = Release|Any CPU
511+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Release|x86.ActiveCfg = Release|Any CPU
512+
{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}.Release|x86.Build.0 = Release|Any CPU
513+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
514+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
515+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Debug|x64.ActiveCfg = Debug|Any CPU
516+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Debug|x64.Build.0 = Debug|Any CPU
517+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Debug|x86.ActiveCfg = Debug|Any CPU
518+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Debug|x86.Build.0 = Debug|Any CPU
519+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
520+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Release|Any CPU.Build.0 = Release|Any CPU
521+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Release|x64.ActiveCfg = Release|Any CPU
522+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Release|x64.Build.0 = Release|Any CPU
523+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Release|x86.ActiveCfg = Release|Any CPU
524+
{7D608265-3330-4747-B5B4-9673A119FE6C}.Release|x86.Build.0 = Release|Any CPU
525+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
526+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Debug|Any CPU.Build.0 = Debug|Any CPU
527+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Debug|x64.ActiveCfg = Debug|Any CPU
528+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Debug|x64.Build.0 = Debug|Any CPU
529+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Debug|x86.ActiveCfg = Debug|Any CPU
530+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Debug|x86.Build.0 = Debug|Any CPU
531+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Release|Any CPU.ActiveCfg = Release|Any CPU
532+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Release|Any CPU.Build.0 = Release|Any CPU
533+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Release|x64.ActiveCfg = Release|Any CPU
534+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Release|x64.Build.0 = Release|Any CPU
535+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Release|x86.ActiveCfg = Release|Any CPU
536+
{A0A9C7B9-4A33-492E-BA54-8E8E600D3D66}.Release|x86.Build.0 = Release|Any CPU
495537
EndGlobalSection
496538
GlobalSection(SolutionProperties) = preSolution
497539
HideSolutionNode = FALSE
@@ -508,6 +550,7 @@ Global
508550
{C4E97B08-345A-423B-BD4C-76593D1401B6} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
509551
{4237AD33-596A-4B35-826A-B4E71461820F} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
510552
{F059E362-20A2-472B-82CA-E727D31AC0C7} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
553+
{7D608265-3330-4747-B5B4-9673A119FE6C} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
511554
EndGlobalSection
512555
GlobalSection(ExtensibilityGlobals) = postSolution
513556
SolutionGuid = {5CFD3EA5-ADCA-48F0-9E3F-BBC76CCBF1C2}

‎ProtonVpn.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<s:Boolean x:Key="/Default/UserDictionary/Words/=Templated/@EntryIndexedValue">True</s:Boolean>
1717
<s:Boolean x:Key="/Default/UserDictionary/Words/=Upsell/@EntryIndexedValue">True</s:Boolean>
1818
<s:Boolean x:Key="/Default/UserDictionary/Words/=Validatable/@EntryIndexedValue">True</s:Boolean>
19+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Wireguard/@EntryIndexedValue">True</s:Boolean>
1920
<s:Boolean x:Key="/Default/UserDictionary/Words/=Wlan/@EntryIndexedValue">True</s:Boolean>
2021
</wpf:ResourceDictionary>

0 commit comments

Comments
 (0)