Skip to content

Commit 0667103

Browse files
committed
Merge branch 'fix/SNC-5708_win8-libuv_release' into 'release/v5.14.0'
SNC-5708. App uses API unavailable on Win8 [release] See merge request desktop/desktop!3756
2 parents e9fffee + 2eba2d4 commit 0667103

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

src/MEGAShellExt/ModernShellContextMenu/msix/AppxManifest.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
1212
xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
1313
IgnorableNamespaces="uap uap2 uap3 rescap desktop desktop4 desktop5 uap10 com">
14-
<Identity Name="MEGASyncShellSparse" ProcessorArchitecture="neutral" Publisher="@MEGA_DESKTOP_APP_CERTIFICATE_PUBLISHER@" Version="5.14.0.2" />
14+
<Identity Name="MEGASyncShellSparse" ProcessorArchitecture="neutral" Publisher="@MEGA_DESKTOP_APP_CERTIFICATE_PUBLISHER@" Version="5.14.0.3" />
1515
<Properties>
1616
<DisplayName>MEGAsync</DisplayName>
1717
<PublisherDisplayName>MEGAsync</PublisherDisplayName>

src/MEGASync/control/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#define VER_MAJOR 5
77
#define VER_MINOR 14
88
#define VER_MICRO 0
9-
#define VER_RC 2
9+
#define VER_RC 3
1010
// Format: "VER_MAJOR.VER_MINOR.VER_MICRO.VER_RC\0"
11-
#define VER_PRODUCTVERSION_STR "5.14.0.2\0"
11+
#define VER_PRODUCTVERSION_STR "5.14.0.3\0"
1212
#define VER_PRODUCTVERSION VER_MAJOR, VER_MINOR, VER_MICRO, VER_RC
1313
#define VER_FILEVERSION VER_MAJOR, VER_MINOR, VER_MICRO, VER_RC
1414
#define VER_FILEVERSION_CODE (VER_MAJOR * 10000 + VER_MINOR * 100 + VER_MICRO)

vcpkg.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,19 @@
9191
"cryptopp",
9292
"libsodium",
9393
{
94-
"name": "curl",
95-
"features": [ "zstd" ]
94+
"name": "curl",
95+
"features": [
96+
"zstd"
97+
]
9698
},
9799
"icu",
98100
"sqlite3"
99101
],
100-
"builtin-baseline": "d5ec528843d29e3a52d745a64b469f810b2cedbf"
102+
"builtin-baseline": "d5ec528843d29e3a52d745a64b469f810b2cedbf",
103+
"overrides": [
104+
{
105+
"name": "libuv",
106+
"version": "1.49.2"
107+
}
108+
]
101109
}

0 commit comments

Comments
 (0)