[PATCH 3/3] mscoree: Update Wine Mono to 5.0.0.

Esme vincent at codeweavers.com
Sat Apr 18 22:01:17 CDT 2020


From: Vincent Povirk <vincent at codeweavers.com>

Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
---
 dlls/appwiz.cpl/addons.c       | 12 +++++++++---
 dlls/mscoree/mscoree_private.h |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index 48a84f39589..c1405d5ec8a 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -58,8 +58,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
 #define GECKO_SHA "???"
 #endif
 
-#define MONO_VERSION "4.9.4"
-#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd"
+#define MONO_VERSION "5.0.0"
+#if defined(__i386__) || defined(__x86_64__)
+#define MONO_ARCH "x86"
+#define MONO_SHA "17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5"
+#else
+#define MONO_ARCH ""
+#define MONO_SHA "???"
+#endif
 
 typedef struct {
     const char *version;
@@ -88,7 +94,7 @@ static const addon_info_t addons_info[] = {
     },
     {
         MONO_VERSION,
-        L"wine-mono-" MONO_VERSION ".msi",
+        L"wine-mono-" MONO_VERSION "-" MONO_ARCH ".msi",
         L"mono",
         MONO_SHA,
         "http://source.winehq.org/winemono.php",
diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h
index f824cc9d5c1..cd032aefc06 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 "4.9.4"
+#define WINE_MONO_VERSION "5.0.0"
 
 /* Mono embedding */
 typedef struct _MonoDomain MonoDomain;
-- 
2.17.1




More information about the wine-devel mailing list