-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update dotnet (add versions +fix) (#839)
- Loading branch information
1 parent
b4fd291
commit dbc073b
Showing
14 changed files
with
402 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| include("engines.wine.engine.object"); | ||
| include("utils.functions.filesystem.files"); | ||
| include("engines.wine.plugins.regedit"); | ||
|
|
||
| /** | ||
| * Verb to remove mono | ||
| * @returns {Wine} Wine object | ||
| */ | ||
| 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\\v4"); | ||
|
|
||
| remove(this.system32directory() + "/mscoree.dll"); | ||
| if (this.architecture() == "amd64") | ||
| { | ||
| remove(this.system64directory() + "/mscoree.dll"); | ||
| } | ||
| } | ||
|
|
||
| return this; | ||
| }; | ||
|
|
||
| /** | ||
| * Verb to 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.removeMono(); | ||
| wizard.close(); | ||
| } | ||
| }; | ||
|
|
||
| /* exported Verb */ | ||
| var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "scriptName" : "Remove Mono", | ||
| "id" : "engines.wine.verbs.remove_mono", | ||
| "compatibleOperatingSystems" : [ | ||
| "MACOSX", | ||
| "LINUX" | ||
| ], | ||
| "testingOperatingSystems" : [], | ||
| "free" : true, | ||
| "requiresPatch" : false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,56 @@ | ||
| 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() | ||
|
|
||
| var setupFile32 = 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.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.windowsVersion("win7"); | ||
| this.run(setupFile32, ["/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"); | ||
| } | ||
| 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") | ||
| .name("NetFx64.exe") | ||
| .get(); | ||
| this.uninstall("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) | ||
| this.run(setupFile64, ["/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; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.