-
Notifications
You must be signed in to change notification settings - Fork 45
Update dotnet (add versions +fix) #839
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
06ad52f
Merge pull request #1 from PhoenicisOrg/master
ImperatorS79 86fd07c
Update script.js
ImperatorS79 a6f232b
Merge pull request #2 from PhoenicisOrg/master
ImperatorS79 a80aa84
Merge pull request #3 from PhoenicisOrg/master
ImperatorS79 6da4a59
Merge pull request #4 from PhoenicisOrg/master
ImperatorS79 4a11f65
Merge pull request #8 from PhoenicisOrg/master
ImperatorS79 b2d5724
Merge pull request #9 from PhoenicisOrg/master
ImperatorS79 b7d1f0f
Merge pull request #10 from PhoenicisOrg/master
ImperatorS79 533df6e
Merge pull request #11 from PhoenicisOrg/master
ImperatorS79 186e4ed
Merge pull request #12 from PhoenicisOrg/master
ImperatorS79 99cf1db
Merge pull request #13 from PhoenicisOrg/master
ImperatorS79 87999b4
Merge pull request #15 from PhoenicisOrg/master
ImperatorS79 610b258
Merge pull request #16 from PhoenicisOrg/master
ImperatorS79 ad2ea01
Merge pull request #17 from PhoenicisOrg/master
ImperatorS79 2e53a22
Merge pull request #18 from PhoenicisOrg/master
ImperatorS79 ac63d2c
Update dotnet
ImperatorS79 bf1bc6b
Update dotnet 2
ImperatorS79 13353cf
Update dotnet 3
ImperatorS79 1a249af
Update dotnet 4
ImperatorS79 09d0b7c
Update dotnet 5
ImperatorS79 a068712
Update dotnet 6
ImperatorS79 ca65bb0
Update dotnet 7
ImperatorS79 22346f1
Update script.js
ImperatorS79 7320fc8
Update script.js
ImperatorS79 692cf22
Update script.js
ImperatorS79 79b76c4
Update script.js
ImperatorS79 0076729
Update script.js
ImperatorS79 46b6f08
Update script.js
ImperatorS79 32c12d1
Update script.js
ImperatorS79 c47772b
Update script.js
ImperatorS79 dc139db
Fix script.json and delete override
ImperatorS79 a3c38fe
Fix script.json and delete override 2
ImperatorS79 70b1b34
Fix codacy
ImperatorS79 9fcb1cb
Fix ==
ImperatorS79 17989d8
Include clean-up and regedit.patch()
ImperatorS79 de5ad53
Remove check osVersion == null
ImperatorS79 c168ed0
Update script.js
ImperatorS79 10f93ca
Merge pull request #20 from PhoenicisOrg/master
ImperatorS79 152c94c
Update script.js
ImperatorS79 0856059
Update script.js
ImperatorS79 323c615
Update script.js
ImperatorS79 e9fd74e
Update script.js
ImperatorS79 dc1e4d2
Update script.js
ImperatorS79 6f9b410
Update script.js
ImperatorS79 09ba966
Update script.js
ImperatorS79 205e99f
Update dotnet46* install args
ImperatorS79 83d1b86
Add a verb to remove mono in a clean way (winetricks)
ImperatorS79 12e3d68
Run npm tools
ImperatorS79 c8c43c4
YouHOU camelCase !
ImperatorS79 7e63fd2
Oops
ImperatorS79 f1eb601
Travis are you happy?
ImperatorS79 cf6a4a5
Reapply osVersion null checkin (fix mscorlib ressource bug)
ImperatorS79 7d7375c
Put dotnet4* > dotnet45 in testing
ImperatorS79 7bd3841
Json align
ImperatorS79 6a9a456
Display message for manual verb installation
ImperatorS79 4576b20
Finalization
ImperatorS79 92fe610
Merge branch 'master' into dotnet
ImperatorS79 02a0ab2
Remove null check since master changes
ImperatorS79 07f566c
Merge branch 'dotnet' of http://www.github.com/ImperatorS79/scripts i…
ImperatorS79 2e04768
removemono -> remove_mono removeMono
ImperatorS79 4f672e6
Fix Codacy
ImperatorS79 a6ad465
Codacy changes
ImperatorS79 04ffb0e
Update script.js
ImperatorS79 241fc25
Fix spelling mistakes
ImperatorS79 0d98197
Merge branch 'master' into dotnet
ImperatorS79 252ded3
Fix conflicts
ImperatorS79 720e9b3
Update script.js
ImperatorS79 11cfce3
Update script.js
ImperatorS79 ade899d
Merge pull request #21 from PhoenicisOrg/master
ImperatorS79 ea4e9d7
Merge master
ImperatorS79 4292583
Include by id
ImperatorS79 bdaf530
Merge branch 'master' into dotnet
ImperatorS79 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why
print(...)and notthis.wizard().message(...)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, I do not know if it is relevant to display this when you are installing an application. But sure it should be done when installing the verb from the container tab.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to show all output information of Phoenicis and its script inside the GUI, except for logs. The reason is, that a user normally only looks at the UI, except in case of an error where he maybe also takes a look at the last ~20 lines of the logs.
printis even worse than a log file, because as far as I know it only shows the message in the console which is normally neither saved after exiting Phoenicis nor open for a normal user opening Phoenicis via a desktop shortcut (i.e.debor platpak).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but I wonder if showing such a warning when installing an app will not confuse people like "this does not seem really stable". I mean the script should be tested so this warning is meaningless when the verb is called inside an application script.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then why add the warning at all?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just as a reminder, for people wanting to use the verb (I think I will add it as a message in the verb implementation).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@plata @qparis what do you think? How should we print warnings? Via
print(...)orthis.wizard().message(...)? I think we need to have a standard for this.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Depends if the user can react on it. In this case, showing the message in the wizard would mean that a user installing a script which uses this verb would see the message. What is he supposed to do about it (except opening an issue on GitHub asking if this is alright)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then why do we show the message at all? Everything we print with
printis only written in the terminal, which is not really a place where I would look for warning messages as a user.Maybe we can add an icon with an
?or an!which shows the warning when hovering over it.This would still add the warning to the UI but hide it to prevent the user from overreacting?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it's in the terminal, we should get it as part of a potential error report (which is IMHO the only use case for this).