Skip to content

Commit cc5dc6c

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/2.2.0'
2 parents f360f74 + aae0308 commit cc5dc6c

File tree

297 files changed

+4049
-3025
lines changed

Some content is hidden

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

297 files changed

+4049
-3025
lines changed

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -206,27 +206,6 @@ win-11-tests:
206206
paths:
207207
- $SCREENSHOT_PATH
208208
expire_in: 2 weeks
209-
210-
update-vm:
211-
stage: ui-test
212-
tags:
213-
- installation_tests
214-
rules:
215-
- if: $CI_PIPELINE_SOURCE == "schedule"
216-
script:
217-
- powershell -File ci\InstallerTestScripts\update-vm.ps1
218-
219-
installation-test:
220-
stage: ui-test
221-
tags:
222-
- installation_tests
223-
when: manual
224-
script:
225-
- powershell -File ci\InstallerTestScripts\prepare-installer-tests.ps1
226-
except:
227-
- /^debug.*$/
228-
- release/9.9.9
229-
- master
230209

231210
mirror:
232211
stage: mirror

‎ProtonVpn.sln‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Dns.Installers",
120120
EndProject
121121
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Dns.Tests", "src\Dns\ProtonVPN.Dns.Tests\ProtonVPN.Dns.Tests.csproj", "{F6B47679-3362-4A0C-BB4D-BD3C9B0550AF}"
122122
EndProject
123+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Announcements", "Announcements", "{56EA9268-0B36-46CB-B8F0-871DBEED5D4F}"
124+
EndProject
125+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Announcements", "src\Announcements\ProtonVPN.Announcements\ProtonVPN.Announcements.csproj", "{45927301-6CF5-4770-888C-7B0B51ECEBEE}"
126+
EndProject
127+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Announcements.Contracts", "src\Announcements\ProtonVPN.Announcements.Contracts\ProtonVPN.Announcements.Contracts.csproj", "{153BD6AB-6B34-4E97-A96D-4ED5826DC037}"
128+
EndProject
129+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Announcements.Installers", "src\Announcements\ProtonVPN.Announcements.Installers\ProtonVPN.Announcements.Installers.csproj", "{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}"
130+
EndProject
131+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.Announcements.Tests", "src\Announcements\ProtonVPN.Announcements.Tests\ProtonVPN.Announcements.Tests.csproj", "{89E58A49-12C4-4C22-B646-348B6BFCCB4D}"
132+
EndProject
123133
Global
124134
GlobalSection(SolutionConfigurationPlatforms) = preSolution
125135
Debug|Any CPU = Debug|Any CPU
@@ -656,6 +666,54 @@ Global
656666
{F6B47679-3362-4A0C-BB4D-BD3C9B0550AF}.Release|x64.Build.0 = Release|Any CPU
657667
{F6B47679-3362-4A0C-BB4D-BD3C9B0550AF}.Release|x86.ActiveCfg = Release|Any CPU
658668
{F6B47679-3362-4A0C-BB4D-BD3C9B0550AF}.Release|x86.Build.0 = Release|Any CPU
669+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
670+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
671+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Debug|x64.ActiveCfg = Debug|Any CPU
672+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Debug|x64.Build.0 = Debug|Any CPU
673+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Debug|x86.ActiveCfg = Debug|Any CPU
674+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Debug|x86.Build.0 = Debug|Any CPU
675+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
676+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Release|Any CPU.Build.0 = Release|Any CPU
677+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Release|x64.ActiveCfg = Release|Any CPU
678+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Release|x64.Build.0 = Release|Any CPU
679+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Release|x86.ActiveCfg = Release|Any CPU
680+
{45927301-6CF5-4770-888C-7B0B51ECEBEE}.Release|x86.Build.0 = Release|Any CPU
681+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
682+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Debug|Any CPU.Build.0 = Debug|Any CPU
683+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Debug|x64.ActiveCfg = Debug|Any CPU
684+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Debug|x64.Build.0 = Debug|Any CPU
685+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Debug|x86.ActiveCfg = Debug|Any CPU
686+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Debug|x86.Build.0 = Debug|Any CPU
687+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Release|Any CPU.ActiveCfg = Release|Any CPU
688+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Release|Any CPU.Build.0 = Release|Any CPU
689+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Release|x64.ActiveCfg = Release|Any CPU
690+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Release|x64.Build.0 = Release|Any CPU
691+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Release|x86.ActiveCfg = Release|Any CPU
692+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037}.Release|x86.Build.0 = Release|Any CPU
693+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
694+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
695+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Debug|x64.ActiveCfg = Debug|Any CPU
696+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Debug|x64.Build.0 = Debug|Any CPU
697+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Debug|x86.ActiveCfg = Debug|Any CPU
698+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Debug|x86.Build.0 = Debug|Any CPU
699+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
700+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Release|Any CPU.Build.0 = Release|Any CPU
701+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Release|x64.ActiveCfg = Release|Any CPU
702+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Release|x64.Build.0 = Release|Any CPU
703+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Release|x86.ActiveCfg = Release|Any CPU
704+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E}.Release|x86.Build.0 = Release|Any CPU
705+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
706+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
707+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Debug|x64.ActiveCfg = Debug|Any CPU
708+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Debug|x64.Build.0 = Debug|Any CPU
709+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Debug|x86.ActiveCfg = Debug|Any CPU
710+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Debug|x86.Build.0 = Debug|Any CPU
711+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
712+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Release|Any CPU.Build.0 = Release|Any CPU
713+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Release|x64.ActiveCfg = Release|Any CPU
714+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Release|x64.Build.0 = Release|Any CPU
715+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Release|x86.ActiveCfg = Release|Any CPU
716+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D}.Release|x86.Build.0 = Release|Any CPU
659717
EndGlobalSection
660718
GlobalSection(SolutionProperties) = preSolution
661719
HideSolutionNode = FALSE
@@ -686,6 +744,10 @@ Global
686744
{455DA1FB-5097-47D2-8603-B0E1F9D90294} = {7D999E1B-C00B-4BA8-AEC3-94BA92010E38}
687745
{E52E34FD-40AE-425B-9C1A-2CAB3EE2704F} = {7D999E1B-C00B-4BA8-AEC3-94BA92010E38}
688746
{F6B47679-3362-4A0C-BB4D-BD3C9B0550AF} = {7D999E1B-C00B-4BA8-AEC3-94BA92010E38}
747+
{45927301-6CF5-4770-888C-7B0B51ECEBEE} = {56EA9268-0B36-46CB-B8F0-871DBEED5D4F}
748+
{153BD6AB-6B34-4E97-A96D-4ED5826DC037} = {56EA9268-0B36-46CB-B8F0-871DBEED5D4F}
749+
{2088B3AF-F9AF-45B8-B824-16749D5DAF9E} = {56EA9268-0B36-46CB-B8F0-871DBEED5D4F}
750+
{89E58A49-12C4-4C22-B646-348B6BFCCB4D} = {56EA9268-0B36-46CB-B8F0-871DBEED5D4F}
689751
EndGlobalSection
690752
GlobalSection(ExtensibilityGlobals) = postSolution
691753
SolutionGuid = {5CFD3EA5-ADCA-48F0-9E3F-BBC76CCBF1C2}

0 commit comments

Comments
 (0)