Skip to content

Commit 0b72876

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/3.2.8'
2 parents a8a3546 + 6e125d0 commit 0b72876

File tree

233 files changed

+6422
-2936
lines changed

Some content is hidden

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

233 files changed

+6422
-2936
lines changed

‎.gitlab-ci-templates.yml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
- dotnet build src/Tests/ProtonVPN.UI.Tests/ProtonVPN.UI.Tests.csproj --arch x64 -o src/bin
1111
- VSTest.Console.exe src\bin\ProtonVPN.UI.Tests.dll /Settings:ci/test-scripts/TestRun/test-run-settings.xml /TestCaseFilter:"Category=${CATEGORY}"
1212
- ci\test-scripts\uninstall-app.ps1
13-
except:
14-
- /^debug.*$/
15-
- release/9.9.9
16-
- master
1713
artifacts:
1814
when: always
1915
name: "result-ui"
@@ -27,11 +23,14 @@
2723
- windows-dot-net
2824
script:
2925
- echo "Building native dependencies..."
30-
- 'c:\nuget\nuget.exe restore ProtonVPN.InstallActions.sln'
26+
- nuget restore ProtonVPN.InstallActions.sln
3127
- cmd.exe /c BuildDependencies.bat $DEPENDENCIES
3228
- echo "Downloading translations from crowdin..."
3329
- python ci\build-scripts\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
34-
- python ci\build-scripts\main.py defaultConfig
30+
- python ci\build-scripts\main.py defaultConfig
31+
- dotnet build src\Builds\ProtonVPN.Builds.ConsoleJob\ProtonVPN.Builds.ConsoleJob.csproj
32+
- echo "Injecting CI variables"
33+
- src\bin\ProtonVPN.Builds.ConsoleJob.exe
3534
- echo "Publishing ${TYPE}..."
3635
- dotnet publish ProtonVpn.sln -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
3736
- msbuild src\ProtonVPN.NativeHost\NativeHost.vcxproj /p:Configuration=Release /p:Platform=x64
@@ -44,6 +43,19 @@
4443
GIT_SUBMODULE_STRATEGY: normal
4544

4645
.build-installer:
46+
stage: build-installer
47+
tags:
48+
- windows-vpn-signer
4749
script:
4850
- python ci\build-scripts\main.py update-gh-list
49-
- python ci\build-scripts\main.py app-installer $env:CI_COMMIT_SHORT_SHA
51+
- python ci\build-scripts\main.py app-installer $env:CI_COMMIT_SHORT_SHA
52+
artifacts:
53+
paths:
54+
- Setup/Installers/
55+
expire_in: 4 weeks
56+
variables:
57+
FF_USE_FASTZIP: "true"
58+
TRANSFER_METER_FREQUENCY: "2s"
59+
ARTIFACT_COMPRESSION_LEVEL: "fastest"
60+
CACHE_COMPRESSION_LEVEL: "fastest"
61+
FASTZIP_ARCHIVER_BUFFER_SIZE: 128

‎.gitlab-ci.yml‎

Lines changed: 69 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -48,30 +48,85 @@ build-release:
4848
TYPE: Release
4949
DEPENDENCIES: publish
5050
BUILD_PATH: src/bin/win-x64/publish
51+
52+
build-bti:
53+
rules:
54+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
55+
when: never
56+
- if: $CI_PIPELINE_SOURCE == "schedule"
57+
when: always
58+
- when: manual
59+
extends:
60+
- .build-bti-vars
61+
- .build-script
62+
when: manual
63+
variables:
64+
TYPE: Debug
65+
DEPENDENCIES: publish-BTI
66+
BUILD_PATH: src/bin/win-x64/BTI/publish
5167

5268
build-debug:
5369
extends: .build-script
5470
except:
5571
- master
5672
- /^release.*$/
73+
- schedules
5774
variables:
5875
TYPE: Debug
5976
DEPENDENCIES: publish
6077
BUILD_PATH: src/bin/win-x64/publish
6178

6279
ui-test:
6380
extends: .test_execution_script
81+
except:
82+
- /^debug.*$/
83+
- release/9.9.9
84+
- master
85+
- schedules
6486
variables:
6587
CATEGORY: "UI"
6688

6789
connection-test:
6890
extends: .test_execution_script
91+
except:
92+
- /^debug.*$/
93+
- release/9.9.9
94+
- master
95+
- schedules
6996
variables:
7097
CATEGORY: "Connection"
7198

99+
bti-test:
100+
extends: .test_execution_script
101+
needs:
102+
- build-BTI-installer
103+
rules:
104+
- if: '$CI_COMMIT_BRANCH == "master"'
105+
when: never
106+
- if: '$CI_COMMIT_BRANCH =~ /^release.*$/'
107+
when: never
108+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
109+
when: never
110+
- if: $CI_PIPELINE_SOURCE == "schedule"
111+
when: always
112+
- when: manual
113+
tags:
114+
- BTI
115+
dependencies:
116+
- build-BTI-installer
117+
variables:
118+
CATEGORY: "BTI"
119+
after_script:
120+
- ci\test-scripts\alert-failure.ps1
121+
72122
win-11-test:
73123
extends: .test_execution_script
74124
when: manual
125+
except:
126+
- /^debug.*$/
127+
- release/9.9.9
128+
- master
129+
- schedules
75130
tags:
76131
- win11
77132
variables:
@@ -83,11 +138,16 @@ tests:
83138
- windows-dot-net
84139
script:
85140
- cmd.exe /c BuildDependencies.bat bin gosrponly
141+
- dotnet build src\Builds\ProtonVPN.Builds.ConsoleJob\ProtonVPN.Builds.ConsoleJob.csproj
142+
- echo "Injecting CI variables"
143+
- src\bin\ProtonVPN.Builds.ConsoleJob.exe
86144
- dotnet restore ProtonVpn.sln
87145
- dotnet build ProtonVpn.sln
88-
- coverlet src\bin --target "dotnet" --targetargs "test ProtonVpn.sln -l ""console;verbosity=normal"" --filter ""TestCategory!=UI&TestCategory!=Connection&TestCategory!=Performance"" --no-restore --no-build" --format cobertura --output .\coverage-reports --exclude "[*.Tests*]*" --exclude "[ProtonVPN.MarkupValidator]*" --exclude "[TestTools*]*" --exclude "[*.Installers]*"
146+
- coverlet src\bin --target "dotnet" --targetargs "test ProtonVpn.sln -l ""console;verbosity=normal"" --filter ""TestCategory!=UI&TestCategory!=Connection&TestCategory!=Performance&TestCategory!=BTI"" --no-restore --no-build" --format cobertura --output .\coverage-reports --exclude "[*.Tests*]*" --exclude "[ProtonVPN.MarkupValidator]*" --exclude "[TestTools*]*" --exclude "[*.Installers]*"
89147
- powershell -Command "(gc coverage-reports.cobertura.xml) -replace '\\', '/' | Out-File -encoding UTF8 cobertura.xml"
90148
- ReportGenerator.exe "-reports:cobertura.xml" "-targetdir:.\code-coverage-report-html"
149+
except:
150+
- schedules
91151
artifacts:
92152
reports:
93153
coverage_report:
@@ -96,49 +156,28 @@ tests:
96156
coverage: '/Total.*?([0-9]{1,3}.[0-9]{1,3})%/'
97157

98158
build-installer:
99-
stage: build-installer
100159
tags:
101160
- windows-vpn-signer
102161
dependencies:
103162
- build-debug
104163
- build-release
105164
extends:
106165
- .build-installer
166+
except:
167+
- schedules
107168
variables:
108169
BUILD_PATH: src/bin/win-x64/publish
109-
FF_USE_FASTZIP: "true"
110-
TRANSFER_METER_FREQUENCY: "2s"
111-
ARTIFACT_COMPRESSION_LEVEL: "fastest"
112-
CACHE_COMPRESSION_LEVEL: "fastest"
113-
FASTZIP_ARCHIVER_BUFFER_SIZE: 128
114-
artifacts:
115-
paths:
116-
- Setup/Installers/
117-
expire_in: 4 weeks
118170

119171
build-BTI-installer:
120-
stage: build-installer
121-
when: manual
122-
dependencies: []
123-
tags:
124-
- windows
125-
extends:
126-
- .build-bti-vars
172+
needs:
173+
- build-bti
127174
except:
128175
- master
129176
- /^release.*$/
130-
script:
131-
- !reference [.build-script, script]
132-
- !reference [.build-installer, script]
177+
extends:
178+
- .build-installer
133179
variables:
134-
TYPE: Debug
135-
DEPENDENCIES: publish-BTI
136180
BUILD_PATH: src/bin/win-x64/BTI/publish
137-
GIT_SUBMODULE_STRATEGY: normal
138-
artifacts:
139-
paths:
140-
- Setup/Installers/
141-
expire_in: 1 weeks
142181

143182
prepare-internal-beta-release:
144183
stage: internal-beta
@@ -209,6 +248,8 @@ send-slack-notification:
209248
only:
210249
refs:
211250
- develop
251+
except:
252+
- schedules
212253
stage: publish-to-slack
213254
script:
214255
- python -m pip install -r ci\python-libs.txt

‎ProtonVPN.RestoreInternet/ProtonVPN.RestoreInternet.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,5 @@
2525
<ItemGroup>
2626
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2727
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
28-
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
29-
<PrivateAssets>all</PrivateAssets>
30-
</PackageReference>
3128
</ItemGroup>
3229
</Project>

‎ProtonVpn.sln‎

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.HumanVerification
9191
EndProject
9292
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.IntegrationTests", "src\Tests\ProtonVPN.IntegrationTests\ProtonVPN.IntegrationTests.csproj", "{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}"
9393
EndProject
94-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.SourceGenerators", "src\ProtonVPN.SourceGenerators\ProtonVPN.SourceGenerators.csproj", "{B7B19A7B-5A20-4690-81F4-83002CA064FB}"
95-
EndProject
9694
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dns", "Dns", "{7D999E1B-C00B-4BA8-AEC3-94BA92010E38}"
9795
EndProject
9896
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Dns", "src\Dns\ProtonVPN.Dns\ProtonVPN.Dns.csproj", "{8C4C72C3-DCC4-43B1-A2B3-DF77B435FA75}"
@@ -193,6 +191,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.StatisticalEvents
193191
EndProject
194192
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.StatisticalEvents.Installers", "src\StatisticalEvents\ProtonVPN.StatisticalEvents.Installers\ProtonVPN.StatisticalEvents.Installers.csproj", "{CEE9045E-0299-4488-80FF-0162D099C544}"
195193
EndProject
194+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Builds", "Builds", "{209CAB96-3CE8-4F93-A535-2B93C9A6AA32}"
195+
EndProject
196+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Builds.Variables", "src\Builds\ProtonVPN.Builds.Variables\ProtonVPN.Builds.Variables.csproj", "{070A1A8B-241E-45B8-882C-B33D79086E34}"
197+
EndProject
198+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Builds.ConsoleJob", "src\Builds\ProtonVPN.Builds.ConsoleJob\ProtonVPN.Builds.ConsoleJob.csproj", "{37355661-376A-4F1D-B4A8-2B74D088571A}"
199+
EndProject
196200
Global
197201
GlobalSection(SolutionConfigurationPlatforms) = preSolution
198202
Debug|Any CPU = Debug|Any CPU
@@ -203,18 +207,6 @@ Global
203207
Release|x86 = Release|x86
204208
EndGlobalSection
205209
GlobalSection(ProjectConfigurationPlatforms) = postSolution
206-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
207-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
208-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x64.ActiveCfg = Debug|Any CPU
209-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x64.Build.0 = Debug|Any CPU
210-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x86.ActiveCfg = Debug|Any CPU
211-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x86.Build.0 = Debug|Any CPU
212-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
213-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|Any CPU.Build.0 = Release|Any CPU
214-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x64.ActiveCfg = Release|Any CPU
215-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x64.Build.0 = Release|Any CPU
216-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x86.ActiveCfg = Release|Any CPU
217-
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x86.Build.0 = Release|Any CPU
218210
{0CDCA012-BB2D-49B3-944E-CE80D75D651A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
219211
{0CDCA012-BB2D-49B3-944E-CE80D75D651A}.Debug|Any CPU.Build.0 = Debug|Any CPU
220212
{0CDCA012-BB2D-49B3-944E-CE80D75D651A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -227,6 +219,18 @@ Global
227219
{0CDCA012-BB2D-49B3-944E-CE80D75D651A}.Release|x64.Build.0 = Release|Any CPU
228220
{0CDCA012-BB2D-49B3-944E-CE80D75D651A}.Release|x86.ActiveCfg = Release|Any CPU
229221
{0CDCA012-BB2D-49B3-944E-CE80D75D651A}.Release|x86.Build.0 = Release|Any CPU
222+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
223+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
224+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x64.ActiveCfg = Debug|Any CPU
225+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x64.Build.0 = Debug|Any CPU
226+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x86.ActiveCfg = Debug|Any CPU
227+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Debug|x86.Build.0 = Debug|Any CPU
228+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
229+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|Any CPU.Build.0 = Release|Any CPU
230+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x64.ActiveCfg = Release|Any CPU
231+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x64.Build.0 = Release|Any CPU
232+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x86.ActiveCfg = Release|Any CPU
233+
{25781B52-5858-4387-80A5-C9C38C32B3CC}.Release|x86.Build.0 = Release|Any CPU
230234
{CA44B51D-7645-413A-818F-2C5B57DB67DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
231235
{CA44B51D-7645-413A-818F-2C5B57DB67DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
232236
{CA44B51D-7645-413A-818F-2C5B57DB67DD}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -611,18 +615,6 @@ Global
611615
{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|x64.Build.0 = Release|Any CPU
612616
{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|x86.ActiveCfg = Release|Any CPU
613617
{A2B4BEC3-7430-489E-BE6B-F1E8205A7C62}.Release|x86.Build.0 = Release|Any CPU
614-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
615-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
616-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Debug|x64.ActiveCfg = Debug|Any CPU
617-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Debug|x64.Build.0 = Debug|Any CPU
618-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Debug|x86.ActiveCfg = Debug|Any CPU
619-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Debug|x86.Build.0 = Debug|Any CPU
620-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
621-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Release|Any CPU.Build.0 = Release|Any CPU
622-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Release|x64.ActiveCfg = Release|Any CPU
623-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Release|x64.Build.0 = Release|Any CPU
624-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Release|x86.ActiveCfg = Release|Any CPU
625-
{B7B19A7B-5A20-4690-81F4-83002CA064FB}.Release|x86.Build.0 = Release|Any CPU
626618
{8C4C72C3-DCC4-43B1-A2B3-DF77B435FA75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
627619
{8C4C72C3-DCC4-43B1-A2B3-DF77B435FA75}.Debug|Any CPU.Build.0 = Debug|Any CPU
628620
{8C4C72C3-DCC4-43B1-A2B3-DF77B435FA75}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1091,6 +1083,30 @@ Global
10911083
{CEE9045E-0299-4488-80FF-0162D099C544}.Release|x64.Build.0 = Release|Any CPU
10921084
{CEE9045E-0299-4488-80FF-0162D099C544}.Release|x86.ActiveCfg = Release|Any CPU
10931085
{CEE9045E-0299-4488-80FF-0162D099C544}.Release|x86.Build.0 = Release|Any CPU
1086+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1087+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
1088+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Debug|x64.ActiveCfg = Debug|Any CPU
1089+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Debug|x64.Build.0 = Debug|Any CPU
1090+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Debug|x86.ActiveCfg = Debug|Any CPU
1091+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Debug|x86.Build.0 = Debug|Any CPU
1092+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
1093+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Release|Any CPU.Build.0 = Release|Any CPU
1094+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Release|x64.ActiveCfg = Release|Any CPU
1095+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Release|x64.Build.0 = Release|Any CPU
1096+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Release|x86.ActiveCfg = Release|Any CPU
1097+
{070A1A8B-241E-45B8-882C-B33D79086E34}.Release|x86.Build.0 = Release|Any CPU
1098+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1099+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1100+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Debug|x64.ActiveCfg = Debug|Any CPU
1101+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Debug|x64.Build.0 = Debug|Any CPU
1102+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Debug|x86.ActiveCfg = Debug|Any CPU
1103+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Debug|x86.Build.0 = Debug|Any CPU
1104+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Release|Any CPU.ActiveCfg = Release|Any CPU
1105+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Release|Any CPU.Build.0 = Release|Any CPU
1106+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Release|x64.ActiveCfg = Release|Any CPU
1107+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Release|x64.Build.0 = Release|Any CPU
1108+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Release|x86.ActiveCfg = Release|Any CPU
1109+
{37355661-376A-4F1D-B4A8-2B74D088571A}.Release|x86.Build.0 = Release|Any CPU
10941110
EndGlobalSection
10951111
GlobalSection(SolutionProperties) = preSolution
10961112
HideSolutionNode = FALSE
@@ -1154,6 +1170,8 @@ Global
11541170
{C8B78B43-EFEE-41CF-8BE9-1EA84AA18BF9} = {4B1EF657-A679-43B5-83DD-612D602C6333}
11551171
{669BF256-765D-4BF1-9278-68EF33F86FFB} = {4B1EF657-A679-43B5-83DD-612D602C6333}
11561172
{CEE9045E-0299-4488-80FF-0162D099C544} = {4B1EF657-A679-43B5-83DD-612D602C6333}
1173+
{070A1A8B-241E-45B8-882C-B33D79086E34} = {209CAB96-3CE8-4F93-A535-2B93C9A6AA32}
1174+
{37355661-376A-4F1D-B4A8-2B74D088571A} = {209CAB96-3CE8-4F93-A535-2B93C9A6AA32}
11571175
EndGlobalSection
11581176
GlobalSection(ExtensibilityGlobals) = postSolution
11591177
SolutionGuid = {5CFD3EA5-ADCA-48F0-9E3F-BBC76CCBF1C2}

‎Setup/setup.iss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ Source: "..\{#SourcePath}\ko-KR\ProtonVPN.Translations.resources.dll"; DestDir:
111111
Source: "..\{#SourcePath}\zh-TW\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\zh-TW"; Flags: signonce;
112112
Source: "..\{#SourcePath}\sv-SE\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\sv-SE"; Flags: signonce;
113113
Source: "..\{#SourcePath}\ja-JP\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\ja-JP"; Flags: signonce;
114+
Source: "..\{#SourcePath}\sk-SK\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\sk-SK"; Flags: signonce;
114115

115116
Source: "..\{#SourcePath}\Resources\*.dll"; DestDir: "{app}\{#VersionFolder}\Resources"; Flags: signonce;
116117
Source: "..\{#SourcePath}\Resources\*.exe"; DestDir: "{app}\{#VersionFolder}\Resources"; Flags: signonce;

‎ci/test-scripts/alert-failure.ps1‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
if ($env:CI_JOB_STATUS -eq 'failed' -and $env:CI_PIPELINE_SOURCE -eq 'schedule') {
2+
$text = ":warn: Scheduled BTI tests failed for Windows client :windows-10: ! `n$env:CI_JOB_URL"
3+
$body = @{
4+
text = $text
5+
} | ConvertTo-Json
6+
7+
$headers = @{
8+
"Content-Type" = "application/json"
9+
}
10+
11+
$output = Invoke-WebRequest -Uri $env:SLACK_QA_HOOK -Method Post -Headers $headers -Body $body -UseBasicParsing
12+
}

‎ci/test-scripts/prepare-internal-beta.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def get_update_json(version, installer_path):
5151
update_json['ChangeLog'] = get_changelog()
5252
update_json['ReleaseDate'] = datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
5353
update_json['MinimumOsVersion'] = "10.0.17763"
54+
update_json["RolloutPercentage"] = 100
5455
return update_json
5556

5657
def get_changelog():

‎src/Announcements/ProtonVPN.Announcements.Contracts/ProtonVPN.Announcements.Contracts.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,4 @@
1111
<Link>Properties\GlobalAssemblyInfo.cs</Link>
1212
</Compile>
1313
</ItemGroup>
14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
16-
<PrivateAssets>all</PrivateAssets>
17-
</PackageReference>
18-
</ItemGroup>
1914
</Project>

0 commit comments

Comments
 (0)