Skip to content

Commit 5fc532d

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/4.3.7'
2 parents 4373328 + 774fbf9 commit 5fc532d

File tree

301 files changed

+7225
-6431
lines changed

Some content is hidden

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

301 files changed

+7225
-6431
lines changed

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ stages:
100100
- dotnet build src\Builds\ProtonVPN.Builds.ConsoleJob\ProtonVPN.Builds.ConsoleJob.csproj
101101
- echo "Injecting CI variables"
102102
- src\bin\ProtonVPN.Builds.ConsoleJob.exe
103-
- dotnet restore ProtonVpn.sln
104-
- dotnet build ProtonVpn.sln
103+
- dotnet restore ProtonVPN.slnx
104+
- dotnet build ProtonVPN.slnx
105105

106106
.default_installer_needs: &default_installer_needs
107107
- project: $IP_LIST_BUILDER_REPO_NAMESPACE

‎Directory.Packages.props‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
2222
<PackageVersion Include="CommunityToolkit.WinUI.Triggers" Version="8.2.250402" />
2323
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
24-
<PackageVersion Include="CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView" Version="2.4.18" />
24+
<PackageVersion Include="CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView" Version="3.1.2" />
2525
<PackageVersion Include="DeviceId.Windows.Wmi" Version="6.9.0" />
2626
<PackageVersion Include="DnsClient" Version="1.8.0" />
2727
<PackageVersion Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
@@ -30,14 +30,11 @@
3030
<PackageVersion Include="Grpc.Net.Client" Version="2.71.0" />
3131
<PackageVersion Include="H.NotifyIcon.WinUI" Version="2.0.124" />
3232
<PackageVersion Include="log4net" Version="3.1.0" />
33-
<PackageVersion Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc4.5" />
33+
<PackageVersion Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc6.1" />
3434
<PackageVersion Include="Mapsui.WinUI" Version="4.1.9" />
3535
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
3636
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
3737
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
38-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
39-
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.6" />
40-
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.6" />
4138
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.11" />
4239
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
4340
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />

‎ProtonVPN.slnx‎

Lines changed: 306 additions & 0 deletions
Large diffs are not rendered by default.

‎ProtonVpn.sln‎

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

‎ProtonVpn.sln.DotSettings‎

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

‎Setup/Native/arm64/ProtonVPN.CalloutDriver.inf‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Class = WFPCALLOUTS
88
ClassGuid = {57465043-616C-6C6F-7574-5F636C617373}
99
Provider = %ManufacturerName%
1010
CatalogFile = ProtonVPN.CalloutDriver.cat
11-
DriverVer = 11/19/2024,7.43.45.10
11+
DriverVer = 11/06/2025,6.49.59.623
1212
PnpLockdown = 1
1313

1414
[SourceDisksNames]
@@ -18,35 +18,39 @@ PnpLockdown = 1
1818
ProtonVPN.CalloutDriver.sys = 1,,
1919

2020
[DestinationDirs]
21-
DefaultDestDir = 12 ; %WinDir%\System32\Drivers
22-
ProtonVPN.CalloutDriver.Files = 12 ; %WinDir%\System32\Drivers
21+
DefaultDestDir = 12 ; %WinDir%\System32\Drivers
22+
ProtonVPN.CalloutDriver.Files = 12 ; %WinDir%\System32\Drivers
23+
ProtonVPN.CalloutDriver.DelFiles = 12 ; %WinDir%\System32\Drivers
2324

2425
[DefaultInstall.NTARM64]
2526
OptionDesc = %ServiceDescription%
2627
CopyFiles = ProtonVPN.CalloutDriver.Files
2728

2829
[DefaultUninstall.NTARM64]
2930
LegacyUninstall = 1
30-
;DelFiles = ProtonVPN.CalloutDriver.Files
31+
DelFiles = ProtonVPN.CalloutDriver.DelFiles
3132

3233
[DefaultInstall.NTARM64.Services]
3334
AddService = %ServiceName%,,ProtonVPN.CalloutDriver.Service
3435

3536
[DefaultUninstall.NTARM64.Services]
36-
DelService = %ServiceName%,0x200 ; SPSVCINST_STOPSERVICE
37+
DelService = %ServiceName%,0x200 ; SPSVCINST_STOPSERVICE
3738

3839
[ProtonVPN.CalloutDriver.Files]
39-
ProtonVPN.CalloutDriver.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
40+
ProtonVPN.CalloutDriver.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
41+
42+
[ProtonVPN.CalloutDriver.DelFiles]
43+
ProtonVPN.CalloutDriver.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
4044

4145
[ProtonVPN.CalloutDriver.Service]
4246
DisplayName = %ServiceDisplayName%
4347
Description = %ServiceDescription%
44-
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
45-
StartType = 3 ; SERVICE_DEMAND_START
46-
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
48+
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
49+
StartType = 3 ; SERVICE_DEMAND_START
50+
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
4751
ServiceBinary = %12%\ProtonVPN.CalloutDriver.sys
4852
LoadOrderGroup = NDIS
49-
Dependencies = TCPIP ; Load after TCPIP.sys
53+
Dependencies = TCPIP ; Load after TCPIP.sys
5054

5155
[Strings]
5256
ManufacturerName = "Proton AG"

‎Setup/Native/arm64/ProtonVPN.CalloutDriver.sys‎

520 Bytes
Binary file not shown.

‎Setup/Native/arm64/protonvpn.calloutdriver.cat‎

-83 Bytes
Binary file not shown.

‎Setup/Native/x64/ProtonVPN.CalloutDriver.inf‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Class = WFPCALLOUTS
88
ClassGuid = {57465043-616C-6C6F-7574-5F636C617373}
99
Provider = %ManufacturerName%
1010
CatalogFile = ProtonVPN.CalloutDriver.cat
11-
DriverVer = 11/19/2024,11.46.44.670
11+
DriverVer = 11/06/2025,6.44.21.865
1212
PnpLockdown = 1
1313

1414
[SourceDisksNames]
@@ -18,35 +18,39 @@ PnpLockdown = 1
1818
ProtonVPN.CalloutDriver.sys = 1,,
1919

2020
[DestinationDirs]
21-
DefaultDestDir = 12 ; %WinDir%\System32\Drivers
22-
ProtonVPN.CalloutDriver.Files = 12 ; %WinDir%\System32\Drivers
21+
DefaultDestDir = 12 ; %WinDir%\System32\Drivers
22+
ProtonVPN.CalloutDriver.Files = 12 ; %WinDir%\System32\Drivers
23+
ProtonVPN.CalloutDriver.DelFiles = 12 ; %WinDir%\System32\Drivers
2324

2425
[DefaultInstall.NTamd64]
2526
OptionDesc = %ServiceDescription%
2627
CopyFiles = ProtonVPN.CalloutDriver.Files
2728

2829
[DefaultUninstall.NTamd64]
2930
LegacyUninstall = 1
30-
;DelFiles = ProtonVPN.CalloutDriver.Files
31+
DelFiles = ProtonVPN.CalloutDriver.DelFiles
3132

3233
[DefaultInstall.NTamd64.Services]
3334
AddService = %ServiceName%,,ProtonVPN.CalloutDriver.Service
3435

3536
[DefaultUninstall.NTamd64.Services]
36-
DelService = %ServiceName%,0x200 ; SPSVCINST_STOPSERVICE
37+
DelService = %ServiceName%,0x200 ; SPSVCINST_STOPSERVICE
3738

3839
[ProtonVPN.CalloutDriver.Files]
39-
ProtonVPN.CalloutDriver.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
40+
ProtonVPN.CalloutDriver.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
41+
42+
[ProtonVPN.CalloutDriver.DelFiles]
43+
ProtonVPN.CalloutDriver.sys,,,0x00000040 ; COPYFLG_OVERWRITE_OLDER_ONLY
4044

4145
[ProtonVPN.CalloutDriver.Service]
4246
DisplayName = %ServiceDisplayName%
4347
Description = %ServiceDescription%
44-
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
45-
StartType = 3 ; SERVICE_DEMAND_START
46-
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
48+
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
49+
StartType = 3 ; SERVICE_DEMAND_START
50+
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
4751
ServiceBinary = %12%\ProtonVPN.CalloutDriver.sys
4852
LoadOrderGroup = NDIS
49-
Dependencies = TCPIP ; Load after TCPIP.sys
53+
Dependencies = TCPIP ; Load after TCPIP.sys
5054

5155
[Strings]
5256
ManufacturerName = "Proton AG"

‎Setup/Native/x64/ProtonVPN.CalloutDriver.sys‎

1.03 KB
Binary file not shown.

0 commit comments

Comments
 (0)