Skip to content

Commit

Permalink
remove_mono: always remove mscoree/.NET registry entries
Browse files Browse the repository at this point in the history
  • Loading branch information
austin987 committed Jul 7, 2023
1 parent 556ad35 commit 31c6ba9
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/winetricks
Original file line number Diff line number Diff line change
Expand Up @@ -18756,19 +18756,19 @@ load_remove_mono()
for uuid in ${mono_uuid}; do
"${WINE_ARCH}" uninstaller --remove "${uuid}"
done

"${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" /f || true
"${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4" /f || true

w_try rm -f "${W_WINDIR_UNIX}/system32/mscoree.dll"
if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_WINDIR_UNIX}/syswow64/mscoree.dll"
fi
elif [ -z "$1" ] || [ "$1" != "internal" ]; then
# Bail out if mono isn't installed, so we don't break .Net setups
w_warn "Mono does not appear to be installed."
return
fi

"${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" /f || true
"${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4" /f || true

w_try rm -f "${W_WINDIR_UNIX}/system32/mscoree.dll"
if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_WINDIR_UNIX}/syswow64/mscoree.dll"
fi
}


Expand Down

0 comments on commit 31c6ba9

Please sign in to comment.