Skip to content

Commit 1e57195

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/3.2.12'
2 parents 1647b8a + 66601a0 commit 1e57195

File tree

78 files changed

+3934
-655
lines changed

Some content is hidden

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

78 files changed

+3934
-655
lines changed

‎.gitlab-ci-templates.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,19 @@
2525
- echo "Building native dependencies..."
2626
- nuget restore ProtonVPN.InstallActions.sln
2727
- cmd.exe /c BuildDependencies.bat $DEPENDENCIES
28-
- echo "Downloading translations from crowdin..."
2928
- python ci\build-scripts\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
3029
- python ci\build-scripts\main.py defaultConfig
3130
- dotnet build src\Builds\ProtonVPN.Builds.ConsoleJob\ProtonVPN.Builds.ConsoleJob.csproj
3231
- echo "Injecting CI variables"
3332
- src\bin\ProtonVPN.Builds.ConsoleJob.exe
3433
- echo "Publishing ${TYPE}..."
35-
- dotnet publish ProtonVpn.sln -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
34+
- dotnet publish src/ProtonVPN.App/ProtonVPN.App.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
35+
- dotnet publish src/ProtonVPN.Service/ProtonVPN.Service.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
36+
- dotnet publish src/ProtonVPN.WireguardService/ProtonVPN.WireguardService.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
37+
- dotnet publish src/ProtonVPN.TlsVerify/ProtonVPN.TlsVerify.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
38+
- dotnet publish src/ProtonVPN.Launcher/ProtonVPN.Launcher.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
39+
- dotnet publish src/ProtonVPN.RestoreInternet/ProtonVPN.RestoreInternet.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
40+
- dotnet publish src/ProtonDrive.Downloader/ProtonDrive.Downloader.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
3641
- msbuild src\ProtonVPN.NativeHost\NativeHost.vcxproj /p:Configuration=Release /p:Platform=x64
3742
artifacts:
3843
expire_in: 1 day

‎ProtonVpn.sln‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Native", "src\Pro
5353
EndProject
5454
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.NetworkFilter", "src\ProtonVPN.NetworkFilter\ProtonVPN.NetworkFilter.csproj", "{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}"
5555
EndProject
56-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.MarkupValidator", "src\ProtonVPN.MarkupValidator\ProtonVPN.MarkupValidator.csproj", "{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}"
57-
EndProject
5856
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.TlsVerify", "src\ProtonVPN.TlsVerify\ProtonVPN.TlsVerify.csproj", "{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}"
5957
EndProject
6058
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Translations", "src\ProtonVPN.Translations\ProtonVPN.Translations.csproj", "{2A00C747-8BC0-4EF1-A53E-37A7E156D910}"
6159
EndProject
62-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.RestoreInternet", "ProtonVPN.RestoreInternet\ProtonVPN.RestoreInternet.csproj", "{8D07769D-0AAE-4224-AECB-DF68567F6B00}"
60+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.RestoreInternet", "src\ProtonVPN.RestoreInternet\ProtonVPN.RestoreInternet.csproj", "{8D07769D-0AAE-4224-AECB-DF68567F6B00}"
6361
EndProject
6462
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Crypto", "src\ProtonVPN.Crypto\ProtonVPN.Crypto.csproj", "{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}"
6563
EndProject
@@ -411,18 +409,6 @@ Global
411409
{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x64.Build.0 = Release|Any CPU
412410
{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x86.ActiveCfg = Release|Any CPU
413411
{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x86.Build.0 = Release|Any CPU
414-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
415-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
416-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x64.ActiveCfg = Debug|Any CPU
417-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x64.Build.0 = Debug|Any CPU
418-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x86.ActiveCfg = Debug|Any CPU
419-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x86.Build.0 = Debug|Any CPU
420-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
421-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|Any CPU.Build.0 = Release|Any CPU
422-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x64.ActiveCfg = Release|Any CPU
423-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x64.Build.0 = Release|Any CPU
424-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x86.ActiveCfg = Release|Any CPU
425-
{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x86.Build.0 = Release|Any CPU
426412
{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
427413
{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
428414
{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}.Debug|x64.ActiveCfg = Debug|Any CPU

‎Setup/CodeDependencies.iss‎

Lines changed: 0 additions & 209 deletions
This file was deleted.

‎Setup/Dependencies/MicrosoftEdgeWebview2Setup.exe‎

1.55 MB
Binary file not shown.

‎Setup/SplitTunnel/ProtonVPN.CalloutDriver.sys‎

3.51 KB
Binary file not shown.

‎Setup/Strings/BrazilianPortuguese.isl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[CustomMessages]
2-
InstallProtonDriveTitle=Instale Proton Drive — Armazenamento de nuvem criptografado (Gratuito com Proton VPN)
2+
InstallProtonDriveTitle=Instale Proton Drive — Armazenamento de nuvem criptografado (Gratuito com Proton VPN)
3+
InstallingWebview2Runtime=Installing Web View 2 runtime...

‎Setup/Strings/Czech.isl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[CustomMessages]
2-
InstallProtonDriveTitle=Nainstalujte si Proton Drive - Šifrované cloudové úložiště (zdarma s Proton VPN)
2+
InstallProtonDriveTitle=Nainstalujte si Proton Drive - Šifrované cloudové úložiště (zdarma s Proton VPN)
3+
InstallingWebview2Runtime=Installing Web View 2 runtime...

‎Setup/Strings/Default.isl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[CustomMessages]
2-
InstallProtonDriveTitle=Install Proton Drive - Encrypted cloud storage (Free with Proton VPN)
2+
InstallProtonDriveTitle=Install Proton Drive - Encrypted cloud storage (Free with Proton VPN)
3+
InstallingWebview2Runtime=Installing Web View 2 runtime...

‎Setup/Strings/Dutch.isl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[CustomMessages]
2-
InstallProtonDriveTitle=Installeer Proton Drive - Versleutelde cloudopslag (Gratis met Proton VPN)
2+
InstallProtonDriveTitle=Installeer Proton Drive - Versleutelde cloudopslag (Gratis met Proton VPN)
3+
InstallingWebview2Runtime=Installing Web View 2 runtime...

‎Setup/Strings/Finnish.isl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[CustomMessages]
2-
InstallProtonDriveTitle=Asenna Proton Drive - Salattu pilvitallennus (ilmainen Proton VPN:n kanssa)
2+
InstallProtonDriveTitle=Asenna Proton Drive - Salattu pilvitallennus (ilmainen Proton VPN:n kanssa)
3+
InstallingWebview2Runtime=Installing Web View 2 runtime...

0 commit comments

Comments
 (0)