Merge branch 'release/2.0.5'

ProtonVPN · Aug 8, 2022 · fb346c9 · fb346c9
2 parents d286e42 + 541a38c
commit fb346c9
Show file tree

Hide file tree

Showing 457 changed files with 9,069 additions and 5,742 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -38,7 +38,7 @@ csharp_new_line_before_open_brace=all
 csharp_new_line_between_query_expression_clauses=true
 
 # http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers#csharp_prefer_braces
-# csharp_prefer_braces = true:error
+csharp_prefer_braces = true:error
 
 # http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers#csharp_prefer_simple_default_expression
 csharp_prefer_simple_default_expression=false:error
@@ -252,9 +252,9 @@ dotnet_naming_rule.members_are_pascal_case.symbols=member_symbol
 dotnet_naming_rule.members_are_pascal_case.style=member_style
 
 # Constant Fields Should Be PascalCase
-dotnet_naming_rule.constant_fields_should_be_pascal_case.severity=warning
-dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols=constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style=pascal_case_style
+dotnet_naming_rule.constant_fields_should_be_upper_case.severity=warning
+dotnet_naming_rule.constant_fields_should_be_upper_case.symbols=constant_fields
+dotnet_naming_rule.constant_fields_should_be_upper_case.style=pascal_case_style
 dotnet_naming_symbols.constant_fields.applicable_kinds=field
 dotnet_naming_symbols.constant_fields.required_modifiers=const
 dotnet_naming_style.pascal_case_style.capitalization=pascal_case

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,6 +25,10 @@ sign:
     expire_in: 1 day
     paths:
       - src/bin/
+  only:
+    - master
+    - /^release.*$/
+    - develop
 
 build-release:
   stage: build
@@ -82,7 +86,16 @@ tests:
     - windows
   script:
     - echo "Running tests..."
-    - python ci\main.py tests src\bin\
+    - 'c:\nuget\nuget.exe restore ProtonVpn.sln'
+    - MSBuild.exe /consoleloggerparameters:ErrorsOnly /maxcpucount /nologo /property:Configuration=Debug /verbosity:quiet "ProtonVpn.sln"
+    - coverlet src\bin --target "vstest.console.exe" --targetargs "src/bin/ProtonVPN*Test*.dll /TestCaseFilter:TestCategory!=UI&TestCategory!=Connection /Platform:x64" --format cobertura --output .\coverage-reports --exclude "[*.Test*]*" --exclude "[ProtonVPN.MarkupValidator]*" --exclude "[TestTools*]*" --exclude "[TapInstaller]*" --exclude "[*.Installers]*"
+    - powershell -Command "(gc coverage-reports.cobertura.xml) -replace '\\', '/' | Out-File -encoding UTF8 cobertura.xml"
+    - ReportGenerator.exe "-reports:cobertura.xml" "-targetdir:.\code-coverage-report-html"
+  artifacts:
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: cobertura.xml
 
 build-installer-for-release:
   stage: build-installer
@@ -135,25 +148,30 @@ ui-test:
   stage: ui-test
   tags:
     - ui_tests
-  when: manual
   script:
     - powershell -File ci\uninstall-app.ps1
     - powershell -Command "Start-Sleep -s 45"
     - powershell -File ci\launch-installer.ps1
     - powershell -Command "Start-Sleep -s 45"
     - VSTest.Console.exe src\bin\ProtonVPN.UI.Test.dll /TestCaseFilter:"Category=UI"
+  except:
+    - /^debug.*$/
+    - release/9.9.9
+    - master
 
 connection-tests:
   stage: ui-test
+  allow_failure: true
   tags:
     - connection_tests
-  when: manual
   script:
     - powershell -File ci\uninstall-app.ps1
-    - powershell -Command "Start-Sleep -s 45"
-    - powershell -File ci\launch-installer.ps1
-    - powershell -Command "Start-Sleep -s 45"
+    - powershell -File ci\install-the-app.ps1
     - VSTest.Console.exe src\bin\ProtonVPN.UI.Test.dll /TestCaseFilter:"Category=Connection"
+  except:
+    - /^debug.*$/
+    - release/9.9.9
+    - master
 
 update-vm:
   stage: ui-test
@@ -171,6 +189,10 @@ installation-test:
   when: manual
   script:
     - powershell -File ci\InstallerTestScripts\prepare-installer-tests.ps1
+  except:
+    - /^debug.*$/
+    - release/9.9.9
+    - master
 
 mirror:
   stage: mirror

diff --git a/ProtonVpn.sln b/ProtonVpn.sln
@@ -103,6 +103,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.WireGuardService"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.WireGuardDriver", "src\ProtonVPN.WireGuardDriver\ProtonVPN.WireGuardDriver.csproj", "{7882140D-32E1-4AB5-853D-F8DED5256DC2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Api", "src\ProtonVPN.Api\ProtonVPN.Api.csproj", "{3E905528-D87C-4552-A32D-66BF90D14DB0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Api.Contracts", "src\ProtonVPN.Api.Contracts\ProtonVPN.Api.Contracts.csproj", "{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{DCDB1771-1943-4459-8040-F001758E6E1E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Api.Installers", "src\ProtonVPN.Api.Installers\ProtonVPN.Api.Installers.csproj", "{686E902E-0C23-4396-8887-6D9219EF8D27}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.HumanVerification", "src\ProtonVPN.HumanVerification\ProtonVPN.HumanVerification.csproj", "{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HumanVerification", "HumanVerification", "{95E8A2C3-A9CF-4911-83AB-74498B7D1528}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.HumanVerification.Installers", "src\ProtonVPN.HumanVerification.Installers\ProtonVPN.HumanVerification.Installers.csproj", "{80A71107-9C8E-47B2-B743-58D5976B38FB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.HumanVerification.Contracts", "src\ProtonVPN.HumanVerification.Contracts\ProtonVPN.HumanVerification.Contracts.csproj", "{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Api.Tests", "src\ProtonVPN.Api.Tests\ProtonVPN.Api.Tests.csproj", "{168C5EC3-FF08-402F-8D70-F216CB04DE81}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.HumanVerification.Gui", "src\ProtonVPN.HumanVerification.Gui\ProtonVPN.HumanVerification.Gui.csproj", "{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.IntegrationTests", "test\ProtonVPN.IntegrationTests\ProtonVPN.IntegrationTests.csproj", "{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -505,6 +527,112 @@ Global
 		{7882140D-32E1-4AB5-853D-F8DED5256DC2}.Release|x64.Build.0 = Release|Any CPU
 		{7882140D-32E1-4AB5-853D-F8DED5256DC2}.Release|x86.ActiveCfg = Release|Any CPU
 		{7882140D-32E1-4AB5-853D-F8DED5256DC2}.Release|x86.Build.0 = Release|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Release|x64.Build.0 = Release|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E905528-D87C-4552-A32D-66BF90D14DB0}.Release|x86.Build.0 = Release|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Debug|x64.Build.0 = Debug|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Release|x64.ActiveCfg = Release|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Release|x64.Build.0 = Release|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB}.Release|x86.Build.0 = Release|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Debug|x64.Build.0 = Debug|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Debug|x86.Build.0 = Debug|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Release|x64.ActiveCfg = Release|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Release|x64.Build.0 = Release|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Release|x86.ActiveCfg = Release|Any CPU
+		{686E902E-0C23-4396-8887-6D9219EF8D27}.Release|x86.Build.0 = Release|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Debug|x64.Build.0 = Debug|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Release|x64.ActiveCfg = Release|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Release|x64.Build.0 = Release|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851}.Release|x86.Build.0 = Release|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Debug|x64.Build.0 = Debug|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Debug|x86.Build.0 = Debug|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Release|x64.ActiveCfg = Release|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Release|x64.Build.0 = Release|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Release|x86.ActiveCfg = Release|Any CPU
+		{80A71107-9C8E-47B2-B743-58D5976B38FB}.Release|x86.Build.0 = Release|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Debug|x64.Build.0 = Debug|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Debug|x86.Build.0 = Debug|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Release|x64.ActiveCfg = Release|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Release|x64.Build.0 = Release|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD}.Release|x86.Build.0 = Release|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Debug|x64.Build.0 = Debug|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Debug|x86.Build.0 = Debug|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Release|x64.ActiveCfg = Release|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Release|x64.Build.0 = Release|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Release|x86.ActiveCfg = Release|Any CPU
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81}.Release|x86.Build.0 = Release|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Debug|x64.Build.0 = Debug|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Debug|x86.Build.0 = Debug|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Release|x64.ActiveCfg = Release|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Release|x64.Build.0 = Release|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Release|x86.ActiveCfg = Release|Any CPU
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1}.Release|x86.Build.0 = Release|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Debug|x64.Build.0 = Debug|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Debug|x86.Build.0 = Debug|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|x64.ActiveCfg = Release|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|x64.Build.0 = Release|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|x86.ActiveCfg = Release|Any CPU
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -522,6 +650,15 @@ Global
 		{4237AD33-596A-4B35-826A-B4E71461820F} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
 		{F059E362-20A2-472B-82CA-E727D31AC0C7} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
 		{7D608265-3330-4747-B5B4-9673A119FE6C} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
+		{3E905528-D87C-4552-A32D-66BF90D14DB0} = {DCDB1771-1943-4459-8040-F001758E6E1E}
+		{9E4D6072-C8DE-475A-B9A7-4B6BF6EEEAEB} = {DCDB1771-1943-4459-8040-F001758E6E1E}
+		{686E902E-0C23-4396-8887-6D9219EF8D27} = {DCDB1771-1943-4459-8040-F001758E6E1E}
+		{8EE4A9C6-AA93-4A84-8EAB-4EC955DD6851} = {95E8A2C3-A9CF-4911-83AB-74498B7D1528}
+		{80A71107-9C8E-47B2-B743-58D5976B38FB} = {95E8A2C3-A9CF-4911-83AB-74498B7D1528}
+		{C0D6E7EC-29AF-4FC2-B8E0-1E5D083B55DD} = {95E8A2C3-A9CF-4911-83AB-74498B7D1528}
+		{168C5EC3-FF08-402F-8D70-F216CB04DE81} = {DCDB1771-1943-4459-8040-F001758E6E1E}
+		{7318548D-B8F2-4ED3-8B3E-F61DD8B552D1} = {95E8A2C3-A9CF-4911-83AB-74498B7D1528}
+		{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62} = {A592E157-F76B-49CE-A5A4-EF130CDD757F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5CFD3EA5-ADCA-48F0-9E3F-BBC76CCBF1C2}

diff --git a/ProtonVpn.sln.DotSettings b/ProtonVpn.sln.DotSettings
@@ -1,4 +1,15 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CA/@EntryIndexedValue">CA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UDP/@EntryIndexedValue">UDP</s:String>
@@ -21,6 +32,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Syncable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taskbar/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Templated/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unprocessable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Upsell/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Validatable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Wintun/@EntryIndexedValue">True</s:Boolean>