Added Microsoft .NET Framework version 4.6.1 and 4.6.2 and updated .NET Setup Verifier Tool #714
Conversation
…gets stuck behind the taskbar
| @@ -6269,7 +6271,8 @@ load_dotnet30() | |||
| WINEDLLOVERRIDES="ngen.exe,mscorsvw.exe=b;$WINEDLLOVERRIDES" | |||
|
|
|||
| w_try_cd "$W_CACHE/$W_PACKAGE" | |||
| w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"} | |||
| w_warn "Installing .NET 3.0 runtime silently as otherwise it gets hidden behind taskbar." | |||
There was a problem hiding this comment.
Maybe "Installing .NET 3.0 runtime silently, as otherwise it gets hidden behind taskbar. Installation usually takes about 3 minutes."
| @@ -6248,7 +6250,7 @@ load_dotnet30() | |||
|
|
|||
| w_call dotnet20 | |||
|
|
|||
| w_warn "Installing .NET 3.0 runtime takes 3 minutes on a very fast machine, and the Finished dialog may hide in the taskbar." | |||
| w_warn "Installing .NET 3.0 runtime takes 3 minutes on a very fast machine." | |||
There was a problem hiding this comment.
Probably can be removed.
|
@qwertychouskie review feedback has been implemented |
| w_call remove_mono | ||
|
|
||
| # Remove Mono registry entry: | ||
| "$WINE" reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f |
There was a problem hiding this comment.
This is unnecessary, it's handled by remove_mono.
| # Remove Mono registry entry: | ||
| "$WINE" reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f | ||
|
|
||
| w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll" |
There was a problem hiding this comment.
I'm not sure this is actually needed either after remove_mono, but haven't tested.
| w_call remove_mono | ||
|
|
||
| # Remove Mono registry entry: | ||
| "$WINE" reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f |
|
|
||
| # Official .NET 4.6.2 offline installer fails. See https://bugs.winehq.org/show_bug.cgi?id=42170 | ||
| # Un-official slim version does not fail. See http://repacks.net/forum/viewtopic.php?t=7 | ||
| w_download http://repacks.net/uploads/dotNetFx462_Full_x86_x64_Slim.exe 1886c2b3b6eba37fcf79d59c9e5b100930150fda |
There was a problem hiding this comment.
This needs to be behind a w_workaround_wine_bug check. It should then also support the official version, for once the bug is fixed.
I also suspect this problem may be staging specific..
…bug check and removed manual Mono removal from .NET setups
|
@austin987 I've made the requested changes and tested it |
|
@jasminsehic, thanks, I'll look this afternoon after some other .net stuff I'm working on. |
|
Hi @jasminsehic I ended up reworking the patches a bit, and committed them over the past few days: dotnet30 taskbar (good fix, thanks!): ac3d56d Then, I moved all the mono cleanup code to remove_mono() here: Then you rebased dotnet461/462 patch: and finally, I added them to winetricks-test: |
|
Looks good @austin987. Thanks for merging this in |
No description provided.