[PATCH 0/1] MR1146: Update Wine Mono to 7.4.0.
From: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 88a830de2eb..b815ffbb5cb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.3.0" +#define MONO_VERSION "7.4.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "939e2f5669720d0d0fc7e305426622a11a33b7ae385c4d7e581e29ea264e22ff" +#define MONO_SHA "6413ff328ebbf7ec7689c648feb3546d8102ded865079d1fbf0331b14b3ab0ec" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0e51e0b3d7f..71e943d34c3 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.3.0" +#define WINE_MONO_VERSION "7.4.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1146
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125312 Your paranoid android. === debian11 (build log) === Task: Could not create the win32 wineprefix: Failed to disable the crash dialogs: Task: WineTest did not produce the win32 report === debian11 (build log) === Task: Could not create the wow64 wineprefix: Failed to disable the crash dialogs: === debian11 (build log) === WineRunWineTest.pl:error: The task timed out
You'd need to update the version in tools/gitlab/test.yml as well to enable the tests to run against the new version. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1146#note_11861
On Mon Oct 24 16:39:33 2022 +0000, Alexandre Julliard wrote:
You'd need to update the version in tools/gitlab/test.yml as well to enable the tests to run against the new version. Oh that's awesome, it didn't occur to me that I could fix that now.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1146#note_11911
participants (4)
-
Alexandre Julliard (@julliard) -
Esme Povirk -
Esme Povirk (@madewokherd) -
Marvin