Merge branch 'release/3.2.1'

Author: Mindaugas Veblauskas

.gitlab-ci-templates.yml

@@ -28,17 +28,29 @@
   script:
     - echo "Building native dependencies..."
     - 'c:\nuget\nuget.exe restore ProtonVPN.InstallActions.sln'
-    - cmd.exe /c BuildDependencies.bat publish
+    - cmd.exe /c BuildDependencies.bat $DEPENDENCIES
     - echo "Downloading translations from crowdin..."
     - python ci\build-scripts\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
     - python ci\build-scripts\main.py defaultConfig
     - echo "Publishing ${TYPE}..."
-    - dotnet publish ProtonVpn.sln -c ${TYPE} -r win-x64 --self-contained
+    - dotnet publish ProtonVpn.sln -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
     - msbuild src\ProtonVPN.NativeHost\NativeHost.vcxproj /p:Configuration=Release /p:Platform=x64
   artifacts:
     expire_in: 1 day
     paths:
-      - src/bin/win-x64/publish
-      - src/ProtonVPN.NativeHost/bin
+      - $BUILD_PATH
+      - src/ProtonVPN.NativeHost/bin/
   variables:
-    GIT_SUBMODULE_STRATEGY: normal
+    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

.gitlab-ci.yml

@@ -7,6 +7,10 @@ include:
     ref: master
     file: '/jobs/sync-crowdin.gitlab-ci.yml'
 
+  - project: 'ProtonVPN/qa/test-configuration'
+    ref: develop
+    file: '/windows-config.yml'
+    
   - local: '/.gitlab-ci-templates.yml'
 
 variables:
@@ -42,6 +46,8 @@ build-release:
     - /^release.*$/
   variables:
     TYPE: Release
+    DEPENDENCIES: publish
+    BUILD_PATH: src/bin/win-x64/publish
 
 build-debug:
   extends: .build-script
@@ -50,6 +56,21 @@ build-debug:
     - /^release.*$/
   variables:
     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
@@ -88,17 +109,23 @@ tests:
   coverage: '/Total.*?([0-9]{1,3}.[0-9]{1,3})%/'
 
 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
-
+  dependencies:
+    - build-debug
+    - build-release
+  extends: 
+    - .build-installer
+  variables:
+    BUILD_PATH: src/bin/win-x64/publish
+    
+build-BTI-installer:
+  dependencies:
+    - build-bti
+  when: manual
+  extends: 
+    - .build-installer
+  variables:
+    BUILD_PATH: src/bin/win-x64/BTI/publish
+    
 prepare-internal-beta-release:
   stage: internal-beta
   tags:

BuildDependencies.bat

@@ -2,13 +2,18 @@
 
 set currentDir=%~dp0
 set publishDir=%currentDir%src\bin\win-x64\publish\
+set publishDirBTI=%currentDir%src\bin\win-x64\BTI\publish\
 set binDir=%currentDir%src\bin\
 set resourcesDir=%binDir%Resources
 
 if "%~1"=="publish" (
     set resourcesDir=%publishDir%Resources
 )
 
+if "%~1"=="publish-BTI" (
+	set resourcesDir=%publishDirBTI%Resources
+)
+
 set buildParams=/p:PlatformToolset=v143 /p:Configuration=Release /p:OutDir=%resourcesDir% /clp:ErrorsOnly
 set x86buildParams=%buildParams% /p:Platform=Win32
 set x64buildParams=%buildParams% /p:Platform=x64

Setup/setup.iss

@@ -16,6 +16,13 @@
 
 #define Hash ""
 #define VersionFolder "v" + MyAppVersion
+#define SourcePath GetEnv("BUILD_PATH")
+#define IsBTISource SourcePath == "src/bin/win-x64/BTI/publish"
+#if IsBTISource
+#define OutputBaseSuffix "_BTI"
+#else
+#define OutputBaseSuffix ""
+#endif
 
 #include "CodeDependencies.iss"
 
@@ -29,7 +36,7 @@ DisableProgramGroupPage=auto
 AppPublisher={#MyPublisher}
 UninstallDisplayIcon={app}\{#LauncherExeName}
 UninstallDisplayName={#MyAppName}
-OutputBaseFilename=ProtonVPN_{#VersionFolder}
+OutputBaseFilename=ProtonVPN_{#VersionFolder}{#OutputBaseSuffix}
 WizardStyle=modern
 Compression=lzma2
 SolidCompression=yes
@@ -56,42 +63,42 @@ Root: HKCR; Subkey: "ProtonVPN\shell\open\command"; ValueType: string; ValueName
 Source: "..\src\ProtonVPN.NativeHost\bin\ProtonVPN.exe"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
 Source: "..\src\ProtonVPN.NativeHost\bin\nethost.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
 
-Source: "..\src\bin\win-x64\publish\ProtonVPN.Launcher.exe"; DestDir: "{app}"; Flags: signonce;
-
-Source: "..\src\bin\win-x64\publish\ProtonVPNService.exe"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\ProtonVPNService.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\ProtonVPNService.deps.json"; DestDir: "{app}\{#VersionFolder}";
-Source: "..\src\bin\win-x64\publish\ProtonVPNService.runtimeconfig.json"; DestDir: "{app}\{#VersionFolder}"; AfterInstall: InstallService;
-
-Source: "..\src\bin\win-x64\publish\*.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\*.exe"; Excludes: "ProtonVPN.exe,ProtonVPN.Launcher.exe,ProtonVPNService.exe,createdump.exe"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\*.deps.json"; DestDir: "{app}\{#VersionFolder}";
-Source: "..\src\bin\win-x64\publish\*.dll.config"; DestDir: "{app}\{#VersionFolder}";
-
-Source: "..\src\bin\win-x64\publish\runtimes\win-x64\native\*"; DestDir: "{app}\{#VersionFolder}\runtimes\win-x64\native";
-
-Source: "..\src\bin\win-x64\publish\en-US\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\en-US"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\cs-CZ\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\cs-CZ"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\de-DE\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\de-DE"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\fa-IR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\fa-IR"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\fr-FR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\fr-FR"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\nl-NL\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\nl-NL"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\hr-HR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\hr-HR"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\id-ID\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\id-ID"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\it-IT\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\it-IT"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\pl-PL\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\pl-PL"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\pt-PT\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\pt-PT"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\pt-BR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\pt-BR"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\ro-RO\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\ro-RO"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\ru-RU\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\ru-RU"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\es-ES\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\es-ES"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\es-419\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\es-419"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\uk-UA\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\uk-UA"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\tr-TR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\tr-TR"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\be-BY\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\be-BY"; Flags: signonce;
-
-Source: "..\src\bin\win-x64\publish\Resources\*.dll"; DestDir: "{app}\{#VersionFolder}\Resources"; Flags: signonce;
-Source: "..\src\bin\win-x64\publish\Resources\*.exe"; DestDir: "{app}\{#VersionFolder}\Resources"; Flags: signonce;
+Source: "..\{#SourcePath}\ProtonVPN.Launcher.exe"; DestDir: "{app}"; Flags: signonce;
+
+Source: "..\{#SourcePath}\ProtonVPNService.exe"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
+Source: "..\{#SourcePath}\ProtonVPNService.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
+Source: "..\{#SourcePath}\ProtonVPNService.deps.json"; DestDir: "{app}\{#VersionFolder}";
+Source: "..\{#SourcePath}\ProtonVPNService.runtimeconfig.json"; DestDir: "{app}\{#VersionFolder}"; AfterInstall: InstallService;
+
+Source: "..\{#SourcePath}\*.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
+Source: "..\{#SourcePath}\*.exe"; Excludes: "ProtonVPN.exe,ProtonVPN.Launcher.exe,ProtonVPNService.exe,createdump.exe"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
+Source: "..\{#SourcePath}\*.deps.json"; DestDir: "{app}\{#VersionFolder}";
+Source: "..\{#SourcePath}\*.dll.config"; DestDir: "{app}\{#VersionFolder}";
+
+Source: "..\{#SourcePath}\runtimes\win-x64\native\*"; DestDir: "{app}\{#VersionFolder}\runtimes\win-x64\native";
+
+Source: "..\{#SourcePath}\en-US\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\en-US"; Flags: signonce;
+Source: "..\{#SourcePath}\cs-CZ\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\cs-CZ"; Flags: signonce;
+Source: "..\{#SourcePath}\de-DE\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\de-DE"; Flags: signonce;
+Source: "..\{#SourcePath}\fa-IR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\fa-IR"; Flags: signonce;
+Source: "..\{#SourcePath}\fr-FR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\fr-FR"; Flags: signonce;
+Source: "..\{#SourcePath}\nl-NL\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\nl-NL"; Flags: signonce;
+Source: "..\{#SourcePath}\hr-HR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\hr-HR"; Flags: signonce;
+Source: "..\{#SourcePath}\id-ID\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\id-ID"; Flags: signonce;
+Source: "..\{#SourcePath}\it-IT\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\it-IT"; Flags: signonce;
+Source: "..\{#SourcePath}\pl-PL\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\pl-PL"; Flags: signonce;
+Source: "..\{#SourcePath}\pt-PT\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\pt-PT"; Flags: signonce;
+Source: "..\{#SourcePath}\pt-BR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\pt-BR"; Flags: signonce;
+Source: "..\{#SourcePath}\ro-RO\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\ro-RO"; Flags: signonce;
+Source: "..\{#SourcePath}\ru-RU\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\ru-RU"; Flags: signonce;
+Source: "..\{#SourcePath}\es-ES\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\es-ES"; Flags: signonce;
+Source: "..\{#SourcePath}\es-419\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\es-419"; Flags: signonce;
+Source: "..\{#SourcePath}\uk-UA\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\uk-UA"; Flags: signonce;
+Source: "..\{#SourcePath}\tr-TR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\tr-TR"; Flags: signonce;
+Source: "..\{#SourcePath}\be-BY\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\be-BY"; Flags: signonce;
+
+Source: "..\{#SourcePath}\Resources\*.dll"; DestDir: "{app}\{#VersionFolder}\Resources"; Flags: signonce;
+Source: "..\{#SourcePath}\Resources\*.exe"; DestDir: "{app}\{#VersionFolder}\Resources"; Flags: signonce;
 Source: "..\src\ProtonVPN.Vpn\Resources\wireguard.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
 Source: "..\src\ProtonVPN.Vpn\Resources\tunnel.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
 

ci/build-scripts/main.py

@@ -33,6 +33,9 @@ def print_sha256(file_path):
 custom_parser = subparsers.add_parser('app-installer')
 custom_parser.add_argument('hash', type=str, help='Commit hash string')
 
+custom_parser = subparsers.add_parser('app-bti-installer')
+custom_parser.add_argument('hash', type=str, help='Commit hash string')
+
 custom_parser = subparsers.add_parser('add-commit-hash')
 custom_parser.add_argument('hash', type=str, help='Commit hash string')
 
@@ -74,11 +77,20 @@ def print_sha256(file_path):
     sys.exit(code)
 
 elif args.command == 'app-installer':
-    v = win32api.GetFileVersionInfo('.\\src\\bin\\win-x64\\publish\\ProtonVPN.exe', '\\')
+    build_path = os.environ.get('BUILD_PATH', '.\\src\\bin\\win-x64\\publish\\')
+    exe_path = os.path.join(build_path, 'ProtonVPN.exe')
+    print('Executable File Path:', exe_path)
+    v = win32api.GetFileVersionInfo(exe_path, '\\')
     semVersion = "%d.%d.%d" % (v['FileVersionMS'] / 65536, v['FileVersionMS'] % 65536, v['FileVersionLS'] / 65536)
     print('Building app installer')
     err = installer.build(semVersion, args.hash, 'Setup/setup.iss')
-    print_sha256('.\Setup\Installers\ProtonVPN_v{semVersion}.exe'.format(semVersion=semVersion))
+    installer_filename = 'ProtonVPN_v{semVersion}.exe'.format(semVersion=semVersion)
+    
+    if 'BTI' in build_path:
+        installer_filename = 'ProtonVPN_v{semVersion}_BTI.exe'.format(semVersion=semVersion)  
+    installer_path = os.path.join('.\Setup\Installers', installer_filename)
+    
+    print_sha256(installer_path)
     sys.exit(err)
 
 elif args.command == 'add-commit-hash':

src/Announcements/ProtonVPN.Announcements/AnnouncementService.cs

@@ -30,13 +30,13 @@
 using ProtonVPN.Api.Contracts.Announcements;
 using ProtonVPN.Common.Configuration;
 using ProtonVPN.Common.Extensions;
-using ProtonVPN.Logging.Contracts;
-using ProtonVPN.Logging.Contracts.Events.AppLogs;
 using ProtonVPN.Common.OS.Net.Http;
 using ProtonVPN.Common.Threading;
 using ProtonVPN.Core.Auth;
 using ProtonVPN.Core.Settings;
 using ProtonVPN.Core.Users;
+using ProtonVPN.Logging.Contracts;
+using ProtonVPN.Logging.Contracts.Events.AppLogs;
 
 namespace ProtonVPN.Announcements
 {

src/Api/ProtonVPN.Api.Contracts/IApiClient.cs

@@ -24,7 +24,6 @@
 using ProtonVPN.Api.Contracts.Certificates;
 using ProtonVPN.Api.Contracts.Common;
 using ProtonVPN.Api.Contracts.Geographical;
-using ProtonVPN.Api.Contracts.Partners;
 using ProtonVPN.Api.Contracts.ReportAnIssue;
 using ProtonVPN.Api.Contracts.Servers;
 using ProtonVPN.Api.Contracts.Streaming;
@@ -49,7 +48,6 @@ public interface IApiClient : IClientBase
         Task<ApiResponseResult<VpnConfig.VpnConfigResponse>> GetVpnConfig();
         Task<ApiResponseResult<AnnouncementsResponse>> GetAnnouncementsAsync(AnnouncementsRequest request);
         Task<ApiResponseResult<StreamingServicesResponse>> GetStreamingServicesAsync();
-        Task<ApiResponseResult<PartnersResponse>> GetPartnersAsync();
         Task<ApiResponseResult<BaseResponse>> CheckAuthenticationServerStatusAsync();
         Task<ApiResponseResult<CertificateResponse>> RequestAuthCertificateAsync(CertificateRequest request);
         Task<ApiResponseResult<BaseResponse>> ApplyPromoCodeAsync(PromoCodeRequest promoCodeRequest);