Signed-off-by: Esme Povirk vincent@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 0047278c736..dcade07c445 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif
-#define MONO_VERSION "5.0.0" +#define MONO_VERSION "5.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5" +#define MONO_SHA "ae55439c7cd61d1a17f0c687967fad8ad12d9e2263972ffd5e9dde2685fd8ddd" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index cd032aefc06..096b20875b1 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 "5.0.0" +#define WINE_MONO_VERSION "5.1.0"
/* Mono embedding */ typedef struct _MonoDomain MonoDomain;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=72867
Your paranoid android.
=== debiant (32 bit report) ===
mscoree: comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed metahost.c:213: Test failed: GetInterface returned 80131700 mscoree.c:115: Test failed: ICLRRuntimeInfo::GetInterface failed, hr=0x80131700 mscoree.c:166: Test failed: .NET 4.0 runtime is not usable
=== debiant (32 bit Chinese:China report) ===
mscoree: comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed metahost.c:213: Test failed: GetInterface returned 80131700 mscoree.c:115: Test failed: ICLRRuntimeInfo::GetInterface failed, hr=0x80131700 mscoree.c:166: Test failed: .NET 4.0 runtime is not usable
=== debiant (32 bit WoW report) ===
mscoree: comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed metahost.c:213: Test failed: GetInterface returned 80131700 mscoree.c:115: Test failed: ICLRRuntimeInfo::GetInterface failed, hr=0x80131700 mscoree.c:166: Test failed: .NET 4.0 runtime is not usable
=== debiant (64 bit WoW report) ===
mscoree: comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed comtest.c:100: Test failed: Compilation failed comtest.c:103: Test failed: Moving temporary file failed metahost.c:213: Test failed: GetInterface returned 80131700 mscoree.c:115: Test failed: ICLRRuntimeInfo::GetInterface failed, hr=0x80131700 mscoree.c:166: Test failed: .NET 4.0 runtime is not usable
I'm guessing it didn't update the prefix, and was relying on a shared wine-mono install which would no longer be picked up. I don't see a failed install attempt in the log.
-
Esme Povirk -
Esme Povirk (they/them)
-
Marvin