Skip to content

Commit f360f74

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/2.1.1'
2 parents 4e4b0ea + 4e7f97c commit f360f74

File tree

619 files changed

+17688
-9710
lines changed

Some content is hidden

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

619 files changed

+17688
-9710
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ csharp_new_line_before_open_brace=all
3838
csharp_new_line_between_query_expression_clauses=true
3939

4040
# http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers#csharp_prefer_braces
41-
csharp_prefer_braces = true:error
41+
csharp_prefer_braces=true:error
4242

4343
# http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers#csharp_prefer_simple_default_expression
4444
csharp_prefer_simple_default_expression=false:error
4545

4646
# IDE0063: Use simple 'using' statement
47-
csharp_prefer_simple_using_statement = false
47+
csharp_prefer_simple_using_statement=false
4848

4949
# http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers#csharp_preserve_single_line_blocks
5050
csharp_preserve_single_line_blocks=true
@@ -131,7 +131,7 @@ csharp_style_expression_bodied_constructors=false:warning
131131
csharp_style_expression_bodied_indexers=true:error
132132

133133
# http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers#csharp_style_expression_bodied_methods
134-
csharp_style_expression_bodied_methods=true
134+
csharp_style_expression_bodied_methods=false:warning
135135

136136
# http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers#csharp_style_expression_bodied_operators
137137
csharp_style_expression_bodied_operators=false:suggestion
@@ -263,4 +263,4 @@ dotnet_naming_style.pascal_case_style.capitalization=pascal_case
263263
resharper_arrange_this_qualifier_highlighting=hint
264264

265265
# IDE1006: Naming Styles
266-
dotnet_diagnostic.IDE1006.severity = warning
266+
dotnet_diagnostic.ide1006.severity=warning

‎.gitlab-ci.yml‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ build-release:
3939
- echo "Restoring NuGet Packages..."
4040
- 'c:\nuget\nuget.exe restore ProtonVpn.sln'
4141
- MSBuild.exe /consoleloggerparameters:ErrorsOnly /maxcpucount /nologo /property:Configuration=Release /verbosity:quiet "src\\ProtonVPN.MarkupValidator\\ProtonVPN.MarkupValidator.csproj"
42+
- echo "Building native dependencies..."
43+
- 'c:\nuget\nuget.exe restore ProtonVPN.InstallActions.sln'
44+
- cmd.exe /c BuildDependencies.bat
4245
- python ci\main.py lint-languages
4346
- python ci\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
4447
- python ci\main.py defaultConfig
@@ -62,6 +65,9 @@ build-debug:
6265
- echo "Restoring NuGet Packages..."
6366
- 'c:\nuget\nuget.exe restore ProtonVpn.sln'
6467
- MSBuild.exe /consoleloggerparameters:ErrorsOnly /maxcpucount /nologo /property:Configuration=Release /verbosity:quiet "src\\ProtonVPN.MarkupValidator\\ProtonVPN.MarkupValidator.csproj"
68+
- echo "Building native dependencies..."
69+
- 'c:\nuget\nuget.exe restore ProtonVPN.InstallActions.sln'
70+
- cmd.exe /c BuildDependencies.bat
6571
- echo "Downloading translations from crowdin..."
6672
- python ci\main.py lint-languages
6773
- python ci\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
@@ -86,7 +92,7 @@ tests:
8692
- echo "Running tests..."
8793
- 'c:\nuget\nuget.exe restore ProtonVpn.sln'
8894
- MSBuild.exe /consoleloggerparameters:ErrorsOnly /maxcpucount /nologo /property:Configuration=Debug /verbosity:quiet "ProtonVpn.sln"
89-
- 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]*"
95+
- coverlet src\bin --target "vstest.console.exe" --targetargs "src/bin/ProtonVPN*Tests*.dll /TestCaseFilter:TestCategory!=UI&TestCategory!=Connection /Platform:x64" --format cobertura --output .\coverage-reports --exclude "[*.Tests*]*" --exclude "[ProtonVPN.MarkupValidator]*" --exclude "[TestTools*]*" --exclude "[TapInstaller]*" --exclude "[*.Installers]*"
9096
- powershell -Command "(gc coverage-reports.cobertura.xml) -replace '\\', '/' | Out-File -encoding UTF8 cobertura.xml"
9197
- ReportGenerator.exe "-reports:cobertura.xml" "-targetdir:.\code-coverage-report-html"
9298
artifacts:
@@ -150,7 +156,7 @@ ui-test:
150156
script:
151157
- powershell -File ci\uninstall-app.ps1
152158
- powershell -File ci\install-the-app.ps1
153-
- VSTest.Console.exe src\bin\ProtonVPN.UI.Test.dll /TestCaseFilter:"Category=UI"
159+
- VSTest.Console.exe src\bin\ProtonVPN.UI.Tests.dll /TestCaseFilter:"Category=UI"
154160
- powershell -File ci\uninstall-app.ps1
155161
except:
156162
- /^debug.*$/
@@ -169,7 +175,27 @@ connection-tests:
169175
script:
170176
- powershell -File ci\uninstall-app.ps1
171177
- powershell -File ci\install-the-app.ps1
172-
- VSTest.Console.exe src\bin\ProtonVPN.UI.Test.dll /TestCaseFilter:"Category=Connection"
178+
- VSTest.Console.exe src\bin\ProtonVPN.UI.Tests.dll /TestCaseFilter:"Category=Connection"
179+
- powershell -File ci\uninstall-app.ps1
180+
except:
181+
- /^debug.*$/
182+
- release/9.9.9
183+
- master
184+
artifacts:
185+
when: on_failure
186+
paths:
187+
- $SCREENSHOT_PATH
188+
expire_in: 2 weeks
189+
190+
win-11-tests:
191+
stage: ui-test
192+
when: manual
193+
tags:
194+
- win11
195+
script:
196+
- powershell -File ci\uninstall-app.ps1
197+
- powershell -File ci\install-the-app.ps1
198+
- VSTest.Console.exe src\bin\ProtonVPN.UI.Tests.dll /TestCaseFilter:"Category=Smoke"
173199
- powershell -File ci\uninstall-app.ps1
174200
except:
175201
- /^debug.*$/

‎BuildDependencies.bat‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
set outputDirX86=..\bin\x86\
2+
set outputDirX64=..\bin\x64\
3+
set platformToolset=v143
4+
5+
::ProtonVPN.IpFilter.dll (x86)
6+
msbuild src\ProtonVPN.IpFilterLib\ProtonVPN.IpFilterLib.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=Win32 /p:Configuration=Release /p:OutDir=%outputDirX86%
7+
msbuild src\ProtonVPN.IpFilter\ProtonVPN.IpFilter.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=Win32 /p:Configuration=Release /p:OutDir=%outputDirX86%
8+
9+
::ProtonVPN.IpFilter.dll (x64)
10+
msbuild src\ProtonVPN.IpFilterLib\ProtonVPN.IpFilterLib.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=x64 /p:Configuration=Release /p:OutDir=%outputDirX64%
11+
msbuild src\ProtonVPN.IpFilter\ProtonVPN.IpFilter.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=x64 /p:Configuration=Release /p:OutDir=%outputDirX64%
12+
13+
::ProtonVPN.NetworkUtil.dll (x86)
14+
msbuild src\ProtonVPN.NetworkUtil\ProtonVPN.NetworkUtil.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=Win32 /p:Configuration=Release /p:OutDir=%outputDirX86%
15+
16+
::ProtonVPN.NetworkUtil.dll (x64)
17+
msbuild src\ProtonVPN.NetworkUtil\ProtonVPN.NetworkUtil.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=x64 /p:Configuration=Release /p:OutDir=%outputDirX64%
18+
19+
::ProtonVPN.InstallActions.dll (x86)
20+
msbuild src\ProtonVPN.InstallActions\ProtonVPN.InstallActions.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=Win32 /p:Configuration=Release
21+
22+
::GoSrp.dll
23+
pushd %~dp0\src\srp\windows\cshared
24+
set fn=GoSrp
25+
set gn=main.go
26+
set CGO_ENABLED=1
27+
28+
set GOARCH=386
29+
go build -buildmode=c-shared -v -ldflags="-s -w" -o ..\..\..\bin\x86\%fn%.dll %gn%
30+
31+
set GOARCH=amd64
32+
go build -buildmode=c-shared -v -ldflags="-s -w" -o ..\..\..\bin\x64\%fn%.dll %gn%
33+
34+
::LocalAgent.dll
35+
pushd %~dp0\src\ProtonVPN.LocalAgent\localAgentWin
36+
set GOOS=windows
37+
set GO111MODULE=off
38+
set CGO_CFLAGS=-O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601
39+
set CC=x86_64-w64-mingw32-gcc
40+
41+
set GOARCH=386
42+
go build -buildmode c-shared -ldflags="-w -s" -trimpath -v -o "..\..\bin\Resources\32-bit\LocalAgent.dll" || exit /b 1
43+
44+
set GOARCH=amd64
45+
go build -buildmode c-shared -ldflags="-w -s" -trimpath -v -o "..\..\bin\Resources\64-bit\LocalAgent.dll" || exit /b 1

‎ProtonVPN.InstallActions.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31911.196
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtonVPN.InstallActions", "src\ProtonVPN.InstallActions\ProtonVPN.InstallActions.vcxproj", "{BBCBB464-BDCB-49CD-830F-965D07CE1446}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x86 = Debug|x86
11+
Release|x86 = Release|x86
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{BBCBB464-BDCB-49CD-830F-965D07CE1446}.Debug|x86.ActiveCfg = Debug|Win32
15+
{BBCBB464-BDCB-49CD-830F-965D07CE1446}.Debug|x86.Build.0 = Debug|Win32
16+
{BBCBB464-BDCB-49CD-830F-965D07CE1446}.Release|x86.ActiveCfg = Release|Win32
17+
{BBCBB464-BDCB-49CD-830F-965D07CE1446}.Release|x86.Build.0 = Release|Win32
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {41A36481-10DA-4E55-9DD7-15950838C9CD}
24+
EndGlobalSection
25+
EndGlobal

‎ProtonVPN.NetworkDrivers.sln‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31911.196
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtonVPN.CalloutDriver", "src\ProtonVPN.CalloutDriver\ProtonVPN.CalloutDriver.vcxproj", "{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Debug|x86 = Debug|x86
12+
Release|x64 = Release|x64
13+
Release|x86 = Release|x86
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Debug|x64.ActiveCfg = Debug|x64
17+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Debug|x64.Build.0 = Debug|x64
18+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Debug|x86.ActiveCfg = Debug|Win32
19+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Debug|x86.Build.0 = Debug|Win32
20+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Release|x64.ActiveCfg = Release|x64
21+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Release|x64.Build.0 = Release|x64
22+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Release|x86.ActiveCfg = Release|Win32
23+
{85E3F2D0-84AA-4DD2-B23A-B41D779A5FA9}.Release|x86.Build.0 = Release|Win32
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {D4840175-D6ED-49DB-BD16-67DF919A17B4}
30+
EndGlobalSection
31+
EndGlobal

‎ProtonVPN.Networking.sln‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31911.196
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtonVPN.IPFilter", "src\ProtonVPN.IPFilter\ProtonVPN.IpFilter.vcxproj", "{75126704-A03B-4AA2-B182-189263397E8F}"
7+
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtonVPN.IpFilterLib", "src\ProtonVPN.IpFilterLib\ProtonVPN.IpFilterLib.vcxproj", "{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}"
9+
EndProject
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtonVPN.NetworkUtil", "src\ProtonVPN.NetworkUtil\ProtonVPN.NetworkUtil.vcxproj", "{912374C4-7A74-4313-8956-1B32383918C8}"
11+
EndProject
12+
Global
13+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14+
Debug|x64 = Debug|x64
15+
Debug|x86 = Debug|x86
16+
Release|x64 = Release|x64
17+
Release|x86 = Release|x86
18+
EndGlobalSection
19+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{75126704-A03B-4AA2-B182-189263397E8F}.Debug|x64.ActiveCfg = Debug|x64
21+
{75126704-A03B-4AA2-B182-189263397E8F}.Debug|x64.Build.0 = Debug|x64
22+
{75126704-A03B-4AA2-B182-189263397E8F}.Debug|x86.ActiveCfg = Debug|Win32
23+
{75126704-A03B-4AA2-B182-189263397E8F}.Debug|x86.Build.0 = Debug|Win32
24+
{75126704-A03B-4AA2-B182-189263397E8F}.Release|x64.ActiveCfg = Release|x64
25+
{75126704-A03B-4AA2-B182-189263397E8F}.Release|x64.Build.0 = Release|x64
26+
{75126704-A03B-4AA2-B182-189263397E8F}.Release|x86.ActiveCfg = Release|Win32
27+
{75126704-A03B-4AA2-B182-189263397E8F}.Release|x86.Build.0 = Release|Win32
28+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Debug|x64.ActiveCfg = Debug|x64
29+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Debug|x64.Build.0 = Debug|x64
30+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Debug|x86.ActiveCfg = Debug|Win32
31+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Debug|x86.Build.0 = Debug|Win32
32+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Release|x64.ActiveCfg = Release|x64
33+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Release|x64.Build.0 = Release|x64
34+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Release|x86.ActiveCfg = Release|Win32
35+
{22381B63-9BA0-4DF8-BDB1-EC4AE1B7470D}.Release|x86.Build.0 = Release|Win32
36+
{912374C4-7A74-4313-8956-1B32383918C8}.Debug|x64.ActiveCfg = Debug|x64
37+
{912374C4-7A74-4313-8956-1B32383918C8}.Debug|x64.Build.0 = Debug|x64
38+
{912374C4-7A74-4313-8956-1B32383918C8}.Debug|x86.ActiveCfg = Debug|Win32
39+
{912374C4-7A74-4313-8956-1B32383918C8}.Debug|x86.Build.0 = Debug|Win32
40+
{912374C4-7A74-4313-8956-1B32383918C8}.Release|x64.ActiveCfg = Release|x64
41+
{912374C4-7A74-4313-8956-1B32383918C8}.Release|x64.Build.0 = Release|x64
42+
{912374C4-7A74-4313-8956-1B32383918C8}.Release|x86.ActiveCfg = Release|Win32
43+
{912374C4-7A74-4313-8956-1B32383918C8}.Release|x86.Build.0 = Release|Win32
44+
EndGlobalSection
45+
GlobalSection(SolutionProperties) = preSolution
46+
HideSolutionNode = FALSE
47+
EndGlobalSection
48+
GlobalSection(ExtensibilityGlobals) = postSolution
49+
SolutionGuid = {0E2C8B72-A8BC-4E78-95A9-FF72D0A876C3}
50+
EndGlobalSection
51+
EndGlobal

0 commit comments

Comments
 (0)