From 86fd07c3fc124698e868509b2123884b2e8c3bfa Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 28 Aug 2017 15:32:29 +0200
Subject: [PATCH 01/51] Update script.js

---
 Applications/Games/Hearthstone/Online/script.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Applications/Games/Hearthstone/Online/script.js b/Applications/Games/Hearthstone/Online/script.js
index a7998c4920..a5feeb11ca 100644
--- a/Applications/Games/Hearthstone/Online/script.js
+++ b/Applications/Games/Hearthstone/Online/script.js
@@ -5,11 +5,11 @@ include(["Engines", "Wine", "Verbs", "corefonts"]);
 new OnlineInstallerScript()
     .name("Hearthstone")
     .editor("Blizzard")
-    .applicationHomepage("http://eu.battle.net/en/app/")
+    .applicationHomepage("https://eu.battle.net/hearthstone/")
     .author("ImperatorS79")
-    .url("https://www.battle.net/download/getInstallerForGame?os=win&locale=enGB&version=LIVE&gameProgram=BATTLENET_APP.exe")
+    .url("https://eu.battle.net/download/getInstaller?os=win&installer=Hearthstone-Setup.exe")
     .category("Games")
-    .executable("Battle.net.exe")
+    .executable("Hearthstone.exe")
     .wineVersion("2.15")
     .wineDistribution("staging")
     .preInstall(function(wine, wizard) {

From ac63d2cf06ee92c48649b9d8777c555c2b0f2abb Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 21 Jan 2019 18:42:41 +0100
Subject: [PATCH 02/51] Update dotnet

---
 Engines/Wine/Verbs/dotnet40/script.js    | 50 +++++++++++------------
 Engines/Wine/Verbs/dotnet45/script.js    | 35 ++++------------
 Engines/Wine/Verbs/dotnet452/script.js   | 32 +++++----------
 Engines/Wine/Verbs/dotnet46/script.js    | 51 ++++++++++++++++++++++++
 Engines/Wine/Verbs/dotnet46/script.json  | 14 +++++++
 Engines/Wine/Verbs/dotnet461/script.js   | 41 ++++++-------------
 Engines/Wine/Verbs/dotnet462/script.js   | 49 +++++++++++++++++++++++
 Engines/Wine/Verbs/dotnet462/script.json | 14 +++++++
 Engines/Wine/Verbs/dotnet472/script.js   | 51 ++++++++++++++++++++++++
 Engines/Wine/Verbs/dotnet472/script.json | 14 +++++++
 10 files changed, 246 insertions(+), 105 deletions(-)
 mode change 100644 => 100755 Engines/Wine/Verbs/dotnet40/script.js
 mode change 100644 => 100755 Engines/Wine/Verbs/dotnet45/script.js
 mode change 100644 => 100755 Engines/Wine/Verbs/dotnet452/script.js
 create mode 100755 Engines/Wine/Verbs/dotnet46/script.js
 create mode 100755 Engines/Wine/Verbs/dotnet46/script.json
 mode change 100644 => 100755 Engines/Wine/Verbs/dotnet461/script.js
 create mode 100755 Engines/Wine/Verbs/dotnet462/script.js
 create mode 100755 Engines/Wine/Verbs/dotnet462/script.json
 create mode 100755 Engines/Wine/Verbs/dotnet472/script.js
 create mode 100755 Engines/Wine/Verbs/dotnet472/script.json

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
old mode 100644
new mode 100755
index 7c28696a54..a258991d4b
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -3,12 +3,21 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "luna"]);
 include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "plugins", "windows_version"]);
 
 /**
 * Verb to install .NET 4.0
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet40 = function () {
+    if (this.architecture = "amd64") {
+        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
+    }
+
+    var OSVersion = this.windowsVersion();
+    if(OSVersion == null)
+        OSVersion = "winxp";
+
     var setupFile = new Resource()
         .wizard(this.wizard())
         .url("http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe")
@@ -18,44 +27,31 @@ Wine.prototype.dotnet40 = function () {
 
     this.uninstall("Mono");
 
-    this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
-
-    remove(this.system32directory() + "/mscoree.dll");
+    this.windowsVersion("winxp");
 
     this.overrideDLL()
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.0"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.0"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides", "/v", "*fusion", "/f"], null, false, true);
+
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
-    this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
-
-    return this;
-};
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\\v4\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
 
-/**
- * Verb to install .NET 4.0
-*/
-var verbImplementation = {
-    install: function (container) {
-        var wine = new Wine();
-        wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "dotnet40", java.util.Optional.empty());
-        wine.wizard(wizard);
-        wine.dotnet40();
-        wizard.close();
-    }
-};
+    this.wizard().wait(tr("Please wait while executing ngen..."));
+    this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe", "executequeueditems", null, false, true);
 
-/* exported Verb */
-var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
+    this.windowsVersion(OSVersion);
 
+    return this;
+};
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
old mode 100644
new mode 100755
index 40d5546ffc..e57b9e4e84
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -11,12 +11,13 @@ include(["engines", "wine", "verbs", "dotnet40"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet45 = function () {
-
-    if (this.architecture() == "amd64") {
-        throw "{0} cannot be installed in a 64bit wine prefix!".format("dotnet45");
+    if (this.architecture = "amd64") {
+        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
     }
 
     var OSVersion = this.windowsVersion();
+    if (OSVersion == null)
+        OSVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -27,11 +28,6 @@ Wine.prototype.dotnet45 = function () {
 
     this.uninstall("Mono");
 
-    this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
-
-    remove(this.system32directory() + "/mscoree.dll");
-
     this.dotnet40();
     this.windowsVersion("win7");
 
@@ -39,9 +35,12 @@ Wine.prototype.dotnet45 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.5"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
@@ -54,21 +53,3 @@ Wine.prototype.dotnet45 = function () {
 
     return this;
 };
-
-/**
- * Verb to install .NET 4.5
-*/
-var verbImplementation = {
-    install: function (container) {
-        var wine = new Wine();
-        wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "dotnet45", java.util.Optional.empty());
-        wine.wizard(wizard);
-        wine.dotnet45();
-        wizard.close();
-    }
-};
-
-/* exported Verb */
-var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
-
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
old mode 100644
new mode 100755
index 4fe897c802..d8319f153c
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -11,8 +11,13 @@ include(["engines", "wine", "verbs", "dotnet40"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet452 = function () {
+    if (this.architecture = "amd64") {
+        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet452"));
+    }
 
     var OSVersion = this.windowsVersion();
+    if (OSVersion == null)
+        OSVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -23,11 +28,6 @@ Wine.prototype.dotnet452 = function () {
 
     this.uninstall("Mono");
 
-    this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
-
-    remove(this.system32directory() + "/mscoree.dll");
-
     this.dotnet40();
     this.windowsVersion("win7");
 
@@ -35,9 +35,12 @@ Wine.prototype.dotnet452 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.5.2"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5.2"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
@@ -50,20 +53,3 @@ Wine.prototype.dotnet452 = function () {
 
     return this;
 };
-
-/**
- * Verb to install .NET 4.5.2
-*/
-var verbImplementation = {
-    install: function (container) {
-        var wine = new Wine();
-        wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "dotnet452", java.util.Optional.empty());
-        wine.wizard(wizard);
-        wine.dotnet452();
-        wizard.close();
-    }
-};
-
-/* exported Verb */
-var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
new file mode 100755
index 0000000000..24c275b875
--- /dev/null
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -0,0 +1,51 @@
+include(["engines", "wine", "engine", "object"]);
+include(["utils", "functions", "net", "resource"]);
+include(["engines", "wine", "verbs", "luna"]);
+include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "verbs", "dotnet45"]);
+include(["engines", "wine", "plugins", "override_dll"]);
+include(["engines", "wine", "plugins", "windows_version"]);
+
+/**
+* Verb to install .NET 4.6
+* @returns {Wine} Wine object
+*/
+Wine.prototype.dotnet46 = function () {
+    if (this.architecture = "amd64") {
+        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet46"));
+    }
+
+    var OSVersion = this.windowsVersion();
+    if (OSVersion == null)
+        OSVersion = "win7";
+
+    var setupFile = new Resource()
+        .wizard(this._wizard)
+        .url("https://download.microsoft.com/download/C/3/A/C3A5200B-D33C-47E9-9D70-2F7C65DAAD94/NDP46-KB3045557-x86-x64-AllOS-ENU.exe")
+        .checksum("3049a85843eaf65e89e2336d5fe6e85e416797be")
+        .name("NDP46-KB3045557-x86-x64-AllOS-ENU.exe")
+        .get();
+
+    this.uninstall("Mono");
+
+    this.dotnet45();
+    this.windowsVersion("win7");
+
+    this.overrideDLL()
+        .set("builtin", ["fusion"])
+        .do();
+
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.6"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
+
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+
+    this.overrideDLL()
+        .set("native", ["mscoree"])
+        .do();
+
+    this.windowsVersion(OSVersion);
+
+    return this;
+};
diff --git a/Engines/Wine/Verbs/dotnet46/script.json b/Engines/Wine/Verbs/dotnet46/script.json
new file mode 100755
index 0000000000..5e99142ab4
--- /dev/null
+++ b/Engines/Wine/Verbs/dotnet46/script.json
@@ -0,0 +1,14 @@
+{
+    "scriptName"                 : ".NET 4.6",
+    "id"                         : "dotnet46",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "free"          : true,
+    "requiresPatch" : false
+}
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
old mode 100644
new mode 100755
index 1a9d6eeb34..341d7e903b
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -2,14 +2,21 @@ include(["engines", "wine", "engine", "object"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "luna"]);
 include(["utils", "functions", "filesystem", "files"]);
-include(["engines", "wine", "verbs", "dotnet452"]);
+include(["engines", "wine", "verbs", "dotnet46"]);
 
 /**
 * Verb to install .NET 4.6.1
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet461 = function () {
+    if (this.architecture = "amd64") {
+        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet461"));
+    }
+
     var OSVersion = this.windowsVersion();
+    if (OSVersion == null)
+        OSVersion = "win7";
+
     var setupFile = new Resource()
         .wizard(this._wizard)
         .url("https://download.microsoft.com/download/E/4/1/E4173890-A24A-4936-9FC9-AF930FE3FA40/NDP461-KB3102436-x86-x64-AllOS-ENU.exe")
@@ -19,46 +26,24 @@ Wine.prototype.dotnet461 = function () {
 
     this.uninstall("Mono");
 
-    this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
-
-    remove(this.system32directory() + "/mscoree.dll");
-    this.dotnet452()
+    this.dotnet46();
     this.windowsVersion("win7");
 
     this.overrideDLL()
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.1"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.6.1"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
     this.windowsVersion(OSVersion);
 
-    if (OSVersion != "win2003") {
-        print(tr("{0} applications can have issues when windows version is not set to \"win2003\"", ".NET 4.6.1"));
-    }
     return this;
 };
-
-/**
- * Verb to install .NET 4.6.1
-*/
-var verbImplementation = {
-    install: function (container) {
-        var wine = new Wine();
-        wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "dotnet461", java.util.Optional.empty());
-        wine.wizard(wizard);
-        wine.dotnet461();
-        wizard.close();
-    }
-};
-
-/* exported Verb */
-var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
-
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
new file mode 100755
index 0000000000..ac08ca3ed9
--- /dev/null
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -0,0 +1,49 @@
+include(["engines", "wine", "engine", "object"]);
+include(["utils", "functions", "net", "resource"]);
+include(["engines", "wine", "verbs", "luna"]);
+include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "verbs", "dotnet461"]);
+
+/**
+* Verb to install .NET 4.6.2
+* @returns {Wine} Wine object
+*/
+Wine.prototype.dotnet462 = function () {
+    if (this.architecture = "amd64") {
+        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet462"));
+    }
+
+    var OSVersion = this.windowsVersion();
+    if (OSVersion == null)
+        OSVersion = "win7";
+
+    var setupFile = new Resource()
+        .wizard(this._wizard)
+        .url("https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe")
+        .checksum("a70f856bda33d45ad0a8ad035f73092441715431")
+        .name("NDP462-KB3151800-x86-x64-AllOS-ENU.exe")
+        .get();
+
+    this.uninstall("Mono");
+
+    this.dotnet461();
+    this.windowsVersion("win7");
+
+    this.overrideDLL()
+        .set("builtin", ["fusion"])
+        .do();
+
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.6.2"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
+
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+
+    this.overrideDLL()
+        .set("native", ["mscoree"])
+        .do();
+
+    this.windowsVersion(OSVersion);
+
+    return this;
+};
diff --git a/Engines/Wine/Verbs/dotnet462/script.json b/Engines/Wine/Verbs/dotnet462/script.json
new file mode 100755
index 0000000000..037e50184a
--- /dev/null
+++ b/Engines/Wine/Verbs/dotnet462/script.json
@@ -0,0 +1,14 @@
+{
+    "scriptName"                 : ".NET 4.6.2",
+    "id"                         : "dotnet462",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "free"          : true,
+    "requiresPatch" : false
+}
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
new file mode 100755
index 0000000000..db979f9229
--- /dev/null
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -0,0 +1,51 @@
+include(["engines", "wine", "engine", "object"]);
+include(["utils", "functions", "net", "resource"]);
+include(["engines", "wine", "verbs", "luna"]);
+include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "verbs", "dotnet462"]);
+include(["engines", "wine", "plugins", "override_dll"]);
+include(["engines", "wine", "plugins", "windows_version"]);
+
+/**
+* Verb to install .NET 4.7.2
+* @returns {Wine} Wine object
+*/
+Wine.prototype.dotnet471 = function () {
+    if (this.architecture = "x86") {
+        print(tr("This package ({0}) may not fully work on a 32-bit installation. 64-bit prefixes may work better.", "dotnet472"));
+    }
+
+    var OSVersion = this.windowsVersion();
+    if (OSVersion == null)
+        OSVersion = "win7";
+
+    var setupFile = new Resource()
+        .wizard(this._wizard)
+        .url("https://download.microsoft.com/download/6/E/4/6E48E8AB-DC00-419E-9704-06DD46E5F81D/NDP472-KB4054530-x86-x64-AllOS-ENU.exe")
+        .checksum("31fc0d305a6f651c9e892c98eb10997ae885eb1e")
+        .name("NDP472-KB4054530-x86-x64-AllOS-ENU.exe")
+        .get();
+
+    this.uninstall("Mono");
+
+    this.dotnet462();
+    this.windowsVersion("win7");
+
+    this.overrideDLL()
+        .set("builtin", ["fusion"])
+        .do();
+
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.7.2"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
+
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+
+    this.overrideDLL()
+        .set("native", ["mscoree"])
+        .do();
+
+    this.windowsVersion(OSVersion);
+
+    return this;
+};
diff --git a/Engines/Wine/Verbs/dotnet472/script.json b/Engines/Wine/Verbs/dotnet472/script.json
new file mode 100755
index 0000000000..6c0b9734ff
--- /dev/null
+++ b/Engines/Wine/Verbs/dotnet472/script.json
@@ -0,0 +1,14 @@
+{
+    "scriptName"                 : ".NET 4.7.2",
+    "id"                         : "dotnet472",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "free"          : true,
+    "requiresPatch" : false
+}

From bf1bc6bfea2fc97fc26ff25cd7775d5d5cea6381 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 21 Jan 2019 18:49:31 +0100
Subject: [PATCH 03/51] Update dotnet 2

---
 Engines/Wine/Verbs/dotnet40/script.js  | 19 ++++++++++++++++++-
 Engines/Wine/Verbs/dotnet45/script.js  | 17 +++++++++++++++++
 Engines/Wine/Verbs/dotnet452/script.js | 17 +++++++++++++++++
 Engines/Wine/Verbs/dotnet46/script.js  | 17 +++++++++++++++++
 Engines/Wine/Verbs/dotnet461/script.js | 17 +++++++++++++++++
 Engines/Wine/Verbs/dotnet462/script.js | 17 +++++++++++++++++
 Engines/Wine/Verbs/dotnet472/script.js | 17 +++++++++++++++++
 7 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index a258991d4b..7b7d223743 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -15,7 +15,7 @@ Wine.prototype.dotnet40 = function () {
     }
 
     var OSVersion = this.windowsVersion();
-    if(OSVersion == null)
+    if (OSVersion == null)
         OSVersion = "winxp";
 
     var setupFile = new Resource()
@@ -55,3 +55,20 @@ Wine.prototype.dotnet40 = function () {
 
     return this;
 };
+
+/**
+ * Verb to install xact
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "dotnet40", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.dotnet40();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index e57b9e4e84..6412b07932 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -53,3 +53,20 @@ Wine.prototype.dotnet45 = function () {
 
     return this;
 };
+
+/**
+ * Verb to install xact
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "dotnet45", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.dotnet45();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index d8319f153c..f9606a1e41 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -53,3 +53,20 @@ Wine.prototype.dotnet452 = function () {
 
     return this;
 };
+
+/**
+ * Verb to install xact
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "dotnet452", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.dotnet452();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 24c275b875..4ce0f38f1d 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -49,3 +49,20 @@ Wine.prototype.dotnet46 = function () {
 
     return this;
 };
+
+/**
+ * Verb to install xact
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "dotnet46", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.dotnet46();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 341d7e903b..5609be93d4 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -47,3 +47,20 @@ Wine.prototype.dotnet461 = function () {
 
     return this;
 };
+
+/**
+ * Verb to install xact
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "dotnet461", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.dotnet461();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index ac08ca3ed9..94b1a409d4 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -47,3 +47,20 @@ Wine.prototype.dotnet462 = function () {
 
     return this;
 };
+
+/**
+ * Verb to install xact
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "dotnet462", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.dotnet462();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index db979f9229..e4888d7ec6 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -49,3 +49,20 @@ Wine.prototype.dotnet471 = function () {
 
     return this;
 };
+
+/**
+ * Verb to install xact
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "dotnet472", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.dotnet472();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);

From 13353cfab9c6fd5256dadf767ce5b82b489f1765 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 21 Jan 2019 18:51:17 +0100
Subject: [PATCH 04/51] Update dotnet 3

---
 Engines/Wine/Verbs/dotnet40/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 7b7d223743..07f8ad2b3d 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -33,7 +33,7 @@ Wine.prototype.dotnet40 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.0"));
+    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.0"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait ..."));

From 1a249af235de8784ec2e2b1d31945d794cfc2455 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 21 Jan 2019 18:54:43 +0100
Subject: [PATCH 05/51] Update dotnet 4

---
 Engines/Wine/Verbs/dotnet40/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 07f8ad2b3d..938f978493 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -46,7 +46,7 @@ Wine.prototype.dotnet40 = function () {
     this.wizard().wait(tr("Please wait ..."));
     this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
     this.wizard().wait(tr("Please wait ..."));
-    this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\\v4\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
+    this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
 
     this.wizard().wait(tr("Please wait while executing ngen..."));
     this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe", "executequeueditems", null, false, true);

From 09d0b7c55cbbb4cc32483bb4571dedacd03b9abb Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 21 Jan 2019 18:58:11 +0100
Subject: [PATCH 06/51] Update dotnet 5

---
 Engines/Wine/Verbs/dotnet40/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet45/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet452/script.js | 2 +-
 Engines/Wine/Verbs/dotnet46/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet461/script.js | 2 +-
 Engines/Wine/Verbs/dotnet462/script.js | 2 +-
 Engines/Wine/Verbs/dotnet472/script.js | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 938f978493..c52e9c6fb4 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -57,7 +57,7 @@ Wine.prototype.dotnet40 = function () {
 };
 
 /**
- * Verb to install xact
+ * Verb to install dotnet40
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 6412b07932..058ad95291 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -55,7 +55,7 @@ Wine.prototype.dotnet45 = function () {
 };
 
 /**
- * Verb to install xact
+ * Verb to install dotnet45
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index f9606a1e41..b24d7d58a3 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -55,7 +55,7 @@ Wine.prototype.dotnet452 = function () {
 };
 
 /**
- * Verb to install xact
+ * Verb to install dotnet452
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 4ce0f38f1d..d94952e314 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -51,7 +51,7 @@ Wine.prototype.dotnet46 = function () {
 };
 
 /**
- * Verb to install xact
+ * Verb to install dotnet46
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 5609be93d4..13464415d3 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -49,7 +49,7 @@ Wine.prototype.dotnet461 = function () {
 };
 
 /**
- * Verb to install xact
+ * Verb to install dotnet461
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 94b1a409d4..c057461e4f 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -49,7 +49,7 @@ Wine.prototype.dotnet462 = function () {
 };
 
 /**
- * Verb to install xact
+ * Verb to install dotnet462
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index e4888d7ec6..2bdbc26eae 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -51,7 +51,7 @@ Wine.prototype.dotnet471 = function () {
 };
 
 /**
- * Verb to install xact
+ * Verb to install dotnet472
 */
 var verbImplementation = {
     install: function (container) {

From a068712b02f484daca33adcfd8ba50bf9d4e7213 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 21 Jan 2019 19:00:19 +0100
Subject: [PATCH 07/51] Update dotnet 6

---
 Engines/Wine/Verbs/dotnet45/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet452/script.js | 2 +-
 Engines/Wine/Verbs/dotnet46/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet461/script.js | 2 +-
 Engines/Wine/Verbs/dotnet462/script.js | 2 +-
 Engines/Wine/Verbs/dotnet472/script.js | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 058ad95291..503d8245ce 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -35,7 +35,7 @@ Wine.prototype.dotnet45 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5"));
+    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.5"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait ..."));
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index b24d7d58a3..25f8d2baf1 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -35,7 +35,7 @@ Wine.prototype.dotnet452 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5.2"));
+    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.5.2"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait ..."));
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index d94952e314..5cb4050335 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -35,7 +35,7 @@ Wine.prototype.dotnet46 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.6"));
+    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait ..."));
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 13464415d3..81ef312c4f 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -33,7 +33,7 @@ Wine.prototype.dotnet461 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.6.1"));
+    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.1"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait ..."));
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index c057461e4f..9b1cb4450f 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -33,7 +33,7 @@ Wine.prototype.dotnet462 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.6.2"));
+    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.2"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait ..."));
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 2bdbc26eae..6c6b6762de 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -35,7 +35,7 @@ Wine.prototype.dotnet471 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.7.2"));
+    this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.7.2"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait ..."));

From ca65bb0c27692e6bafe3351df514b07fc51bc1be Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 21 Jan 2019 19:03:25 +0100
Subject: [PATCH 08/51] Update dotnet 7

---
 Engines/Wine/Verbs/dotnet40/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet45/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet452/script.js | 2 +-
 Engines/Wine/Verbs/dotnet46/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet461/script.js | 2 +-
 Engines/Wine/Verbs/dotnet462/script.js | 2 +-
 Engines/Wine/Verbs/dotnet472/script.js | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index c52e9c6fb4..0f16059009 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -57,7 +57,7 @@ Wine.prototype.dotnet40 = function () {
 };
 
 /**
- * Verb to install dotnet40
+ * Verb to install .NET 4.0
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 503d8245ce..6d6cdf5cb7 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -55,7 +55,7 @@ Wine.prototype.dotnet45 = function () {
 };
 
 /**
- * Verb to install dotnet45
+ * Verb to install .NET 4.5
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 25f8d2baf1..6dcce3fdd0 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -55,7 +55,7 @@ Wine.prototype.dotnet452 = function () {
 };
 
 /**
- * Verb to install dotnet452
+ * Verb to install .NET 4.5.2
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 5cb4050335..3d174acdb5 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -51,7 +51,7 @@ Wine.prototype.dotnet46 = function () {
 };
 
 /**
- * Verb to install dotnet46
+ * Verb to install .NET 4.6
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 81ef312c4f..95ba4c4c87 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -49,7 +49,7 @@ Wine.prototype.dotnet461 = function () {
 };
 
 /**
- * Verb to install dotnet461
+ * Verb to install .NET 4.6.1
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 9b1cb4450f..2b7e217ff3 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -49,7 +49,7 @@ Wine.prototype.dotnet462 = function () {
 };
 
 /**
- * Verb to install dotnet462
+ * Verb to install .NET 4.6.2
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 6c6b6762de..561b381b4d 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -51,7 +51,7 @@ Wine.prototype.dotnet471 = function () {
 };
 
 /**
- * Verb to install dotnet472
+ * Verb to install .NET 4.7.2
 */
 var verbImplementation = {
     install: function (container) {

From 22346f16617d85bc67a1cd3fad5a4ded440de6da Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Tue, 22 Jan 2019 15:02:37 +0100
Subject: [PATCH 09/51] Update script.js

---
 Engines/Wine/Verbs/dotnet472/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 561b381b4d..642dd7c7eb 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -10,7 +10,7 @@ include(["engines", "wine", "plugins", "windows_version"]);
 * Verb to install .NET 4.7.2
 * @returns {Wine} Wine object
 */
-Wine.prototype.dotnet471 = function () {
+Wine.prototype.dotnet472 = function () {
     if (this.architecture = "x86") {
         print(tr("This package ({0}) may not fully work on a 32-bit installation. 64-bit prefixes may work better.", "dotnet472"));
     }

From 7320fc8dbf26d6492e325e4bf26210465e718a04 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 12:57:39 +0100
Subject: [PATCH 10/51] Update script.js

---
 Engines/Wine/Verbs/dotnet461/script.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 95ba4c4c87..00c90cff4f 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -9,13 +9,13 @@ include(["engines", "wine", "verbs", "dotnet46"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet461 = function () {
-    if (this.architecture = "amd64") {
+    if (this.architecture == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet461"));
     }
 
-    var OSVersion = this.windowsVersion();
-    if (OSVersion == null)
-        OSVersion = "win7";
+    var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -36,14 +36,14 @@ Wine.prototype.dotnet461 = function () {
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.1"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.windowsVersion(OSVersion);
+    this.windowsVersion(osVersion);
 
     return this;
 };

From 692cf22525379dfd0cefaad72fbcbf7ab19eedd6 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 12:59:24 +0100
Subject: [PATCH 11/51] Update script.js

---
 Engines/Wine/Verbs/dotnet40/script.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 0f16059009..4ce38b6172 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -14,9 +14,9 @@ Wine.prototype.dotnet40 = function () {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
     }
 
-    var OSVersion = this.windowsVersion();
-    if (OSVersion == null)
-        OSVersion = "winxp";
+    var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "winxp";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -36,22 +36,23 @@ Wine.prototype.dotnet40 = function () {
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.0"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides", "/v", "*fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
+    
+    //This is in winetricks source, but does not seem to work
+    //this.wizard().wait(tr("Please wait while executing ngen..."));
+    //this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe", "executequeueditems", null, false, true);
 
-    this.wizard().wait(tr("Please wait while executing ngen..."));
-    this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe", "executequeueditems", null, false, true);
-
-    this.windowsVersion(OSVersion);
+    this.windowsVersion(osVersion);
 
     return this;
 };

From 79b76c4ff80776255b0219be75022b7b7251c457 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:00:02 +0100
Subject: [PATCH 12/51] Update script.js

---
 Engines/Wine/Verbs/dotnet45/script.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 6d6cdf5cb7..8da3deba82 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -15,9 +15,9 @@ Wine.prototype.dotnet45 = function () {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
     }
 
-    var OSVersion = this.windowsVersion();
-    if (OSVersion == null)
-        OSVersion = "win7";
+    var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -38,16 +38,16 @@ Wine.prototype.dotnet45 = function () {
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.5"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.windowsVersion(OSVersion);
+    this.windowsVersion(osVersion);
 
-    if (OSVersion != "win2003") {
+    if (osVersion != "win2003") {
         print(tr("{0} applications can have issues when windows version is not set to \"win2003\"", ".NET 4.5"));
     }
 

From 0076729d31a28a9405fe59f53b8416fd1377b21a Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:00:35 +0100
Subject: [PATCH 13/51] Update script.js

---
 Engines/Wine/Verbs/dotnet452/script.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 6dcce3fdd0..6a6dfd362b 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -15,9 +15,9 @@ Wine.prototype.dotnet452 = function () {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet452"));
     }
 
-    var OSVersion = this.windowsVersion();
-    if (OSVersion == null)
-        OSVersion = "win7";
+    var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -38,16 +38,16 @@ Wine.prototype.dotnet452 = function () {
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.5.2"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.windowsVersion(OSVersion);
+    this.windowsVersion(osVersion);
 
-    if (OSVersion != "win2003") {
+    if (osVersion != "win2003") {
         print(tr("{0} applications can have issues when windows version is not set to \"win2003\"", ".NET 4.5.2"));
     }
 

From 46b6f08d1a884b0ba4ee95954a9a83e425c56059 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:01:11 +0100
Subject: [PATCH 14/51] Update script.js

---
 Engines/Wine/Verbs/dotnet46/script.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 3d174acdb5..55858f66ca 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -15,9 +15,9 @@ Wine.prototype.dotnet46 = function () {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet46"));
     }
 
-    var OSVersion = this.windowsVersion();
-    if (OSVersion == null)
-        OSVersion = "win7";
+    var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -38,14 +38,14 @@ Wine.prototype.dotnet46 = function () {
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.windowsVersion(OSVersion);
+    this.windowsVersion(osVersion);
 
     return this;
 };

From 32c12d16aadd5ec60e7013442fbf91417306ba81 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:01:56 +0100
Subject: [PATCH 15/51] Update script.js

---
 Engines/Wine/Verbs/dotnet462/script.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 2b7e217ff3..d9849b445e 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -13,9 +13,9 @@ Wine.prototype.dotnet462 = function () {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet462"));
     }
 
-    var OSVersion = this.windowsVersion();
-    if (OSVersion == null)
-        OSVersion = "win7";
+    var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -36,14 +36,14 @@ Wine.prototype.dotnet462 = function () {
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.2"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.windowsVersion(OSVersion);
+    this.windowsVersion(osVersion);
 
     return this;
 };

From c47772b28cfce5d58ac560c966c4ee029fd670e0 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:02:23 +0100
Subject: [PATCH 16/51] Update script.js

---
 Engines/Wine/Verbs/dotnet472/script.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 642dd7c7eb..ace446704f 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -15,9 +15,9 @@ Wine.prototype.dotnet472 = function () {
         print(tr("This package ({0}) may not fully work on a 32-bit installation. 64-bit prefixes may work better.", "dotnet472"));
     }
 
-    var OSVersion = this.windowsVersion();
-    if (OSVersion == null)
-        OSVersion = "win7";
+    var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -38,14 +38,14 @@ Wine.prototype.dotnet472 = function () {
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.7.2"));
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
-    this.wizard().wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.windowsVersion(OSVersion);
+    this.windowsVersion(osVersion);
 
     return this;
 };

From dc139db575ed5d4c1856232356f9ec47173387f9 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:14:20 +0100
Subject: [PATCH 17/51] Fix script.json and delete override

---
 Engines/Wine/Verbs/dotnet45/script.js    | 2 +-
 Engines/Wine/Verbs/dotnet452/script.js   | 2 +-
 Engines/Wine/Verbs/dotnet46/script.js    | 2 +-
 Engines/Wine/Verbs/dotnet46/script.json  | 2 --
 Engines/Wine/Verbs/dotnet461/script.js   | 2 +-
 Engines/Wine/Verbs/dotnet461/script.json | 2 --
 Engines/Wine/Verbs/dotnet462/script.js   | 2 +-
 Engines/Wine/Verbs/dotnet462/script.json | 2 --
 Engines/Wine/Verbs/dotnet472/script.js   | 2 +-
 Engines/Wine/Verbs/dotnet472/script.json | 2 --
 10 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 8da3deba82..78ab621e8a 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -39,7 +39,7 @@ Wine.prototype.dotnet45 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 6a6dfd362b..81c9cb3b1d 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -39,7 +39,7 @@ Wine.prototype.dotnet452 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 55858f66ca..f6dace7695 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -39,7 +39,7 @@ Wine.prototype.dotnet46 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet46/script.json b/Engines/Wine/Verbs/dotnet46/script.json
index 5e99142ab4..c501259bbf 100755
--- a/Engines/Wine/Verbs/dotnet46/script.json
+++ b/Engines/Wine/Verbs/dotnet46/script.json
@@ -6,8 +6,6 @@
         "LINUX"
     ],
     "testingOperatingSystems" : [
-        "MACOSX",
-        "LINUX"
     ],
     "free"          : true,
     "requiresPatch" : false
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 00c90cff4f..ef911212ae 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -37,7 +37,7 @@ Wine.prototype.dotnet461 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet461/script.json b/Engines/Wine/Verbs/dotnet461/script.json
index 9bf4ab2fca..71fdc86854 100644
--- a/Engines/Wine/Verbs/dotnet461/script.json
+++ b/Engines/Wine/Verbs/dotnet461/script.json
@@ -6,8 +6,6 @@
         "LINUX"
     ],
     "testingOperatingSystems" : [
-        "MACOSX",
-        "LINUX"
     ],
     "free"          : true,
     "requiresPatch" : false
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index d9849b445e..d7fd32bfce 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -37,7 +37,7 @@ Wine.prototype.dotnet462 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet462/script.json b/Engines/Wine/Verbs/dotnet462/script.json
index 037e50184a..5240af859d 100755
--- a/Engines/Wine/Verbs/dotnet462/script.json
+++ b/Engines/Wine/Verbs/dotnet462/script.json
@@ -6,8 +6,6 @@
         "LINUX"
     ],
     "testingOperatingSystems" : [
-        "MACOSX",
-        "LINUX"
     ],
     "free"          : true,
     "requiresPatch" : false
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index ace446704f..b6ee7ab791 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -39,7 +39,7 @@ Wine.prototype.dotnet472 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\fusion", "/f"], null, false, true);
+    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet472/script.json b/Engines/Wine/Verbs/dotnet472/script.json
index 6c0b9734ff..5995139fbe 100755
--- a/Engines/Wine/Verbs/dotnet472/script.json
+++ b/Engines/Wine/Verbs/dotnet472/script.json
@@ -6,8 +6,6 @@
         "LINUX"
     ],
     "testingOperatingSystems" : [
-        "MACOSX",
-        "LINUX"
     ],
     "free"          : true,
     "requiresPatch" : false

From a3c38fefe705cc34877fe272c03e7da8753af41c Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:15:35 +0100
Subject: [PATCH 18/51] Fix script.json and delete override 2

---
 Engines/Wine/Verbs/dotnet46/script.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet46/script.json b/Engines/Wine/Verbs/dotnet46/script.json
index c501259bbf..db797bebd2 100755
--- a/Engines/Wine/Verbs/dotnet46/script.json
+++ b/Engines/Wine/Verbs/dotnet46/script.json
@@ -2,8 +2,6 @@
     "scriptName"                 : ".NET 4.6",
     "id"                         : "dotnet46",
     "compatibleOperatingSystems" : [
-        "MACOSX",
-        "LINUX"
     ],
     "testingOperatingSystems" : [
     ],

From 70b1b348f1d5abf2ddb10652f2c7fa892f6814b4 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Wed, 23 Jan 2019 13:21:24 +0100
Subject: [PATCH 19/51] Fix codacy

---
 Engines/Wine/Verbs/dotnet40/script.js    |  2 +-
 Engines/Wine/Verbs/dotnet46/script.json  | 10 ++++------
 Engines/Wine/Verbs/dotnet461/script.json |  7 +++----
 Engines/Wine/Verbs/dotnet462/script.json |  7 +++----
 Engines/Wine/Verbs/dotnet472/script.json |  7 +++----
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 4ce38b6172..0775062cbd 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -47,7 +47,7 @@ Wine.prototype.dotnet40 = function () {
     this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
     this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
-    
+
     //This is in winetricks source, but does not seem to work
     //this.wizard().wait(tr("Please wait while executing ngen..."));
     //this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe", "executequeueditems", null, false, true);
diff --git a/Engines/Wine/Verbs/dotnet46/script.json b/Engines/Wine/Verbs/dotnet46/script.json
index db797bebd2..1832fe6dae 100755
--- a/Engines/Wine/Verbs/dotnet46/script.json
+++ b/Engines/Wine/Verbs/dotnet46/script.json
@@ -1,10 +1,8 @@
 {
     "scriptName"                 : ".NET 4.6",
     "id"                         : "dotnet46",
-    "compatibleOperatingSystems" : [
-    ],
-    "testingOperatingSystems" : [
-    ],
-    "free"          : true,
-    "requiresPatch" : false
+    "compatibleOperatingSystems" : [],
+    "testingOperatingSystems"    : [],
+    "free"                       : true,
+    "requiresPatch"              : false
 }
diff --git a/Engines/Wine/Verbs/dotnet461/script.json b/Engines/Wine/Verbs/dotnet461/script.json
index 71fdc86854..39562f58b4 100644
--- a/Engines/Wine/Verbs/dotnet461/script.json
+++ b/Engines/Wine/Verbs/dotnet461/script.json
@@ -5,8 +5,7 @@
         "MACOSX",
         "LINUX"
     ],
-    "testingOperatingSystems" : [
-    ],
-    "free"          : true,
-    "requiresPatch" : false
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
 }
diff --git a/Engines/Wine/Verbs/dotnet462/script.json b/Engines/Wine/Verbs/dotnet462/script.json
index 5240af859d..24d84e54f5 100755
--- a/Engines/Wine/Verbs/dotnet462/script.json
+++ b/Engines/Wine/Verbs/dotnet462/script.json
@@ -5,8 +5,7 @@
         "MACOSX",
         "LINUX"
     ],
-    "testingOperatingSystems" : [
-    ],
-    "free"          : true,
-    "requiresPatch" : false
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
 }
diff --git a/Engines/Wine/Verbs/dotnet472/script.json b/Engines/Wine/Verbs/dotnet472/script.json
index 5995139fbe..487b4fc376 100755
--- a/Engines/Wine/Verbs/dotnet472/script.json
+++ b/Engines/Wine/Verbs/dotnet472/script.json
@@ -5,8 +5,7 @@
         "MACOSX",
         "LINUX"
     ],
-    "testingOperatingSystems" : [
-    ],
-    "free"          : true,
-    "requiresPatch" : false
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
 }

From 9fcb1cb802bdc78e0d4923e931f660197e25b082 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Thu, 24 Jan 2019 11:16:48 +0100
Subject: [PATCH 20/51] Fix ==

---
 Engines/Wine/Verbs/dotnet40/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet45/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet452/script.js | 2 +-
 Engines/Wine/Verbs/dotnet46/script.js  | 2 +-
 Engines/Wine/Verbs/dotnet462/script.js | 2 +-
 Engines/Wine/Verbs/dotnet472/script.js | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 0775062cbd..5722df4ae7 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -10,7 +10,7 @@ include(["engines", "wine", "plugins", "windows_version"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet40 = function () {
-    if (this.architecture = "amd64") {
+    if (this.architecture == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
     }
 
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 78ab621e8a..19d192a2f8 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "verbs", "dotnet40"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet45 = function () {
-    if (this.architecture = "amd64") {
+    if (this.architecture == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
     }
 
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 81c9cb3b1d..5d10833e72 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "verbs", "dotnet40"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet452 = function () {
-    if (this.architecture = "amd64") {
+    if (this.architecture == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet452"));
     }
 
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index f6dace7695..ddec32cd1f 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "plugins", "windows_version"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet46 = function () {
-    if (this.architecture = "amd64") {
+    if (this.architecture == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet46"));
     }
 
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index d7fd32bfce..8b85ee5901 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -9,7 +9,7 @@ include(["engines", "wine", "verbs", "dotnet461"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet462 = function () {
-    if (this.architecture = "amd64") {
+    if (this.architecture == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet462"));
     }
 
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index b6ee7ab791..63aa3af5aa 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "plugins", "windows_version"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet472 = function () {
-    if (this.architecture = "x86") {
+    if (this.architecture == "x86") {
         print(tr("This package ({0}) may not fully work on a 32-bit installation. 64-bit prefixes may work better.", "dotnet472"));
     }
 

From 17989d8644d8f6783a6e6bf1ff452fc1c0d73af7 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 28 Jan 2019 15:06:10 +0100
Subject: [PATCH 21/51] Include clean-up and regedit.patch()

---
 Engines/Wine/Verbs/dotnet40/script.js  | 14 +++++++++-----
 Engines/Wine/Verbs/dotnet45/script.js  |  2 --
 Engines/Wine/Verbs/dotnet452/script.js |  2 --
 Engines/Wine/Verbs/dotnet46/script.js  |  5 ++---
 Engines/Wine/Verbs/dotnet461/script.js |  4 ++--
 Engines/Wine/Verbs/dotnet462/script.js |  4 ++--
 Engines/Wine/Verbs/dotnet472/script.js |  5 ++---
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 5722df4ae7..592ae3847e 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -1,8 +1,7 @@
 include(["engines", "wine", "engine", "object"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
-include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "plugins", "regedit"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 
 /**
@@ -44,10 +43,15 @@ Wine.prototype.dotnet40 = function () {
         .do();
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
-    this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["add", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
+    var regeditFileContent = "REGEDIT4\n"                                                                      +
+                             "\n"                                                                              +
+                             "[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full]\n" +
+                             "\"Install\"=dword:0001\n"                                                        +
+                             "\"Version\"=\"4.0.30139\"";
 
+    this.regedit().patch(regeditFileContent);
+    print(regeditFileContent);
+    
     //This is in winetricks source, but does not seem to work
     //this.wizard().wait(tr("Please wait while executing ngen..."));
     //this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe", "executequeueditems", null, false, true);
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 19d192a2f8..81a9d693d2 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -2,8 +2,6 @@ include(["engines", "wine", "engine", "object"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
-include(["utils", "functions", "filesystem", "files"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
 
 /**
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 5d10833e72..45e9d44b70 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -2,8 +2,6 @@ include(["engines", "wine", "engine", "object"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
-include(["utils", "functions", "filesystem", "files"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
 
 /**
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index ddec32cd1f..c826fc955c 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -1,10 +1,9 @@
 include(["engines", "wine", "engine", "object"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
-include(["utils", "functions", "filesystem", "files"]);
-include(["engines", "wine", "verbs", "dotnet45"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
+include(["engines", "wine", "verbs", "dotnet45"]);
+
 
 /**
 * Verb to install .NET 4.6
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index ef911212ae..985823c58a 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -1,7 +1,7 @@
 include(["engines", "wine", "engine", "object"]);
+include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
-include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet46"]);
 
 /**
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 8b85ee5901..035187d9a8 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -1,7 +1,7 @@
 include(["engines", "wine", "engine", "object"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
-include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "plugins", "override_dll"]);
+include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet461"]);
 
 /**
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 63aa3af5aa..37a9dca4a2 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -1,10 +1,9 @@
 include(["engines", "wine", "engine", "object"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
-include(["utils", "functions", "filesystem", "files"]);
-include(["engines", "wine", "verbs", "dotnet462"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
+include(["engines", "wine", "verbs", "dotnet462"]);
+
 
 /**
 * Verb to install .NET 4.7.2

From de5ad53325c700bea1db7f338ffcec7ab543a8ee Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 28 Jan 2019 15:10:04 +0100
Subject: [PATCH 22/51] Remove check osVersion == null

---
 Engines/Wine/Verbs/dotnet40/script.js  | 2 --
 Engines/Wine/Verbs/dotnet45/script.js  | 2 --
 Engines/Wine/Verbs/dotnet452/script.js | 2 --
 Engines/Wine/Verbs/dotnet46/script.js  | 2 --
 Engines/Wine/Verbs/dotnet461/script.js | 2 --
 Engines/Wine/Verbs/dotnet462/script.js | 2 --
 Engines/Wine/Verbs/dotnet472/script.js | 2 --
 7 files changed, 14 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 592ae3847e..1066afc528 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet40 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "winxp";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 81a9d693d2..3856ee2d3d 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet45 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 45e9d44b70..d97cdc976c 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet452 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index c826fc955c..1d8eb86865 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -15,8 +15,6 @@ Wine.prototype.dotnet46 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 985823c58a..c3de4a3a06 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet461 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 035187d9a8..ea1cdd8764 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet462 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 37a9dca4a2..e161d8ecbc 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -15,8 +15,6 @@ Wine.prototype.dotnet472 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)

From c168ed0ec9b4e72e88996f484d167049676a2b9e Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Tue, 29 Jan 2019 08:02:36 +0100
Subject: [PATCH 23/51] Update script.js

---
 Engines/Wine/Verbs/dotnet40/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 1066afc528..4a771c2fb4 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -49,7 +49,7 @@ Wine.prototype.dotnet40 = function () {
 
     this.regedit().patch(regeditFileContent);
     print(regeditFileContent);
-    
+
     //This is in winetricks source, but does not seem to work
     //this.wizard().wait(tr("Please wait while executing ngen..."));
     //this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe", "executequeueditems", null, false, true);

From 152c94cf3261908995851f8831afd03ab76506ba Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 4 Feb 2019 11:17:50 +0100
Subject: [PATCH 24/51] Update script.js

---
 Engines/Wine/Verbs/dotnet40/script.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 4a771c2fb4..45435aecec 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -9,7 +9,7 @@ include(["engines", "wine", "plugins", "windows_version"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet40 = function () {
-    if (this.architecture == "amd64") {
+    if (this.architecture() == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
     }
 
@@ -48,7 +48,6 @@ Wine.prototype.dotnet40 = function () {
                              "\"Version\"=\"4.0.30139\"";
 
     this.regedit().patch(regeditFileContent);
-    print(regeditFileContent);
 
     //This is in winetricks source, but does not seem to work
     //this.wizard().wait(tr("Please wait while executing ngen..."));

From 08560598209bc27ed867a87d6f6897c6252f603a Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 4 Feb 2019 11:21:44 +0100
Subject: [PATCH 25/51] Update script.js

---
 Engines/Wine/Verbs/dotnet45/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 3856ee2d3d..cd7785841d 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -9,7 +9,7 @@ include(["engines", "wine", "verbs", "dotnet40"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet45 = function () {
-    if (this.architecture == "amd64") {
+    if (this.architecture() == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
     }
 

From 323c615d1807c6a5e6bd35a1b3df3f8908546872 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 4 Feb 2019 11:22:05 +0100
Subject: [PATCH 26/51] Update script.js

---
 Engines/Wine/Verbs/dotnet452/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index d97cdc976c..40c64d18a8 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -9,7 +9,7 @@ include(["engines", "wine", "verbs", "dotnet40"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet452 = function () {
-    if (this.architecture == "amd64") {
+    if (this.architecture() == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet452"));
     }
 

From e9fd74e7f9d2dfecfacb6c6392ba58fd9a2bcdef Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 4 Feb 2019 11:22:23 +0100
Subject: [PATCH 27/51] Update script.js

---
 Engines/Wine/Verbs/dotnet46/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 1d8eb86865..06bca9bd31 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -10,7 +10,7 @@ include(["engines", "wine", "verbs", "dotnet45"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet46 = function () {
-    if (this.architecture == "amd64") {
+    if (this.architecture() == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet46"));
     }
 

From dc1e4d2d2ad67e3f1110a5d268aac03ffb55d75e Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 4 Feb 2019 11:22:42 +0100
Subject: [PATCH 28/51] Update script.js

---
 Engines/Wine/Verbs/dotnet461/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index c3de4a3a06..49426a3729 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -9,7 +9,7 @@ include(["engines", "wine", "verbs", "dotnet46"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet461 = function () {
-    if (this.architecture == "amd64") {
+    if (this.architecture() == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet461"));
     }
 

From 6f9b410192570efbd50217916dcd59d9b4ceded8 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 4 Feb 2019 11:22:59 +0100
Subject: [PATCH 29/51] Update script.js

---
 Engines/Wine/Verbs/dotnet462/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index ea1cdd8764..c14cd99c72 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -9,7 +9,7 @@ include(["engines", "wine", "verbs", "dotnet461"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet462 = function () {
-    if (this.architecture == "amd64") {
+    if (this.architecture() == "amd64") {
         print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet462"));
     }
 

From 09ba9661be4c3bd269356c7fb1ea549d2f91009b Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Mon, 4 Feb 2019 11:23:17 +0100
Subject: [PATCH 30/51] Update script.js

---
 Engines/Wine/Verbs/dotnet472/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index e161d8ecbc..7a1ec8e940 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -10,7 +10,7 @@ include(["engines", "wine", "verbs", "dotnet462"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet472 = function () {
-    if (this.architecture == "x86") {
+    if (this.architecture() == "x86") {
         print(tr("This package ({0}) may not fully work on a 32-bit installation. 64-bit prefixes may work better.", "dotnet472"));
     }
 

From 205e99f10e5e7defca2b68e640650d81a721b1c1 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Tue, 5 Feb 2019 20:50:21 +0100
Subject: [PATCH 31/51] Update dotnet46* install args

---
 Engines/Wine/Verbs/dotnet461/script.js | 2 +-
 Engines/Wine/Verbs/dotnet462/script.js | 2 +-
 Engines/Wine/Verbs/dotnet472/script.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 49426a3729..de2f0ec849 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -32,7 +32,7 @@ Wine.prototype.dotnet461 = function () {
         .do();
 
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.1"));
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
+    this.run(setupFile, [setupFile, "/sfxlang:1027", "/q", "/norestart"], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index c14cd99c72..2ffc983826 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -32,7 +32,7 @@ Wine.prototype.dotnet462 = function () {
         .do();
 
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.2"));
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
+    this.run(setupFile, [setupFile, "/sfxlang:1027", "/q", "/norestart"], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 7a1ec8e940..0a1546f17b 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -33,7 +33,7 @@ Wine.prototype.dotnet472 = function () {
         .do();
 
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.7.2"));
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
+    this.run(setupFile, [setupFile, "/sfxlang:1027", "/q", "/norestart"], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);

From 83d1b8689f78385495166b500b1b6e6901c3ef0e Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sat, 9 Feb 2019 15:38:03 +0100
Subject: [PATCH 32/51] Add a verb to remove mono in a clean way (winetricks)

---
 Engines/Wine/Verbs/Remove Mono/script.js   | 44 ++++++++++++++++++++++
 Engines/Wine/Verbs/Remove Mono/script.json | 11 ++++++
 Engines/Wine/Verbs/dotnet20/script.js      | 22 ++++++++---
 Engines/Wine/Verbs/dotnet40/script.js      |  5 ++-
 Engines/Wine/Verbs/dotnet45/script.js      |  3 +-
 Engines/Wine/Verbs/dotnet452/script.js     |  3 +-
 Engines/Wine/Verbs/dotnet46/script.js      |  3 +-
 Engines/Wine/Verbs/dotnet461/script.js     |  3 +-
 Engines/Wine/Verbs/dotnet462/script.js     |  3 +-
 Engines/Wine/Verbs/dotnet472/script.js     |  8 ++--
 10 files changed, 89 insertions(+), 16 deletions(-)
 create mode 100644 Engines/Wine/Verbs/Remove Mono/script.js
 create mode 100644 Engines/Wine/Verbs/Remove Mono/script.json

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
new file mode 100644
index 0000000000..0c7504c698
--- /dev/null
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -0,0 +1,44 @@
+include(["engines", "wine", "engine", "object"]);
+include(["utils", "functions", "filesystem", "files"]);
+
+/**
+* Verb to remove mono
+* @returns {Wine} Wine object
+*/
+Wine.prototype.remove_mono = function () {
+    this.uninstall("Mono");
+    
+    this.wizard().wait(tr("Please wait..."));
+    this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled", "/f"], null, false, true);
+
+    this.wizard().wait(tr("Please wait..."));
+    this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5", "/f"], null, false, true);
+    
+    this.wizard().wait(tr("Please wait..."));
+    this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4", "/f"], null, false, true);
+
+    remove(this.system32directory() + "/mscoree.dll");
+    if(this.architecture() == "amd64")
+    {
+        remove(this.system64directory() + "/mscoree.dll"); 
+    }
+    
+    return this;
+};
+
+/**
+ * Verb to install remove mono
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "remove_mono", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.remove_mono();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
diff --git a/Engines/Wine/Verbs/Remove Mono/script.json b/Engines/Wine/Verbs/Remove Mono/script.json
new file mode 100644
index 0000000000..e91184fb50
--- /dev/null
+++ b/Engines/Wine/Verbs/Remove Mono/script.json	
@@ -0,0 +1,11 @@
+{
+    "scriptName"                 : "Remove Mono",
+    "id"                         : "remove_mono",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
+}
diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index efacb0d4f5..fbe2e9bcdf 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -1,28 +1,34 @@
 include(["engines", "wine", "engine", "object"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "luna"]);
 include(["utils", "functions", "filesystem", "files"]);
 include(["engines", "wine", "plugins", "windows_version"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 2.0
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet20 = function () {
+    var osVersion = this.windowsVersion();
+    
     if (this.architecture() == "x86") {
         this.windowsVersion("win2k");
+        
         var setupFile = new Resource()
             .wizard(this.wizard())
             .url("https://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe")
             .checksum("a3625c59d7a2995fb60877b5f5324892a1693b2a")
             .name("dotnetfx.exe")
             .get();
-        this.uninstall("Mono");
-        remove(this.system32directory() + "/mscoree.dll");
+            
+        this.remove_mono();
+        
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true);
-        this.windowsVersion("win7");
+        
+        this.windowsVersion(osVersion);
+        
         remove(this.system32directory() + "/msvcr80.dll");
         remove(this.system32directory() + "/msvcm80.dll");
         remove(this.system32directory() + "/msvcp80.dll");
@@ -34,10 +40,16 @@ Wine.prototype.dotnet20 = function () {
             .checksum("e59cca309463a5d98daeaada83d1b05fed5126c5")
             .name("NetFx64.exe")
             .get();
-        this.uninstall("Mono");
+            
+        this.remove_mono();
+        
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true)
     }
+    
+    //This is in winetricks source, but does not seem to work
+    //this.wizard().wait(tr("Please wait while executing ngen..."));
+    //this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe", "executequeueditems", null, false, true);
 
     return this;
 };
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 45435aecec..98c5a70516 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -3,6 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "regedit"]);
 include(["engines", "wine", "plugins", "windows_version"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 4.0
@@ -22,7 +23,7 @@ Wine.prototype.dotnet40 = function () {
         .name("dotNetFx40_Full_x86_x64.exe")
         .get();
 
-    this.uninstall("Mono");
+    this.remove_mono();
 
     this.windowsVersion("winxp");
 
@@ -45,7 +46,7 @@ Wine.prototype.dotnet40 = function () {
                              "\n"                                                                              +
                              "[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full]\n" +
                              "\"Install\"=dword:0001\n"                                                        +
-                             "\"Version\"=\"4.0.30139\"";
+                             "\"Version\"=\"4.0.30319\"";
 
     this.regedit().patch(regeditFileContent);
 
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index cd7785841d..cdca2dc704 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -3,6 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 4.5
@@ -22,7 +23,7 @@ Wine.prototype.dotnet45 = function () {
         .name("dotnetfx45_full_x86_x64.exe")
         .get();
 
-    this.uninstall("Mono");
+    this.remove_mono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 40c64d18a8..826bb5495b 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -3,6 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 4.5.2
@@ -22,7 +23,7 @@ Wine.prototype.dotnet452 = function () {
         .name("NDP452-KB2901907-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.uninstall("Mono");
+    this.remove_mono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 06bca9bd31..e048c7f219 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -3,6 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet45"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 
 /**
@@ -23,7 +24,7 @@ Wine.prototype.dotnet46 = function () {
         .name("NDP46-KB3045557-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.uninstall("Mono");
+    this.remove_mono();
 
     this.dotnet45();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index de2f0ec849..53d9fa4b99 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -3,6 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet46"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 4.6.1
@@ -22,7 +23,7 @@ Wine.prototype.dotnet461 = function () {
         .name("NDP461-KB3102436-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.uninstall("Mono");
+    this.remove_mono();
 
     this.dotnet46();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 2ffc983826..903abfe2cd 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -3,6 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet461"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 4.6.2
@@ -22,7 +23,7 @@ Wine.prototype.dotnet462 = function () {
         .name("NDP462-KB3151800-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.uninstall("Mono");
+    this.remove_mono();
 
     this.dotnet461();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 0a1546f17b..1827d5f885 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -3,15 +3,15 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet462"]);
-
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 4.7.2
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet472 = function () {
-    if (this.architecture() == "x86") {
-        print(tr("This package ({0}) may not fully work on a 32-bit installation. 64-bit prefixes may work better.", "dotnet472"));
+    if (this.architecture() == "amd64") {
+        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet472"));
     }
 
     var osVersion = this.windowsVersion();
@@ -23,7 +23,7 @@ Wine.prototype.dotnet472 = function () {
         .name("NDP472-KB4054530-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.uninstall("Mono");
+    this.remove_mono();
 
     this.dotnet462();
     this.windowsVersion("win7");

From 12e3d687af1c1281e05e49031981b7d07b993ab4 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sat, 9 Feb 2019 15:40:00 +0100
Subject: [PATCH 33/51] Run npm tools

---
 Engines/Wine/Verbs/Remove Mono/script.js | 10 +++++-----
 Engines/Wine/Verbs/dotnet20/script.js    | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index 0c7504c698..018ae2ba09 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -7,22 +7,22 @@ include(["utils", "functions", "filesystem", "files"]);
 */
 Wine.prototype.remove_mono = function () {
     this.uninstall("Mono");
-    
+
     this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled", "/f"], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5", "/f"], null, false, true);
-    
+
     this.wizard().wait(tr("Please wait..."));
     this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4", "/f"], null, false, true);
 
     remove(this.system32directory() + "/mscoree.dll");
-    if(this.architecture() == "amd64")
+    if (this.architecture() == "amd64")
     {
-        remove(this.system64directory() + "/mscoree.dll"); 
+        remove(this.system64directory() + "/mscoree.dll");
     }
-    
+
     return this;
 };
 
diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index fbe2e9bcdf..c5a29d3dc6 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -11,24 +11,24 @@ include(["engines", "wine", "verbs", "remove_mono"]);
 */
 Wine.prototype.dotnet20 = function () {
     var osVersion = this.windowsVersion();
-    
+
     if (this.architecture() == "x86") {
         this.windowsVersion("win2k");
-        
+
         var setupFile = new Resource()
             .wizard(this.wizard())
             .url("https://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe")
             .checksum("a3625c59d7a2995fb60877b5f5324892a1693b2a")
             .name("dotnetfx.exe")
             .get();
-            
+
         this.remove_mono();
-        
+
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true);
-        
+
         this.windowsVersion(osVersion);
-        
+
         remove(this.system32directory() + "/msvcr80.dll");
         remove(this.system32directory() + "/msvcm80.dll");
         remove(this.system32directory() + "/msvcp80.dll");
@@ -40,13 +40,13 @@ Wine.prototype.dotnet20 = function () {
             .checksum("e59cca309463a5d98daeaada83d1b05fed5126c5")
             .name("NetFx64.exe")
             .get();
-            
+
         this.remove_mono();
-        
+
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true)
     }
-    
+
     //This is in winetricks source, but does not seem to work
     //this.wizard().wait(tr("Please wait while executing ngen..."));
     //this.run(this.prefixDirectory() + "/drive_c/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe", "executequeueditems", null, false, true);

From c8c43c481d4c370790c4d39b9f4daf2e2e2628aa Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sat, 9 Feb 2019 15:47:28 +0100
Subject: [PATCH 34/51] YouHOU camelCase !

---
 Engines/Wine/Verbs/Remove Mono/script.js   | 6 +++---
 Engines/Wine/Verbs/Remove Mono/script.json | 2 +-
 Engines/Wine/Verbs/dotnet20/script.js      | 4 ++--
 Engines/Wine/Verbs/dotnet40/script.js      | 2 +-
 Engines/Wine/Verbs/dotnet45/script.js      | 4 ++--
 Engines/Wine/Verbs/dotnet452/script.js     | 4 ++--
 Engines/Wine/Verbs/dotnet46/script.js      | 4 ++--
 Engines/Wine/Verbs/dotnet461/script.js     | 4 ++--
 Engines/Wine/Verbs/dotnet462/script.js     | 4 ++--
 Engines/Wine/Verbs/dotnet472/script.js     | 4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index 018ae2ba09..34e02ac999 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -5,7 +5,7 @@ include(["utils", "functions", "filesystem", "files"]);
 * Verb to remove mono
 * @returns {Wine} Wine object
 */
-Wine.prototype.remove_mono = function () {
+Wine.prototype.removeMono = function () {
     this.uninstall("Mono");
 
     this.wizard().wait(tr("Please wait..."));
@@ -33,9 +33,9 @@ var verbImplementation = {
     install: function (container) {
         var wine = new Wine();
         wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "remove_mono", java.util.Optional.empty());
+        var wizard = SetupWizard(InstallationType.VERBS, "removeMono", java.util.Optional.empty());
         wine.wizard(wizard);
-        wine.remove_mono();
+        wine.removeMono();
         wizard.close();
     }
 };
diff --git a/Engines/Wine/Verbs/Remove Mono/script.json b/Engines/Wine/Verbs/Remove Mono/script.json
index e91184fb50..eaca779c8e 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.json	
+++ b/Engines/Wine/Verbs/Remove Mono/script.json	
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : "Remove Mono",
-    "id"                         : "remove_mono",
+    "id"                         : "removeMono",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index c5a29d3dc6..a33187c35e 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["utils", "functions", "filesystem", "files"]);
 include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 /**
 * Verb to install .NET 2.0
@@ -22,7 +22,7 @@ Wine.prototype.dotnet20 = function () {
             .name("dotnetfx.exe")
             .get();
 
-        this.remove_mono();
+        this.removeMono();
 
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true);
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 98c5a70516..ec60b02859 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "regedit"]);
 include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 /**
 * Verb to install .NET 4.0
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index cdca2dc704..72b2f8e0ce 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 /**
 * Verb to install .NET 4.5
@@ -23,7 +23,7 @@ Wine.prototype.dotnet45 = function () {
         .name("dotnetfx45_full_x86_x64.exe")
         .get();
 
-    this.remove_mono();
+    this.removeMono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 826bb5495b..ff240107a6 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 /**
 * Verb to install .NET 4.5.2
@@ -23,7 +23,7 @@ Wine.prototype.dotnet452 = function () {
         .name("NDP452-KB2901907-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.remove_mono();
+    this.removeMono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index e048c7f219..ba09c9b0c4 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet45"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 
 /**
@@ -24,7 +24,7 @@ Wine.prototype.dotnet46 = function () {
         .name("NDP46-KB3045557-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.remove_mono();
+    this.removeMono();
 
     this.dotnet45();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 53d9fa4b99..84b97323d8 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet46"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 /**
 * Verb to install .NET 4.6.1
@@ -23,7 +23,7 @@ Wine.prototype.dotnet461 = function () {
         .name("NDP461-KB3102436-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.remove_mono();
+    this.removeMono();
 
     this.dotnet46();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 903abfe2cd..1ad12d8c17 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet461"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 /**
 * Verb to install .NET 4.6.2
@@ -23,7 +23,7 @@ Wine.prototype.dotnet462 = function () {
         .name("NDP462-KB3151800-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.remove_mono();
+    this.removeMono();
 
     this.dotnet461();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 1827d5f885..ed4a346a77 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet462"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include(["engines", "wine", "verbs", "removeMono"]);
 
 /**
 * Verb to install .NET 4.7.2
@@ -23,7 +23,7 @@ Wine.prototype.dotnet472 = function () {
         .name("NDP472-KB4054530-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.remove_mono();
+    this.removeMono();
 
     this.dotnet462();
     this.windowsVersion("win7");

From 7e63fd2ffcfe1df9d5e404e292f32143b56e40d7 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sat, 9 Feb 2019 15:54:30 +0100
Subject: [PATCH 35/51] Oops

---
 Engines/Wine/Verbs/dotnet40/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index ec60b02859..1e49c3b7fb 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -23,7 +23,7 @@ Wine.prototype.dotnet40 = function () {
         .name("dotNetFx40_Full_x86_x64.exe")
         .get();
 
-    this.remove_mono();
+    this.removeMono();
 
     this.windowsVersion("winxp");
 

From f1eb601af2301100260d4f78d8deaafd2ff4749f Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sat, 9 Feb 2019 16:19:34 +0100
Subject: [PATCH 36/51] Travis are you happy?

---
 Engines/Wine/Verbs/Remove Mono/script.js   | 6 +++---
 Engines/Wine/Verbs/Remove Mono/script.json | 2 +-
 Engines/Wine/Verbs/dotnet20/script.js      | 4 ++--
 Engines/Wine/Verbs/dotnet40/script.js      | 4 ++--
 Engines/Wine/Verbs/dotnet45/script.js      | 4 ++--
 Engines/Wine/Verbs/dotnet452/script.js     | 4 ++--
 Engines/Wine/Verbs/dotnet46/script.js      | 4 ++--
 Engines/Wine/Verbs/dotnet461/script.js     | 4 ++--
 Engines/Wine/Verbs/dotnet462/script.js     | 4 ++--
 Engines/Wine/Verbs/dotnet472/script.js     | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index 34e02ac999..cddec9fcb8 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -5,7 +5,7 @@ include(["utils", "functions", "filesystem", "files"]);
 * Verb to remove mono
 * @returns {Wine} Wine object
 */
-Wine.prototype.removeMono = function () {
+Wine.prototype.removemono = function () {
     this.uninstall("Mono");
 
     this.wizard().wait(tr("Please wait..."));
@@ -33,9 +33,9 @@ var verbImplementation = {
     install: function (container) {
         var wine = new Wine();
         wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "removeMono", java.util.Optional.empty());
+        var wizard = SetupWizard(InstallationType.VERBS, "removemono", java.util.Optional.empty());
         wine.wizard(wizard);
-        wine.removeMono();
+        wine.removemono();
         wizard.close();
     }
 };
diff --git a/Engines/Wine/Verbs/Remove Mono/script.json b/Engines/Wine/Verbs/Remove Mono/script.json
index eaca779c8e..ca20c5238d 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.json	
+++ b/Engines/Wine/Verbs/Remove Mono/script.json	
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : "Remove Mono",
-    "id"                         : "removeMono",
+    "id"                         : "removemono",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index a33187c35e..da2fed80b0 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["utils", "functions", "filesystem", "files"]);
 include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 /**
 * Verb to install .NET 2.0
@@ -22,7 +22,7 @@ Wine.prototype.dotnet20 = function () {
             .name("dotnetfx.exe")
             .get();
 
-        this.removeMono();
+        this.removemono();
 
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true);
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 1e49c3b7fb..56bc3601ee 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "regedit"]);
 include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 /**
 * Verb to install .NET 4.0
@@ -23,7 +23,7 @@ Wine.prototype.dotnet40 = function () {
         .name("dotNetFx40_Full_x86_x64.exe")
         .get();
 
-    this.removeMono();
+    this.removemono();
 
     this.windowsVersion("winxp");
 
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 72b2f8e0ce..9ae91a9831 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 /**
 * Verb to install .NET 4.5
@@ -23,7 +23,7 @@ Wine.prototype.dotnet45 = function () {
         .name("dotnetfx45_full_x86_x64.exe")
         .get();
 
-    this.removeMono();
+    this.removemono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index ff240107a6..d5c5aeb59e 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 /**
 * Verb to install .NET 4.5.2
@@ -23,7 +23,7 @@ Wine.prototype.dotnet452 = function () {
         .name("NDP452-KB2901907-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removeMono();
+    this.removemono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index ba09c9b0c4..0bd9996069 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet45"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 
 /**
@@ -24,7 +24,7 @@ Wine.prototype.dotnet46 = function () {
         .name("NDP46-KB3045557-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removeMono();
+    this.removemono();
 
     this.dotnet45();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 84b97323d8..b9bde86ae5 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet46"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 /**
 * Verb to install .NET 4.6.1
@@ -23,7 +23,7 @@ Wine.prototype.dotnet461 = function () {
         .name("NDP461-KB3102436-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removeMono();
+    this.removemono();
 
     this.dotnet46();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 1ad12d8c17..a04dee4617 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet461"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 /**
 * Verb to install .NET 4.6.2
@@ -23,7 +23,7 @@ Wine.prototype.dotnet462 = function () {
         .name("NDP462-KB3151800-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removeMono();
+    this.removemono();
 
     this.dotnet461();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index ed4a346a77..38548a5ee6 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet462"]);
-include(["engines", "wine", "verbs", "removeMono"]);
+include(["engines", "wine", "verbs", "removemono"]);
 
 /**
 * Verb to install .NET 4.7.2
@@ -23,7 +23,7 @@ Wine.prototype.dotnet472 = function () {
         .name("NDP472-KB4054530-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removeMono();
+    this.removemono();
 
     this.dotnet462();
     this.windowsVersion("win7");

From cf6a4a5516953111b981d365dde8f18f3ad59e67 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sat, 9 Feb 2019 22:02:53 +0100
Subject: [PATCH 37/51] Reapply osVersion null checkin (fix mscorlib ressource
 bug)

---
 Engines/Wine/Verbs/Remove Mono/script.js |  7 ++++---
 Engines/Wine/Verbs/dotnet20/script.js    | 10 ++++++----
 Engines/Wine/Verbs/dotnet40/script.js    |  4 +++-
 Engines/Wine/Verbs/dotnet45/script.js    |  5 ++++-
 Engines/Wine/Verbs/dotnet452/script.js   |  5 ++++-
 Engines/Wine/Verbs/dotnet46/script.js    |  6 ++++--
 Engines/Wine/Verbs/dotnet461/script.js   |  7 +++++--
 Engines/Wine/Verbs/dotnet462/script.js   |  5 ++++-
 Engines/Wine/Verbs/dotnet472/script.js   |  5 ++++-
 9 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index cddec9fcb8..1c27270677 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -1,5 +1,6 @@
 include(["engines", "wine", "engine", "object"]);
 include(["utils", "functions", "filesystem", "files"]);
+include(["engines", "wine", "plugins", "regedit"]);
 
 /**
 * Verb to remove mono
@@ -9,13 +10,13 @@ Wine.prototype.removemono = function () {
     this.uninstall("Mono");
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled", "/f"], null, false, true);
+    this.regedit().deleteKey("HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled");
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5", "/f"], null, false, true);
+    this.regedit().deleteKey("HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5");
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4", "/f"], null, false, true);
+    this.regedit().deleteKey("HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4");
 
     remove(this.system32directory() + "/mscoree.dll");
     if (this.architecture() == "amd64")
diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index da2fed80b0..e0a5cc8df0 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -11,11 +11,13 @@ include(["engines", "wine", "verbs", "removemono"]);
 */
 Wine.prototype.dotnet20 = function () {
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "winxp";
 
     if (this.architecture() == "x86") {
         this.windowsVersion("win2k");
 
-        var setupFile = new Resource()
+        var setupFile32 = new Resource()
             .wizard(this.wizard())
             .url("https://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe")
             .checksum("a3625c59d7a2995fb60877b5f5324892a1693b2a")
@@ -25,7 +27,7 @@ Wine.prototype.dotnet20 = function () {
         this.removemono();
 
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
-        this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true);
+        this.run(setupFile32, ["/q:a", "/c:install.exe /q"], null, false, true);
 
         this.windowsVersion(osVersion);
 
@@ -34,7 +36,7 @@ Wine.prototype.dotnet20 = function () {
         remove(this.system32directory() + "/msvcp80.dll");
     }
     else {
-        var setupFile = new Resource()
+        var setupFile64 = new Resource()
             .wizard(this.wizard())
             .url("https://download.microsoft.com/download/a/3/f/a3f1bf98-18f3-4036-9b68-8e6de530ce0a/NetFx64.exe")
             .checksum("e59cca309463a5d98daeaada83d1b05fed5126c5")
@@ -44,7 +46,7 @@ Wine.prototype.dotnet20 = function () {
         this.remove_mono();
 
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
-        this.run(setupFile, ["/q:a", "/c:install.exe /q"], null, false, true)
+        this.run(setupFile64, ["/q:a", "/c:install.exe /q"], null, false, true)
     }
 
     //This is in winetricks source, but does not seem to work
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 56bc3601ee..6b9593afa4 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -15,6 +15,8 @@ Wine.prototype.dotnet40 = function () {
     }
 
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "winxp";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -35,7 +37,7 @@ Wine.prototype.dotnet40 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides", "/v", "*fusion", "/f"], null, false, true);
+    this.regedit().deleteValue("HKCU\\Software\\Wine\\DllOverrides", "*fusion");
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 9ae91a9831..2902360ef6 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -4,6 +4,7 @@ include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
 include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "plugins", "regedit"]);
 
 /**
 * Verb to install .NET 4.5
@@ -15,6 +16,8 @@ Wine.prototype.dotnet45 = function () {
     }
 
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -36,7 +39,7 @@ Wine.prototype.dotnet45 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
+    this.regedit().deleteValue("HKCU\\Software\\Wine\\DllOverrides", "*fusion");
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index d5c5aeb59e..3b6a393f8e 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -4,6 +4,7 @@ include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
 include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "plugins", "regedit"]);
 
 /**
 * Verb to install .NET 4.5.2
@@ -15,6 +16,8 @@ Wine.prototype.dotnet452 = function () {
     }
 
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
@@ -36,7 +39,7 @@ Wine.prototype.dotnet452 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
+    this.regedit().deleteValue("HKCU\\Software\\Wine\\DllOverrides", "*fusion");
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 0bd9996069..f28cd337fc 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -4,7 +4,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet45"]);
 include(["engines", "wine", "verbs", "removemono"]);
-
+include(["engines", "wine", "plugins", "regedit"]);
 
 /**
 * Verb to install .NET 4.6
@@ -16,6 +16,8 @@ Wine.prototype.dotnet46 = function () {
     }
 
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -37,7 +39,7 @@ Wine.prototype.dotnet46 = function () {
     this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
+    this.regedit().deleteValue("HKCU\\Software\\Wine\\DllOverrides", "*fusion");
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index b9bde86ae5..3811f1e13f 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -4,6 +4,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet46"]);
 include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "plugins", "regedit"]);
 
 /**
 * Verb to install .NET 4.6.1
@@ -15,6 +16,8 @@ Wine.prototype.dotnet461 = function () {
     }
 
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -33,10 +36,10 @@ Wine.prototype.dotnet461 = function () {
         .do();
 
     this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 4.6.1"));
-    this.run(setupFile, [setupFile, "/sfxlang:1027", "/q", "/norestart"], null, false, true);
+    this.run(setupFile, [setupFile, "/q", "/norestart"], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
+    this.regedit().deleteValue("HKCU\\Software\\Wine\\DllOverrides", "*fusion");
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index a04dee4617..672687f75b 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -4,6 +4,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet461"]);
 include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "plugins", "regedit"]);
 
 /**
 * Verb to install .NET 4.6.2
@@ -15,6 +16,8 @@ Wine.prototype.dotnet462 = function () {
     }
 
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -36,7 +39,7 @@ Wine.prototype.dotnet462 = function () {
     this.run(setupFile, [setupFile, "/sfxlang:1027", "/q", "/norestart"], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
+    this.regedit().deleteValue("HKCU\\Software\\Wine\\DllOverrides", "*fusion");
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 38548a5ee6..8a9835904a 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -4,6 +4,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet462"]);
 include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "plugins", "regedit"]);
 
 /**
 * Verb to install .NET 4.7.2
@@ -15,6 +16,8 @@ Wine.prototype.dotnet472 = function () {
     }
 
     var osVersion = this.windowsVersion();
+    if (osVersion == null)
+        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
@@ -36,7 +39,7 @@ Wine.prototype.dotnet472 = function () {
     this.run(setupFile, [setupFile, "/sfxlang:1027", "/q", "/norestart"], null, false, true);
 
     this.wizard().wait(tr("Please wait..."));
-    this.run("reg", ["delete", "HKCU\\Software\\Wine\\DllOverrides\\*fusion", "/f"], null, false, true);
+    this.regedit().deleteValue("HKCU\\Software\\Wine\\DllOverrides", "*fusion");
 
     this.overrideDLL()
         .set("native", ["mscoree"])

From 7d7375caf3ec7d473c0f6d0dd3001c78276193c1 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sun, 10 Feb 2019 21:48:39 +0100
Subject: [PATCH 38/51] Put dotnet4* > dotnet45 in testing

---
 Engines/Wine/Verbs/dotnet452/script.json |  5 ++++-
 Engines/Wine/Verbs/dotnet46/script.json  | 14 ++++++++++----
 Engines/Wine/Verbs/dotnet461/script.json |  5 ++++-
 Engines/Wine/Verbs/dotnet462/script.json |  5 ++++-
 Engines/Wine/Verbs/dotnet472/script.json |  5 ++++-
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet452/script.json b/Engines/Wine/Verbs/dotnet452/script.json
index 541e15c7ff..02f4fe5a16 100644
--- a/Engines/Wine/Verbs/dotnet452/script.json
+++ b/Engines/Wine/Verbs/dotnet452/script.json
@@ -5,7 +5,10 @@
         "MACOSX",
         "LINUX"
     ],
-    "testingOperatingSystems" : [],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
     "free"                    : true,
     "requiresPatch"           : false
 }
diff --git a/Engines/Wine/Verbs/dotnet46/script.json b/Engines/Wine/Verbs/dotnet46/script.json
index 1832fe6dae..9ad6c0a84d 100755
--- a/Engines/Wine/Verbs/dotnet46/script.json
+++ b/Engines/Wine/Verbs/dotnet46/script.json
@@ -1,8 +1,14 @@
 {
     "scriptName"                 : ".NET 4.6",
     "id"                         : "dotnet46",
-    "compatibleOperatingSystems" : [],
-    "testingOperatingSystems"    : [],
-    "free"                       : true,
-    "requiresPatch"              : false
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "free"                    : true,
+    "requiresPatch"           : false
 }
diff --git a/Engines/Wine/Verbs/dotnet461/script.json b/Engines/Wine/Verbs/dotnet461/script.json
index 39562f58b4..49e79926dc 100644
--- a/Engines/Wine/Verbs/dotnet461/script.json
+++ b/Engines/Wine/Verbs/dotnet461/script.json
@@ -5,7 +5,10 @@
         "MACOSX",
         "LINUX"
     ],
-    "testingOperatingSystems" : [],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
     "free"                    : true,
     "requiresPatch"           : false
 }
diff --git a/Engines/Wine/Verbs/dotnet462/script.json b/Engines/Wine/Verbs/dotnet462/script.json
index 24d84e54f5..e2237cb0de 100755
--- a/Engines/Wine/Verbs/dotnet462/script.json
+++ b/Engines/Wine/Verbs/dotnet462/script.json
@@ -5,7 +5,10 @@
         "MACOSX",
         "LINUX"
     ],
-    "testingOperatingSystems" : [],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
     "free"                    : true,
     "requiresPatch"           : false
 }
diff --git a/Engines/Wine/Verbs/dotnet472/script.json b/Engines/Wine/Verbs/dotnet472/script.json
index 487b4fc376..bae87db3ed 100755
--- a/Engines/Wine/Verbs/dotnet472/script.json
+++ b/Engines/Wine/Verbs/dotnet472/script.json
@@ -5,7 +5,10 @@
         "MACOSX",
         "LINUX"
     ],
-    "testingOperatingSystems" : [],
+    "testingOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
     "free"                    : true,
     "requiresPatch"           : false
 }

From 7bd38415d2811707a25fea94d7e129ecde49a996 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sun, 10 Feb 2019 21:59:50 +0100
Subject: [PATCH 39/51] Json align

---
 Engines/Wine/Verbs/dotnet452/script.json | 4 ++--
 Engines/Wine/Verbs/dotnet46/script.json  | 4 ++--
 Engines/Wine/Verbs/dotnet461/script.json | 4 ++--
 Engines/Wine/Verbs/dotnet462/script.json | 4 ++--
 Engines/Wine/Verbs/dotnet472/script.json | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet452/script.json b/Engines/Wine/Verbs/dotnet452/script.json
index 02f4fe5a16..c30a582bbe 100644
--- a/Engines/Wine/Verbs/dotnet452/script.json
+++ b/Engines/Wine/Verbs/dotnet452/script.json
@@ -9,6 +9,6 @@
         "MACOSX",
         "LINUX"
     ],
-    "free"                    : true,
-    "requiresPatch"           : false
+    "free"          : true,
+    "requiresPatch" : false
 }
diff --git a/Engines/Wine/Verbs/dotnet46/script.json b/Engines/Wine/Verbs/dotnet46/script.json
index 9ad6c0a84d..5e99142ab4 100755
--- a/Engines/Wine/Verbs/dotnet46/script.json
+++ b/Engines/Wine/Verbs/dotnet46/script.json
@@ -9,6 +9,6 @@
         "MACOSX",
         "LINUX"
     ],
-    "free"                    : true,
-    "requiresPatch"           : false
+    "free"          : true,
+    "requiresPatch" : false
 }
diff --git a/Engines/Wine/Verbs/dotnet461/script.json b/Engines/Wine/Verbs/dotnet461/script.json
index 49e79926dc..9bf4ab2fca 100644
--- a/Engines/Wine/Verbs/dotnet461/script.json
+++ b/Engines/Wine/Verbs/dotnet461/script.json
@@ -9,6 +9,6 @@
         "MACOSX",
         "LINUX"
     ],
-    "free"                    : true,
-    "requiresPatch"           : false
+    "free"          : true,
+    "requiresPatch" : false
 }
diff --git a/Engines/Wine/Verbs/dotnet462/script.json b/Engines/Wine/Verbs/dotnet462/script.json
index e2237cb0de..037e50184a 100755
--- a/Engines/Wine/Verbs/dotnet462/script.json
+++ b/Engines/Wine/Verbs/dotnet462/script.json
@@ -9,6 +9,6 @@
         "MACOSX",
         "LINUX"
     ],
-    "free"                    : true,
-    "requiresPatch"           : false
+    "free"          : true,
+    "requiresPatch" : false
 }
diff --git a/Engines/Wine/Verbs/dotnet472/script.json b/Engines/Wine/Verbs/dotnet472/script.json
index bae87db3ed..6c0b9734ff 100755
--- a/Engines/Wine/Verbs/dotnet472/script.json
+++ b/Engines/Wine/Verbs/dotnet472/script.json
@@ -9,6 +9,6 @@
         "MACOSX",
         "LINUX"
     ],
-    "free"                    : true,
-    "requiresPatch"           : false
+    "free"          : true,
+    "requiresPatch" : false
 }

From 6a9a456997684d9dc05cbc44a5058006f918c339 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Sun, 10 Feb 2019 23:48:01 +0100
Subject: [PATCH 40/51] Display message for manual verb installation

---
 Engines/Wine/Verbs/dotnet40/script.js  | 1 +
 Engines/Wine/Verbs/dotnet45/script.js  | 1 +
 Engines/Wine/Verbs/dotnet452/script.js | 5 ++---
 Engines/Wine/Verbs/dotnet46/script.js  | 5 ++---
 Engines/Wine/Verbs/dotnet461/script.js | 5 ++---
 Engines/Wine/Verbs/dotnet462/script.js | 5 ++---
 Engines/Wine/Verbs/dotnet472/script.js | 5 ++---
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 6b9593afa4..9c89ae8d4a 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -69,6 +69,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet40", java.util.Optional.empty());
+        wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
         wine.wizard(wizard);
         wine.dotnet40();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 2902360ef6..262d97847c 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -62,6 +62,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet45", java.util.Optional.empty());
+        wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
         wine.wizard(wizard);
         wine.dotnet45();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 3b6a393f8e..b03f33ad61 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -11,9 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet452 = function () {
-    if (this.architecture() == "amd64") {
-        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet452"));
-    }
+    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet452"));
 
     var osVersion = this.windowsVersion();
     if (osVersion == null)
@@ -62,6 +60,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet452", java.util.Optional.empty());
+        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet452"));
         wine.wizard(wizard);
         wine.dotnet452();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index f28cd337fc..74fe7d9af6 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -11,9 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet46 = function () {
-    if (this.architecture() == "amd64") {
-        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet46"));
-    }
+    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet46"));
 
     var osVersion = this.windowsVersion();
     if (osVersion == null)
@@ -58,6 +56,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet46", java.util.Optional.empty());
+        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet46"));
         wine.wizard(wizard);
         wine.dotnet46();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 3811f1e13f..cd188bd4e3 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -11,9 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet461 = function () {
-    if (this.architecture() == "amd64") {
-        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet461"));
-    }
+    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet461"));
 
     var osVersion = this.windowsVersion();
     if (osVersion == null)
@@ -58,6 +56,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet461", java.util.Optional.empty());
+        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet461"));
         wine.wizard(wizard);
         wine.dotnet461();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 672687f75b..61afbf45e2 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -11,9 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet462 = function () {
-    if (this.architecture() == "amd64") {
-        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet462"));
-    }
+    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet462"));
 
     var osVersion = this.windowsVersion();
     if (osVersion == null)
@@ -58,6 +56,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet462", java.util.Optional.empty());
+        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet462"));
         wine.wizard(wizard);
         wine.dotnet462();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 8a9835904a..7bca30da44 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -11,9 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet472 = function () {
-    if (this.architecture() == "amd64") {
-        print(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet472"));
-    }
+    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet472"));
 
     var osVersion = this.windowsVersion();
     if (osVersion == null)
@@ -58,6 +56,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet472", java.util.Optional.empty());
+        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet472"));
         wine.wizard(wizard);
         wine.dotnet472();
         wizard.close();

From 4576b20bae23a1f65a274f4375469ec38246818e Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 11 Feb 2019 11:02:27 +0100
Subject: [PATCH 41/51] Finalization

---
 Engines/Wine/Verbs/dotnet40/script.js | 5 ++++-
 Engines/Wine/Verbs/dotnet45/script.js | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 9c89ae8d4a..09d91731b4 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -69,7 +69,10 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet40", java.util.Optional.empty());
-        wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
+        if(wine.architecture() == "amd64")  
+        {      
+            wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
+        }
         wine.wizard(wizard);
         wine.dotnet40();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 262d97847c..6d851371c6 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -62,7 +62,10 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet45", java.util.Optional.empty());
-        wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
+        if(wine.architecture() == "amd64")  
+        {      
+            wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
+        }
         wine.wizard(wizard);
         wine.dotnet45();
         wizard.close();

From 02a0ab20d8a294d0513bfbc6101c9e7dd1105942 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Tue, 12 Feb 2019 21:18:32 +0100
Subject: [PATCH 42/51]  Remove null check since master changes

---
 Engines/Wine/Verbs/dotnet20/script.js  | 2 --
 Engines/Wine/Verbs/dotnet40/script.js  | 2 --
 Engines/Wine/Verbs/dotnet45/script.js  | 2 --
 Engines/Wine/Verbs/dotnet452/script.js | 2 --
 Engines/Wine/Verbs/dotnet46/script.js  | 2 --
 Engines/Wine/Verbs/dotnet461/script.js | 2 --
 Engines/Wine/Verbs/dotnet462/script.js | 4 +---
 Engines/Wine/Verbs/dotnet472/script.js | 2 --
 8 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index e0a5cc8df0..016c043796 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -11,8 +11,6 @@ include(["engines", "wine", "verbs", "removemono"]);
 */
 Wine.prototype.dotnet20 = function () {
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "winxp";
 
     if (this.architecture() == "x86") {
         this.windowsVersion("win2k");
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 09d91731b4..01cc9dd1e7 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -15,8 +15,6 @@ Wine.prototype.dotnet40 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "winxp";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 6d851371c6..9597d3bb31 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -16,8 +16,6 @@ Wine.prototype.dotnet45 = function () {
     }
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index b03f33ad61..4e9e193b9d 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet452 = function () {
     print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet452"));
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this.wizard())
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 74fe7d9af6..9f0bd36b8b 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet46 = function () {
     print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet46"));
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index cd188bd4e3..75279b4bd3 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet461 = function () {
     print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet461"));
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 61afbf45e2..1acd3479a4 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -14,9 +14,7 @@ Wine.prototype.dotnet462 = function () {
     print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet462"));
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
-
+    
     var setupFile = new Resource()
         .wizard(this._wizard)
         .url("https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe")
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 7bca30da44..36ed278d92 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -14,8 +14,6 @@ Wine.prototype.dotnet472 = function () {
     print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet472"));
 
     var osVersion = this.windowsVersion();
-    if (osVersion == null)
-        osVersion = "win7";
 
     var setupFile = new Resource()
         .wizard(this._wizard)

From 2e04768dd4908440aabfa9646c03d4be6337826e Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Tue, 12 Feb 2019 23:37:11 +0100
Subject: [PATCH 43/51] removemono -> remove_mono removeMono

---
 Engines/Wine/Verbs/Remove Mono/script.js   | 33 ++++++++++++----------
 Engines/Wine/Verbs/Remove Mono/script.json |  2 +-
 Engines/Wine/Verbs/dotnet20/script.js      |  4 +--
 Engines/Wine/Verbs/dotnet40/script.js      |  4 +--
 Engines/Wine/Verbs/dotnet45/script.js      |  4 +--
 Engines/Wine/Verbs/dotnet452/script.js     |  4 +--
 Engines/Wine/Verbs/dotnet46/script.js      |  4 +--
 Engines/Wine/Verbs/dotnet461/script.js     |  4 +--
 Engines/Wine/Verbs/dotnet462/script.js     |  4 +--
 Engines/Wine/Verbs/dotnet472/script.js     |  4 +--
 10 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index 1c27270677..9d69fa49ee 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -6,24 +6,27 @@ include(["engines", "wine", "plugins", "regedit"]);
 * Verb to remove mono
 * @returns {Wine} Wine object
 */
-Wine.prototype.removemono = function () {
-    this.uninstall("Mono");
-
-    this.wizard().wait(tr("Please wait..."));
-    this.regedit().deleteKey("HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled");
+Wine.prototype.removeMono = function () {
+    if(this.uninstall("Mono"))
+    {
+        this.wizard().wait(tr("Please wait..."));
+        this.regedit().deleteKey("HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled");
 
-    this.wizard().wait(tr("Please wait..."));
-    this.regedit().deleteKey("HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5");
+        this.wizard().wait(tr("Please wait..."));
+        this.regedit().deleteKey("HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5");
 
-    this.wizard().wait(tr("Please wait..."));
-    this.regedit().deleteKey("HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4");
+        this.wizard().wait(tr("Please wait..."));
+        this.regedit().deleteKey("HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4");
 
-    remove(this.system32directory() + "/mscoree.dll");
-    if (this.architecture() == "amd64")
-    {
-        remove(this.system64directory() + "/mscoree.dll");
+        remove(this.system32directory() + "/mscoree.dll");
+        if (this.architecture() == "amd64")
+        {
+            remove(this.system64directory() + "/mscoree.dll");
+        }
     }
-
+    else
+        print("COUCOU");
+    
     return this;
 };
 
@@ -36,7 +39,7 @@ var verbImplementation = {
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "removemono", java.util.Optional.empty());
         wine.wizard(wizard);
-        wine.removemono();
+        wine.removeMono();
         wizard.close();
     }
 };
diff --git a/Engines/Wine/Verbs/Remove Mono/script.json b/Engines/Wine/Verbs/Remove Mono/script.json
index ca20c5238d..e91184fb50 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.json	
+++ b/Engines/Wine/Verbs/Remove Mono/script.json	
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : "Remove Mono",
-    "id"                         : "removemono",
+    "id"                         : "remove_mono",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index 016c043796..53a74a427b 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["utils", "functions", "filesystem", "files"]);
 include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 2.0
@@ -22,7 +22,7 @@ Wine.prototype.dotnet20 = function () {
             .name("dotnetfx.exe")
             .get();
 
-        this.removemono();
+        this.removeMono();
 
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile32, ["/q:a", "/c:install.exe /q"], null, false, true);
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 01cc9dd1e7..4ec6bcb325 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "regedit"]);
 include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 
 /**
 * Verb to install .NET 4.0
@@ -23,7 +23,7 @@ Wine.prototype.dotnet40 = function () {
         .name("dotNetFx40_Full_x86_x64.exe")
         .get();
 
-    this.removemono();
+    this.removeMono();
 
     this.windowsVersion("winxp");
 
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 9597d3bb31..2e75578a2a 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 include(["engines", "wine", "plugins", "regedit"]);
 
 /**
@@ -24,7 +24,7 @@ Wine.prototype.dotnet45 = function () {
         .name("dotnetfx45_full_x86_x64.exe")
         .get();
 
-    this.removemono();
+    this.removeMono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index 4e9e193b9d..cdcb22a463 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 include(["engines", "wine", "plugins", "regedit"]);
 
 /**
@@ -22,7 +22,7 @@ Wine.prototype.dotnet452 = function () {
         .name("NDP452-KB2901907-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removemono();
+    this.removeMono();
 
     this.dotnet40();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 9f0bd36b8b..632bcc27c6 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet45"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 include(["engines", "wine", "plugins", "regedit"]);
 
 /**
@@ -22,7 +22,7 @@ Wine.prototype.dotnet46 = function () {
         .name("NDP46-KB3045557-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removemono();
+    this.removeMono();
 
     this.dotnet45();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 75279b4bd3..1f92c3046e 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -3,7 +3,7 @@ include(["engines", "wine", "plugins", "override_dll"]);
 include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet46"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 include(["engines", "wine", "plugins", "regedit"]);
 
 /**
@@ -22,7 +22,7 @@ Wine.prototype.dotnet461 = function () {
         .name("NDP461-KB3102436-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removemono();
+    this.removeMono();
 
     this.dotnet46();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 1acd3479a4..9c857a9fe0 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet461"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 include(["engines", "wine", "plugins", "regedit"]);
 
 /**
@@ -22,7 +22,7 @@ Wine.prototype.dotnet462 = function () {
         .name("NDP462-KB3151800-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removemono();
+    this.removeMono();
 
     this.dotnet461();
     this.windowsVersion("win7");
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 36ed278d92..47e23e3020 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -3,7 +3,7 @@ include(["utils", "functions", "net", "resource"]);
 include(["engines", "wine", "plugins", "override_dll"]);
 include(["engines", "wine", "plugins", "windows_version"]);
 include(["engines", "wine", "verbs", "dotnet462"]);
-include(["engines", "wine", "verbs", "removemono"]);
+include(["engines", "wine", "verbs", "remove_mono"]);
 include(["engines", "wine", "plugins", "regedit"]);
 
 /**
@@ -22,7 +22,7 @@ Wine.prototype.dotnet472 = function () {
         .name("NDP472-KB4054530-x86-x64-AllOS-ENU.exe")
         .get();
 
-    this.removemono();
+    this.removeMono();
 
     this.dotnet462();
     this.windowsVersion("win7");

From 4f672e6e6a5ffe3298b300603233b5cdb461ff2e Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Wed, 13 Feb 2019 21:02:14 +0100
Subject: [PATCH 44/51] Fix Codacy

---
 Engines/Wine/Verbs/dotnet40/script.js  | 4 ++--
 Engines/Wine/Verbs/dotnet45/script.js  | 4 ++--
 Engines/Wine/Verbs/dotnet462/script.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index 4ec6bcb325..b01e8761aa 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -67,8 +67,8 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet40", java.util.Optional.empty());
-        if(wine.architecture() == "amd64")  
-        {      
+        if (wine.architecture() == "amd64")
+        {
             wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet40"));
         }
         wine.wizard(wizard);
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 2e75578a2a..77a3f1a99c 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -60,8 +60,8 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet45", java.util.Optional.empty());
-        if(wine.architecture() == "amd64")  
-        {      
+        if (wine.architecture() == "amd64")
+        {
             wizard.message(tr("This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", "dotnet45"));
         }
         wine.wizard(wizard);
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 9c857a9fe0..8239ca5f6e 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -14,7 +14,7 @@ Wine.prototype.dotnet462 = function () {
     print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet462"));
 
     var osVersion = this.windowsVersion();
-    
+
     var setupFile = new Resource()
         .wizard(this._wizard)
         .url("https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe")

From a6ad46577b72d83f33edff124943932c6f278dbd Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Thu, 14 Feb 2019 13:00:02 +0100
Subject: [PATCH 45/51] Codacy changes

---
 Engines/Wine/Verbs/Remove Mono/script.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index 9d69fa49ee..a50e963a66 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -7,7 +7,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.removeMono = function () {
-    if(this.uninstall("Mono"))
+    if (this.uninstall("Mono"))
     {
         this.wizard().wait(tr("Please wait..."));
         this.regedit().deleteKey("HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled");
@@ -24,9 +24,7 @@ Wine.prototype.removeMono = function () {
             remove(this.system64directory() + "/mscoree.dll");
         }
     }
-    else
-        print("COUCOU");
-    
+
     return this;
 };
 

From 04ffb0e23a4b1c7a6812fc53b62b224fc3b91ae3 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Thu, 14 Feb 2019 13:00:18 +0100
Subject: [PATCH 46/51] Update script.js

---
 Engines/Wine/Verbs/Remove Mono/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index a50e963a66..0ff8b796e0 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -35,7 +35,7 @@ var verbImplementation = {
     install: function (container) {
         var wine = new Wine();
         wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "removemono", java.util.Optional.empty());
+        var wizard = SetupWizard(InstallationType.VERBS, "remove_mono", java.util.Optional.empty());
         wine.wizard(wizard);
         wine.removeMono();
         wizard.close();

From 241fc255816f68665a4cf342c452ad72c14e09a6 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Thu, 21 Feb 2019 09:37:56 +0100
Subject: [PATCH 47/51] Fix spelling mistakes

---
 Engines/Wine/Verbs/Remove Mono/script.js | 2 +-
 Engines/Wine/Verbs/dotnet452/script.js   | 4 ++--
 Engines/Wine/Verbs/dotnet46/script.js    | 4 ++--
 Engines/Wine/Verbs/dotnet461/script.js   | 4 ++--
 Engines/Wine/Verbs/dotnet462/script.js   | 4 ++--
 Engines/Wine/Verbs/dotnet472/script.js   | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index 0ff8b796e0..66097aaa51 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -29,7 +29,7 @@ Wine.prototype.removeMono = function () {
 };
 
 /**
- * Verb to install remove mono
+ * Verb to remove mono
 */
 var verbImplementation = {
     install: function (container) {
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index cdcb22a463..cee6d5bb9a 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet452 = function () {
-    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet452"));
+    print(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet452"));
 
     var osVersion = this.windowsVersion();
 
@@ -58,7 +58,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet452", java.util.Optional.empty());
-        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet452"));
+        wizard.message(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet452"));
         wine.wizard(wizard);
         wine.dotnet452();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 632bcc27c6..6ed1a93c7b 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet46 = function () {
-    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet46"));
+    print(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet46"));
 
     var osVersion = this.windowsVersion();
 
@@ -54,7 +54,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet46", java.util.Optional.empty());
-        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet46"));
+        wizard.message(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet46"));
         wine.wizard(wizard);
         wine.dotnet46();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 1f92c3046e..9f51297f22 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet461 = function () {
-    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet461"));
+    print(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet461"));
 
     var osVersion = this.windowsVersion();
 
@@ -54,7 +54,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet461", java.util.Optional.empty());
-        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet461"));
+        wizard.message(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet461"));
         wine.wizard(wizard);
         wine.dotnet461();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 8239ca5f6e..3f5759280e 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet462 = function () {
-    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet462"));
+    print(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet462"));
 
     var osVersion = this.windowsVersion();
 
@@ -54,7 +54,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet462", java.util.Optional.empty());
-        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet462"));
+        wizard.message(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet462"));
         wine.wizard(wizard);
         wine.dotnet462();
         wizard.close();
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 47e23e3020..1ac570fa00 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -11,7 +11,7 @@ include(["engines", "wine", "plugins", "regedit"]);
 * @returns {Wine} Wine object
 */
 Wine.prototype.dotnet472 = function () {
-    print(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet472"));
+    print(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet472"));
 
     var osVersion = this.windowsVersion();
 
@@ -54,7 +54,7 @@ var verbImplementation = {
         var wine = new Wine();
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "dotnet472", java.util.Optional.empty());
-        wizard.message(tr("This package ({0}) does not work currently. use it only for testing!", "dotnet472"));
+        wizard.message(tr("This package ({0}) does not work currently. Use it only for testing!", "dotnet472"));
         wine.wizard(wizard);
         wine.dotnet472();
         wizard.close();

From 252ded3af9bd9101d7bc77454136677523558d96 Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Mon, 25 Feb 2019 19:08:11 +0100
Subject: [PATCH 48/51] Fix conflicts

---
 Engines/Wine/Verbs/dotnet20/script.js    | 12 ++++++------
 Engines/Wine/Verbs/dotnet20/script.json  |  2 +-
 Engines/Wine/Verbs/dotnet40/script.js    | 12 ++++++------
 Engines/Wine/Verbs/dotnet40/script.json  |  2 +-
 Engines/Wine/Verbs/dotnet45/script.js    | 14 +++++++-------
 Engines/Wine/Verbs/dotnet45/script.json  |  2 +-
 Engines/Wine/Verbs/dotnet452/script.js   | 15 ++++++++-------
 Engines/Wine/Verbs/dotnet452/script.json |  2 +-
 Engines/Wine/Verbs/dotnet46/script.js    | 14 +++++++-------
 Engines/Wine/Verbs/dotnet461/script.js   | 15 ++++++++-------
 Engines/Wine/Verbs/dotnet461/script.json |  2 +-
 Engines/Wine/Verbs/dotnet462/script.js   | 15 ++++++++-------
 Engines/Wine/Verbs/dotnet472/script.js   | 15 ++++++++-------
 13 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index 53a74a427b..859b995e1a 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -1,9 +1,9 @@
-include(["engines", "wine", "engine", "object"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["utils", "functions", "net", "resource"]);
-include(["utils", "functions", "filesystem", "files"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("utils.functions.filesystem.files");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
 
 /**
 * Verb to install .NET 2.0
diff --git a/Engines/Wine/Verbs/dotnet20/script.json b/Engines/Wine/Verbs/dotnet20/script.json
index 38030a378f..f9ad885e9b 100644
--- a/Engines/Wine/Verbs/dotnet20/script.json
+++ b/Engines/Wine/Verbs/dotnet20/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 2.0",
-    "id"                         : "dotnet20",
+    "id"                         : "engines.wine.verbs.dotnet20",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index b01e8761aa..2cec27f199 100755
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -1,9 +1,9 @@
-include(["engines", "wine", "engine", "object"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "plugins", "regedit"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
+include("engines.wine.plugins.regedit");
 
 /**
 * Verb to install .NET 4.0
diff --git a/Engines/Wine/Verbs/dotnet40/script.json b/Engines/Wine/Verbs/dotnet40/script.json
index 1d1ff17025..6f679b839b 100644
--- a/Engines/Wine/Verbs/dotnet40/script.json
+++ b/Engines/Wine/Verbs/dotnet40/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 4.0",
-    "id"                         : "dotnet40",
+    "id"                         : "engines.wine.verbs.dotnet40",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index 77a3f1a99c..562f52a73d 100755
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -1,10 +1,10 @@
-include(["engines", "wine", "engine", "object"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
-include(["engines", "wine", "plugins", "regedit"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
+include("engines.wine.plugins.regedit");
+include("engines.wine.verbs.dotnet40");
 
 /**
 * Verb to install .NET 4.5
diff --git a/Engines/Wine/Verbs/dotnet45/script.json b/Engines/Wine/Verbs/dotnet45/script.json
index d748dc9bcb..d11d3ba1c1 100644
--- a/Engines/Wine/Verbs/dotnet45/script.json
+++ b/Engines/Wine/Verbs/dotnet45/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 4.5",
-    "id"                         : "dotnet45",
+    "id"                         : "engines.wine.verbs.dotnet45",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index cee6d5bb9a..1fbf1ac3cd 100755
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -1,10 +1,11 @@
-include(["engines", "wine", "engine", "object"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "verbs", "dotnet40"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
-include(["engines", "wine", "plugins", "regedit"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
+include("engines.wine.plugins.regedit");
+include("engines.wine.verbs.dotnet40");
+
 
 /**
 * Verb to install .NET 4.5.2
diff --git a/Engines/Wine/Verbs/dotnet452/script.json b/Engines/Wine/Verbs/dotnet452/script.json
index c30a582bbe..5d1836d702 100644
--- a/Engines/Wine/Verbs/dotnet452/script.json
+++ b/Engines/Wine/Verbs/dotnet452/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 4.5.2",
-    "id"                         : "dotnet452",
+    "id"                         : "engines.wine.verbs.dotnet452",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet46/script.js b/Engines/Wine/Verbs/dotnet46/script.js
index 6ed1a93c7b..f2da711ff1 100755
--- a/Engines/Wine/Verbs/dotnet46/script.js
+++ b/Engines/Wine/Verbs/dotnet46/script.js
@@ -1,10 +1,10 @@
-include(["engines", "wine", "engine", "object"]);
-include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "dotnet45"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
-include(["engines", "wine", "plugins", "regedit"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
+include("engines.wine.plugins.regedit");
+include("engines.wine.verbs.dotnet45");
 
 /**
 * Verb to install .NET 4.6
diff --git a/Engines/Wine/Verbs/dotnet461/script.js b/Engines/Wine/Verbs/dotnet461/script.js
index 9f51297f22..430e9b5670 100755
--- a/Engines/Wine/Verbs/dotnet461/script.js
+++ b/Engines/Wine/Verbs/dotnet461/script.js
@@ -1,10 +1,11 @@
-include(["engines", "wine", "engine", "object"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "dotnet46"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
-include(["engines", "wine", "plugins", "regedit"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
+include("engines.wine.plugins.regedit");
+include("engines.wine.verbs.dotnet46");
+
 
 /**
 * Verb to install .NET 4.6.1
diff --git a/Engines/Wine/Verbs/dotnet461/script.json b/Engines/Wine/Verbs/dotnet461/script.json
index 9bf4ab2fca..c9bd0236ee 100644
--- a/Engines/Wine/Verbs/dotnet461/script.json
+++ b/Engines/Wine/Verbs/dotnet461/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 4.6.1",
-    "id"                         : "dotnet461",
+    "id"                         : "engines.wine.verbs.dotnet461",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet462/script.js b/Engines/Wine/Verbs/dotnet462/script.js
index 3f5759280e..9c3072bec4 100755
--- a/Engines/Wine/Verbs/dotnet462/script.js
+++ b/Engines/Wine/Verbs/dotnet462/script.js
@@ -1,10 +1,11 @@
-include(["engines", "wine", "engine", "object"]);
-include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "dotnet461"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
-include(["engines", "wine", "plugins", "regedit"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
+include("engines.wine.plugins.regedit");
+include("engines.wine.verbs.dotnet461");
+
 
 /**
 * Verb to install .NET 4.6.2
diff --git a/Engines/Wine/Verbs/dotnet472/script.js b/Engines/Wine/Verbs/dotnet472/script.js
index 1ac570fa00..277de8821d 100755
--- a/Engines/Wine/Verbs/dotnet472/script.js
+++ b/Engines/Wine/Verbs/dotnet472/script.js
@@ -1,10 +1,11 @@
-include(["engines", "wine", "engine", "object"]);
-include(["utils", "functions", "net", "resource"]);
-include(["engines", "wine", "plugins", "override_dll"]);
-include(["engines", "wine", "plugins", "windows_version"]);
-include(["engines", "wine", "verbs", "dotnet462"]);
-include(["engines", "wine", "verbs", "remove_mono"]);
-include(["engines", "wine", "plugins", "regedit"]);
+include("engines.wine.engine.object");
+include("engines.wine.plugins.override_dll");
+include("utils.functions.net.resource");
+include("engines.wine.plugins.windows_version");
+include("engines.wine.verbs.remove_mono");
+include("engines.wine.plugins.regedit");
+include("engines.wine.verbs.dotnet462");
+
 
 /**
 * Verb to install .NET 4.7.2

From 720e9b3e5586d7890b07a1ece87d59996b991fcb Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Tue, 26 Feb 2019 20:48:28 +0100
Subject: [PATCH 49/51] Update script.js

---
 Engines/Wine/Verbs/dotnet20/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engines/Wine/Verbs/dotnet20/script.js b/Engines/Wine/Verbs/dotnet20/script.js
index 859b995e1a..0a2af9f2f0 100644
--- a/Engines/Wine/Verbs/dotnet20/script.js
+++ b/Engines/Wine/Verbs/dotnet20/script.js
@@ -41,7 +41,7 @@ Wine.prototype.dotnet20 = function () {
             .name("NetFx64.exe")
             .get();
 
-        this.remove_mono();
+        this.removeMono();
 
         this.wizard().wait(tr("Please wait while {0} is installed...", ".NET Framework 2.0"));
         this.run(setupFile64, ["/q:a", "/c:install.exe /q"], null, false, true)

From 11cfce3421a8f3ea63fadb2e268657e8caa24a00 Mon Sep 17 00:00:00 2001
From: ImperatorS79 <fevrier.simon@gmail.com>
Date: Tue, 26 Feb 2019 20:49:31 +0100
Subject: [PATCH 50/51] Update script.js

---
 Engines/Wine/Verbs/Remove Mono/script.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.js b/Engines/Wine/Verbs/Remove Mono/script.js
index 66097aaa51..24831f0c74 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.js	
+++ b/Engines/Wine/Verbs/Remove Mono/script.js	
@@ -1,6 +1,6 @@
-include(["engines", "wine", "engine", "object"]);
-include(["utils", "functions", "filesystem", "files"]);
-include(["engines", "wine", "plugins", "regedit"]);
+include("engines.wine.engine.object");
+include("utils.functions.filesystem.files");
+include("engines.wine.plugins.regedit");
 
 /**
 * Verb to remove mono

From 429258361a390c39893ee392f82770f167c5593e Mon Sep 17 00:00:00 2001
From: test <fevrier.simon@gmail.com>
Date: Wed, 27 Feb 2019 22:47:17 +0100
Subject: [PATCH 51/51] Include by id

---
 Engines/Wine/Verbs/Remove Mono/script.json | 2 +-
 Engines/Wine/Verbs/dotnet46/script.json    | 2 +-
 Engines/Wine/Verbs/dotnet462/script.json   | 2 +-
 Engines/Wine/Verbs/dotnet472/script.json   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Engines/Wine/Verbs/Remove Mono/script.json b/Engines/Wine/Verbs/Remove Mono/script.json
index e91184fb50..a5e1884b15 100644
--- a/Engines/Wine/Verbs/Remove Mono/script.json	
+++ b/Engines/Wine/Verbs/Remove Mono/script.json	
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : "Remove Mono",
-    "id"                         : "remove_mono",
+    "id"                         : "engines.wine.verbs.remove_mono",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet46/script.json b/Engines/Wine/Verbs/dotnet46/script.json
index 5e99142ab4..d4783caf22 100755
--- a/Engines/Wine/Verbs/dotnet46/script.json
+++ b/Engines/Wine/Verbs/dotnet46/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 4.6",
-    "id"                         : "dotnet46",
+    "id"                         : "engines.wine.verbs.dotnet46",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet462/script.json b/Engines/Wine/Verbs/dotnet462/script.json
index 037e50184a..bf85d3dab4 100755
--- a/Engines/Wine/Verbs/dotnet462/script.json
+++ b/Engines/Wine/Verbs/dotnet462/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 4.6.2",
-    "id"                         : "dotnet462",
+    "id"                         : "engines.wine.verbs.dotnet462",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"
diff --git a/Engines/Wine/Verbs/dotnet472/script.json b/Engines/Wine/Verbs/dotnet472/script.json
index 6c0b9734ff..44df85d3a5 100755
--- a/Engines/Wine/Verbs/dotnet472/script.json
+++ b/Engines/Wine/Verbs/dotnet472/script.json
@@ -1,6 +1,6 @@
 {
     "scriptName"                 : ".NET 4.7.2",
-    "id"                         : "dotnet472",
+    "id"                         : "engines.wine.verbs.dotnet472",
     "compatibleOperatingSystems" : [
         "MACOSX",
         "LINUX"