Vincent Povirk : mscoree: Update Wine Mono to 4.7.0.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6bf71998781afa4aa011e21cc817a29137ebbbc6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6bf71998781afa4aa011e21cc8...

Author: Vincent Povirk 
Date:   Fri Mar  3 13:22:29 2017 -0600

mscoree: Update Wine Mono to 4.7.0.

This contains upstream updates from the Mono project.

Signed-off-by: Vincent Povirk 
Signed-off-by: Alexandre Julliard

---

dlls/appwiz.cpl/addons.c    | 4 ++--
 dlls/mscoree/mscoree_main.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index b4eb12f..c3847b5 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
 #define GECKO_SHA "???"
 #endif

-#define MONO_VERSION "4.6.4"
-#define MONO_SHA "d58509c3a4e5fa88c56c14e0413a803aa82f6118"
+#define MONO_VERSION "4.7.0"
+#define MONO_SHA "ff05e1d2a93c3a07672cefc7a8f3a087d75828ac"

typedef struct {
     const char *version;
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index 67f4259..49b319c 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -675,7 +675,7 @@ static BOOL install_wine_mono(void)
     LONG len;
     BOOL ret;

-    static const char* mono_version = "4.6.4";
+    static const char* mono_version = "4.7.0";
     static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}";

static const WCHAR controlW[] = {'\','c','o','n','t','r','o','l','.','e','x','e',0};