Merge branch 'release/3.2.4'

Author: Mindaugas Veblauskas

.gitlab-ci-templates.yml

@@ -44,13 +44,6 @@
     GIT_SUBMODULE_STRATEGY: normal
 
 .build-installer:
-  stage: build-installer
-  tags:
-    - windows
   script:
     - python ci\build-scripts\main.py update-gh-list
-    - python ci\build-scripts\main.py app-installer $env:CI_COMMIT_SHORT_SHA
-  artifacts:
-    paths:
-      - Setup/Installers/
-    expire_in: 4 weeks
+    - python ci\build-scripts\main.py app-installer $env:CI_COMMIT_SHORT_SHA

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
     file: '/jobs/sync-crowdin.gitlab-ci.yml'
 
   - project: 'ProtonVPN/qa/test-configuration'
-    ref: develop
+    ref: master
     file: '/windows-config.yml'
 
   - local: '/.gitlab-ci-templates.yml'
@@ -58,19 +58,6 @@ build-debug:
     TYPE: Debug
     DEPENDENCIES: publish
     BUILD_PATH: src/bin/win-x64/publish
-    
-build-bti:
-  extends: 
-    - .build-script
-    - .build-bti-vars
-  when: manual
-  except:
-    - master
-    - /^release.*$/
-  variables:
-    TYPE: Debug
-    DEPENDENCIES: publish-BTI
-    BUILD_PATH: src/bin/win-x64/BTI/publish
 
 ui-test:
   extends: .test_execution_script
@@ -109,22 +96,44 @@ tests:
   coverage: '/Total.*?([0-9]{1,3}.[0-9]{1,3})%/'
 
 build-installer:
+  stage: build-installer
+  tags:
+    - windows
   dependencies:
     - build-debug
     - build-release
   extends: 
     - .build-installer
   variables:
     BUILD_PATH: src/bin/win-x64/publish
+  artifacts:
+    paths:
+      - Setup/Installers/
+    expire_in: 4 weeks
 
 build-BTI-installer:
-  dependencies:
-    - build-bti
+  stage: build-installer
   when: manual
+  dependencies: []
+  tags:
+    - windows
   extends: 
-    - .build-installer
+    - .build-bti-vars
+  except:
+    - master
+    - /^release.*$/
+  script:
+    - !reference [.build-script, script]
+    - !reference [.build-installer, script]
   variables:
+    TYPE: Debug
+    DEPENDENCIES: publish-BTI
     BUILD_PATH: src/bin/win-x64/BTI/publish
+    GIT_SUBMODULE_STRATEGY: normal
+  artifacts:
+    paths:
+      - Setup/Installers/
+    expire_in: 1 weeks
 
 prepare-internal-beta-release:
   stage: internal-beta
@@ -176,7 +185,9 @@ i18n-commit-translations:
     - git config --global core.autocrlf false
 
 create-release:
-  image: debian:stable-slim
+  image: harbor.protontech.ch/docker.io/library/python:latest
+  tags:
+    - shared-small
   stage: release
   when: manual
   only:

ProtonVpn.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.App", "src\ProtonVPN.App\ProtonVPN.App.csproj", "{0CDCA012-BB2D-49B3-944E-CE80D75D651A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Service", "src\ProtonVPN.Service\ProtonVPN.Service.csproj", "{25781B52-5858-4387-80A5-C9C38C32B3CC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA44B51D-7645-413A-818F-2C5B57DB67DD} = {CA44B51D-7645-413A-818F-2C5B57DB67DD}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.App", "src\ProtonVPN.App\ProtonVPN.App.csproj", "{0CDCA012-BB2D-49B3-944E-CE80D75D651A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Core", "src\ProtonVPN.Core\ProtonVPN.Core.csproj", "{CA44B51D-7645-413A-818F-2C5B57DB67DD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A592E157-F76B-49CE-A5A4-EF130CDD757F}"
@@ -183,13 +183,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Logging.Installer
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Logging.Tests", "src\Logging\ProtonVPN.Logging.Tests\ProtonVPN.Logging.Tests.csproj", "{433F53CA-E2E3-4CE1-A342-4A358D1999FC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonDrive.Downloader", "src\ProtonDrive.Downloader\ProtonDrive.Downloader.csproj", "{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StatisticalEvents", "StatisticalEvents", "{4B1EF657-A679-43B5-83DD-612D602C6333}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.StatisticalEvents", "src\StatisticalEvents\ProtonVPN.StatisticalEvents\ProtonVPN.StatisticalEvents.csproj", "{C8B78B43-EFEE-41CF-8BE9-1EA84AA18BF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.StatisticalEvents", "src\StatisticalEvents\ProtonVPN.StatisticalEvents\ProtonVPN.StatisticalEvents.csproj", "{C8B78B43-EFEE-41CF-8BE9-1EA84AA18BF9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.StatisticalEvents.Contracts", "src\StatisticalEvents\ProtonVPN.StatisticalEvents.Contracts\ProtonVPN.StatisticalEvents.Contracts.csproj", "{669BF256-765D-4BF1-9278-68EF33F86FFB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.StatisticalEvents.Contracts", "src\StatisticalEvents\ProtonVPN.StatisticalEvents.Contracts\ProtonVPN.StatisticalEvents.Contracts.csproj", "{669BF256-765D-4BF1-9278-68EF33F86FFB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.StatisticalEvents.Installers", "src\StatisticalEvents\ProtonVPN.StatisticalEvents.Installers\ProtonVPN.StatisticalEvents.Installers.csproj", "{CEE9045E-0299-4488-80FF-0162D099C544}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.StatisticalEvents.Installers", "src\StatisticalEvents\ProtonVPN.StatisticalEvents.Installers\ProtonVPN.StatisticalEvents.Installers.csproj", "{CEE9045E-0299-4488-80FF-0162D099C544}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1041,6 +1043,18 @@ Global
 		{433F53CA-E2E3-4CE1-A342-4A358D1999FC}.Release|x64.Build.0 = Release|Any CPU
 		{433F53CA-E2E3-4CE1-A342-4A358D1999FC}.Release|x86.ActiveCfg = Release|Any CPU
 		{433F53CA-E2E3-4CE1-A342-4A358D1999FC}.Release|x86.Build.0 = Release|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Release|x64.Build.0 = Release|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4908758-811B-4D99-AEE7-3D9F3BC2E3C5}.Release|x86.Build.0 = Release|Any CPU
 		{C8B78B43-EFEE-41CF-8BE9-1EA84AA18BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8B78B43-EFEE-41CF-8BE9-1EA84AA18BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8B78B43-EFEE-41CF-8BE9-1EA84AA18BF9}.Debug|x64.ActiveCfg = Debug|Any CPU

Setup/Strings/BrazilianPortuguese.isl

@@ -0,0 +1,2 @@
+[CustomMessages]
+InstallProtonDriveTitle=Instale Proton Drive — Armazenamento de nuvem criptografado (Gratuito com Proton VPN)

Setup/Strings/Czech.isl

@@ -0,0 +1,2 @@
+[CustomMessages]
+InstallProtonDriveTitle=Nainstalujte si Proton Drive - Šifrované cloudové úložiště (zdarma s Proton VPN)

Setup/Strings/Default.isl

@@ -0,0 +1,2 @@
+[CustomMessages]
+InstallProtonDriveTitle=Install Proton Drive - Encrypted cloud storage (Free with Proton VPN)

Setup/Strings/Dutch.isl

@@ -0,0 +1,2 @@
+[CustomMessages]
+InstallProtonDriveTitle=Installeer Proton Drive - Versleutelde cloudopslag (Gratis met Proton VPN)

Setup/Strings/French.isl

@@ -0,0 +1,2 @@
+[CustomMessages]
+InstallProtonDriveTitle=Installez Proton Drive : un espace de stockage chiffré dans le cloud (gratuit avec Proton VPN)

Setup/Strings/German.isl

@@ -0,0 +1,2 @@
+[CustomMessages]
+InstallProtonDriveTitle=Proton Drive installieren - Verschlüsselter Cloud-Speicher (kostenlos mit Proton VPN)

Setup/Strings/Italian.isl

@@ -0,0 +1,2 @@
+[CustomMessages]
+InstallProtonDriveTitle=Installa Proton Drive - Archiviazione su cloud crittografata (Gratuita con Proton VPN)