Skip to content
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

Update dotnet + add dotnet 9 #2304

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion files/verbs/all.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
===== apps =====
3m_library 3M Cloud Library (3M Company, 2015) [downloadable]
7zip 7-Zip 19.00 (Igor Pavlov, 2019) [downloadable]
7zip 7-Zip 24.08 (Igor Pavlov, 2024) [downloadable]
adobe_diged Adobe Digital Editions 1.7 (Adobe, 2011) [downloadable]
adobe_diged4 Adobe Digital Editions 4.5 (Adobe, 2015) [downloadable]
autohotkey AutoHotKey (autohotkey.org, 2010) [downloadable]
Expand Down Expand Up @@ -157,12 +157,16 @@ dotnet472 MS .NET 4.7.2 (Microsoft, 2018) [downloadable]
dotnet48 MS .NET 4.8 (Microsoft, 2019) [downloadable]
dotnet6 MS .NET Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dotnet7 MS .NET Runtime 7.0 LTS (Microsoft, 2023) [downloadable]
dotnet8 MS .NET Runtime 8.0 LTS (Microsoft, 2024) [downloadable]
dotnet9 MS .NET Runtime 9.0 LTS (Microsoft, 2024) [downloadable]
dotnet_verifier MS .NET Verifier (Microsoft, 2016) [downloadable]
dotnetcore2 MS .NET Core Runtime 2.1 LTS (Microsoft, 2020) [downloadable]
dotnetcore3 MS .NET Core Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetcoredesktop3 MS .NET Core Desktop Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetdesktop6 MS .NET Desktop Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dotnetdesktop7 MS .NET Desktop Runtime 7.0 LTS (Microsoft, 2023) [downloadable]
dotnetdesktop8 MS .NET Desktop Runtime 8.0 LTS (Microsoft, 2024) [downloadable]
dotnetdesktop9 MS .NET Desktop Runtime 9.0 LTS (Microsoft, 2024) [downloadable]
dpvoice Microsoft dpvoice dpvvox dpvacm Audio dlls (Microsoft, 2002) [downloadable]
dsdmo MS dsdmo.dll (Microsoft, 2010) [downloadable]
dsound MS DirectSound from DirectX user redistributable (Microsoft, 2010) [downloadable]
Expand Down
2 changes: 1 addition & 1 deletion files/verbs/apps.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
3m_library 3M Cloud Library (3M Company, 2015) [downloadable]
7zip 7-Zip 19.00 (Igor Pavlov, 2019) [downloadable]
7zip 7-Zip 24.08 (Igor Pavlov, 2024) [downloadable]
adobe_diged Adobe Digital Editions 1.7 (Adobe, 2011) [downloadable]
adobe_diged4 Adobe Digital Editions 4.5 (Adobe, 2015) [downloadable]
autohotkey AutoHotKey (autohotkey.org, 2010) [downloadable]
Expand Down
4 changes: 4 additions & 0 deletions files/verbs/dlls.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,16 @@ dotnet472 MS .NET 4.7.2 (Microsoft, 2018) [downloadable]
dotnet48 MS .NET 4.8 (Microsoft, 2019) [downloadable]
dotnet6 MS .NET Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dotnet7 MS .NET Runtime 7.0 LTS (Microsoft, 2023) [downloadable]
dotnet8 MS .NET Runtime 8.0 LTS (Microsoft, 2024) [downloadable]
dotnet9 MS .NET Runtime 9.0 LTS (Microsoft, 2024) [downloadable]
dotnet_verifier MS .NET Verifier (Microsoft, 2016) [downloadable]
dotnetcore2 MS .NET Core Runtime 2.1 LTS (Microsoft, 2020) [downloadable]
dotnetcore3 MS .NET Core Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetcoredesktop3 MS .NET Core Desktop Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetdesktop6 MS .NET Desktop Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dotnetdesktop7 MS .NET Desktop Runtime 7.0 LTS (Microsoft, 2023) [downloadable]
dotnetdesktop8 MS .NET Desktop Runtime 8.0 LTS (Microsoft, 2024) [downloadable]
dotnetdesktop9 MS .NET Desktop Runtime 9.0 LTS (Microsoft, 2024) [downloadable]
dpvoice Microsoft dpvoice dpvvox dpvacm Audio dlls (Microsoft, 2002) [downloadable]
dsdmo MS dsdmo.dll (Microsoft, 2010) [downloadable]
dsound MS DirectSound from DirectX user redistributable (Microsoft, 2010) [downloadable]
Expand Down
4 changes: 4 additions & 0 deletions files/verbs/download.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,16 @@ dotnet472
dotnet48
dotnet6
dotnet7
dotnet8
dotnet9
dotnet_verifier
dotnetcore2
dotnetcore3
dotnetcoredesktop3
dotnetdesktop6
dotnetdesktop7
dotnetdesktop8
dotnetdesktop9
dpvoice
droid
dsdmo
Expand Down
96 changes: 74 additions & 22 deletions src/winetricks
Original file line number Diff line number Diff line change
Expand Up @@ -10207,21 +10207,21 @@ w_metadata dotnet6 dlls \
publisher="Microsoft" \
year="2023" \
media="download" \
file1="dotnet-runtime-6.0.33-win-x86.exe" \
file1="dotnet-runtime-6.0.36-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"

load_dotnet6()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/6.0
w_download https://download.visualstudio.microsoft.com/download/pr/ef2dbfa6-683e-4ff3-9a17-9f3001d6bdf2/acf6114cce3533200116016b83e76ea7/dotnet-runtime-6.0.33-win-x86.exe 6cee93570624bd478c86c887f986cf497c2fdbb02c1116eede150601f5100ee5
w_download https://download.visualstudio.microsoft.com/download/pr/727d79cb-6a4c-4a6b-bd9e-af99ad62de0b/5cd3550f1589a2f1b3a240c745dd1023/dotnet-runtime-6.0.36-win-x86.exe 3b3cb4636251a582158f4b6b340f20b3861e6793eb9a3e64bda29cbf32da3604

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}

if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
w_download https://download.visualstudio.microsoft.com/download/pr/3c01bbe6-a49d-468f-8335-f195588f582f/b935469e8480e611eae4d79b2e51965e/dotnet-runtime-6.0.33-win-x64.exe ddf16712e509cc7575db52ce116b004b270538646a098cbc51ab38e9e9cb45e1
w_try "${WINE}" "dotnet-runtime-6.0.33-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
w_download https://download.visualstudio.microsoft.com/download/pr/1a5fc50a-9222-4f33-8f73-3c78485a55c7/1cb55899b68fcb9d98d206ba56f28b66/dotnet-runtime-6.0.36-win-x64.exe 6bdad7bc4c41fe93d4ae7b0312b1d017cfe369d28e7e2e421f5b675f9feefe84
w_try "${WINE}" "dotnet-runtime-6.0.36-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}

Expand All @@ -10232,21 +10232,21 @@ w_metadata dotnetdesktop6 dlls \
publisher="Microsoft" \
year="2023" \
media="download" \
file1="windowsdesktop-runtime-6.0.33-win-x86.exe" \
file1="windowsdesktop-runtime-6.0.36-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"

load_dotnetdesktop6()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/6.0
w_download https://download.visualstudio.microsoft.com/download/pr/8029cdb3-0f5f-4018-bff7-bacd9b9357f8/daf6c8b102a3bdfbbf235cfa0e46f901/windowsdesktop-runtime-6.0.33-win-x86.exe 15e99cd7ef4d705ed348b966da16cbe4873767eb8474729cad277015ca5d422c
w_download https://download.visualstudio.microsoft.com/download/pr/cdc314df-4a4c-4709-868d-b974f336f77f/acd5ab7637e456c8a3aa667661324f6d/windowsdesktop-runtime-6.0.36-win-x86.exe 4e77bd970df0a06528ee88d33e4a8c9fb85beedbdd7219b017083acf0c3aa39e

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}

if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
w_download https://download.visualstudio.microsoft.com/download/pr/3ebc1f91-a5ba-477e-9353-198fa4e13371/35f447d6820b078fd18523764a4f0213/windowsdesktop-runtime-6.0.33-win-x64.exe 6b1b7bffe4024d86c4feb6e881648de557c6bff2e16e867e3ce1a2ed39489a53
w_try "${WINE}" "windowsdesktop-runtime-6.0.33-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
w_download https://download.visualstudio.microsoft.com/download/pr/f6b6c5dc-e02d-4738-9559-296e938dabcb/b66d365729359df8e8ea131197715076/windowsdesktop-runtime-6.0.36-win-x64.exe 0d20debb26fc8b2bc84f25fbd9d4596a6364af8517ebf012e8b871127b798941
w_try "${WINE}" "windowsdesktop-runtime-6.0.36-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}

Expand Down Expand Up @@ -10307,21 +10307,21 @@ w_metadata dotnet8 dlls \
publisher="Microsoft" \
year="2024" \
media="download" \
file1="dotnet-runtime-8.0.8-win-x86.exe" \
file1="dotnet-runtime-8.0.11-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"

load_dotnet8()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/8.0
w_download https://download.visualstudio.microsoft.com/download/pr/c2083daf-6d33-404f-a7d6-dd3bb012a945/e241d0aff000f63ef8a49c3c7da08087/dotnet-runtime-8.0.8-win-x86.exe d8c1f60bba67f9b1bed4b823b1354d9b255531ebe5fc72569a4023a33b6a3b67
w_download https://download.visualstudio.microsoft.com/download/pr/a8d1a489-60d6-4e63-93ee-ab9c44d78b0d/5519f99ff50de6e096bb1d266dd0e667/dotnet-runtime-8.0.11-win-x86.exe ad8ff237ab0a18dd34cadb10b646c0bf46754225b2848a25758a16a15bc8daf4

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}

if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
w_download https://download.visualstudio.microsoft.com/download/pr/cc913baa-9bce-482e-bdfc-56c4b6fafd10/e3f24f2ab2fc02b395c1b67f5193b8d1/dotnet-runtime-8.0.8-win-x64.exe 2f902081294e31c82f7ffae4b58483d05515fb3c979ec08b9d9942c5088ff542
w_try "${WINE}" "dotnet-runtime-8.0.8-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
w_download https://download.visualstudio.microsoft.com/download/pr/53e9e41c-b362-4598-9985-45f989518016/53c5e1919ba2fe23273f2abaff65595b/dotnet-runtime-8.0.11-win-x64.exe f4f7768725105f4c07b2b80b872ded1fe9b56d98b4fd0b825a7df80d6bf6d2b0
w_try "${WINE}" "dotnet-runtime-8.0.11-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}

Expand All @@ -10332,21 +10332,71 @@ w_metadata dotnetdesktop8 dlls \
publisher="Microsoft" \
year="2024" \
media="download" \
file1="windowsdesktop-runtime-8.0.8-win-x86.exe" \
file1="windowsdesktop-runtime-8.0.11-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"

load_dotnetdesktop8()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/8.0
w_download https://download.visualstudio.microsoft.com/download/pr/bd1c2e28-44dd-47bb-a55c-aedd1f3e8cc4/0a15fac821e64cf7b8ec6d99e54e0997/windowsdesktop-runtime-8.0.8-win-x86.exe ea91f1d50cfacff95eabb57c5dff47843174f349f55d11d44d09850960da58dd
w_download https://download.visualstudio.microsoft.com/download/pr/6e1f5faf-ee7d-4db0-9111-9e270a458342/4cdcd1af2d6914134308630f048fbdfc/windowsdesktop-runtime-8.0.11-win-x86.exe 20fff5daa81998e2c05529da8a15af982e84aefd3d12e09dddd981c5f5f60757

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}

if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
w_download https://download.visualstudio.microsoft.com/download/pr/907765b0-2bf8-494e-93aa-5ef9553c5d68/a9308dc010617e6716c0e6abd53b05ce/windowsdesktop-runtime-8.0.8-win-x64.exe 1d8fc3eaad1285d701a77216e923c8be404dc2254d51779503828a3b3e1cdeb1
w_try "${WINE}" "windowsdesktop-runtime-8.0.8-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
w_download https://download.visualstudio.microsoft.com/download/pr/27bcdd70-ce64-4049-ba24-2b14f9267729/d4a435e55182ce5424a7204c2cf2b3ea/windowsdesktop-runtime-8.0.11-win-x64.exe 7a418127fb8510cfefc6b9db220168b851ef2748f8252829997b3c61510c830a
w_try "${WINE}" "windowsdesktop-runtime-8.0.11-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}

#----------------------------------------------------------------

w_metadata dotnet9 dlls \
title="MS .NET Runtime 9.0 LTS" \
publisher="Microsoft" \
year="2024" \
media="download" \
file1="dotnet-runtime-9.0.0-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"

load_dotnet9()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/9.0
w_download https://download.visualstudio.microsoft.com/download/pr/0e89cce9-dc02-423c-a657-0c2b421edf21/af2e916785775fe7e023b953af404db5/dotnet-runtime-9.0.0-win-x86.exe 23ea08b36404c0328ba25bb3f023dfe3bc7de055ddd96c36472937b7b8f4d784

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}

if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
w_download https://download.visualstudio.microsoft.com/download/pr/99bd07c2-c95c-44dc-9d47-36d3b18df240/bdf26c62f69c1b783687c1dce83ccf7a/dotnet-runtime-9.0.0-win-x64.exe d49c026086cf2f496d3f0470e6b0bf58e695261cc76f4e9fca9869f63f9d4ca1
w_try "${WINE}" "dotnet-runtime-9.0.0-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}

#----------------------------------------------------------------

w_metadata dotnetdesktop9 dlls \
title="MS .NET Desktop Runtime 9.0 LTS" \
publisher="Microsoft" \
year="2024" \
media="download" \
file1="windowsdesktop-runtime-9.0.0-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"

load_dotnetdesktop9()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/9.0
w_download https://download.visualstudio.microsoft.com/download/pr/8dfbde7b-c316-418d-934a-d3246253f342/69c6a35b77a4f01b95588e1df2bddf9a/windowsdesktop-runtime-9.0.0-win-x86.exe f9f7e182a3516ec7ebba4f2a1d68b016ce7786a460bb7353641031dc4c6e9834

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}

if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
w_download https://download.visualstudio.microsoft.com/download/pr/685792b6-4827-4dca-a971-bce5d7905170/1bf61b02151bc56e763dc711e45f0e1e/windowsdesktop-runtime-9.0.0-win-x64.exe f8695b6ea8b98ff075160a9200adf3a9c26585bc05f14f2a1e3c755a31f488b3
w_try "${WINE}" "windowsdesktop-runtime-9.0.0-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}

Expand Down Expand Up @@ -14005,9 +14055,10 @@ load_vcrun2022()
# 2024/02/11: 510fc8c2112e2bc544fb29a72191eabcc68d3a5a7468d35d7694493bc8593a79
# 2024/06/10: a32dd41eaab0c5e1eaa78be3c0bb73b48593de8d97a7510b97de3fd993538600
# 2024/10/17: ed1967c2ac27d806806d121601b526f84e497ae1b99ed139c0c4c6b50147df4a
# 2024/11/20: dd1a8be03398367745a87a5e35bebdab00fdad080cf42af0c3f20802d08c25d4
w_override_dlls native,builtin concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140

w_download https://aka.ms/vs/17/release/vc_redist.x86.exe ed1967c2ac27d806806d121601b526f84e497ae1b99ed139c0c4c6b50147df4a
w_download https://aka.ms/vs/17/release/vc_redist.x86.exe dd1a8be03398367745a87a5e35bebdab00fdad080cf42af0c3f20802d08c25d4

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
Expand All @@ -14022,10 +14073,11 @@ load_vcrun2022()
# 2024/02/11: 1ad7988c17663cc742b01bef1a6df2ed1741173009579ad50a94434e54f56073
# 2024/06/10: 3642e3f95d50cc193e4b5a0b0ffbf7fe2c08801517758b4c8aeb7105a091208a
# 2024/10/17: 814e9da5ec5e5d6a8fa701999d1fc3baddf7f3adc528e202590e9b1cb73e4a11
# 2024/11/20: 1821577409c35b2b9505ac833e246376cc68a8262972100444010b57226f0940
# vcruntime140_1 is only shipped on x64:
w_override_dlls native,builtin vcruntime140_1

w_download https://aka.ms/vs/17/release/vc_redist.x64.exe 814e9da5ec5e5d6a8fa701999d1fc3baddf7f3adc528e202590e9b1cb73e4a11
w_download https://aka.ms/vs/17/release/vc_redist.x64.exe 1821577409c35b2b9505ac833e246376cc68a8262972100444010b57226f0940
w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
;;
esac
Expand Down Expand Up @@ -15598,16 +15650,16 @@ load_3m_library()
#----------------------------------------------------------------

w_metadata 7zip apps \
title="7-Zip 19.00" \
title="7-Zip 24.08" \
publisher="Igor Pavlov" \
year="2019" \
year="2024" \
media="download" \
file1="7z1900.exe" \
file1="7z2408.exe" \
installed_exe1="${W_PROGRAMS_X86_WIN}/7-Zip/7zFM.exe"

load_7zip()
{
w_download https://www.7-zip.org/a/7z1900.exe 759aa04d5b03ebeee13ba01df554e8c962ca339c74f56627c8bed6984bb7ef80
w_download https://www.7-zip.org/a/7z2408.exe faa87251336d864b877a5e6c3e9c9a5e250318be2fdfc8a42ceadb3a956e0405
w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S}
}
Expand Down
Loading