diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json index b41675d8..c8f82ee2 100644 --- a/assets/jsons/translations/de.json +++ b/assets/jsons/translations/de.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": ".NET 6 Benötigt" + "dotnet-required": ".NET 8 Benötigt" }, "msg": { "401": "Steam scheint uns BeatSaber nicht herunterladen zu lassen 😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "Du hast es zu oft versucht, warte eine Weile und versuche es später erneut.", "TokenRejected": "Ihr Anmeldetoken wurde abgelehnt 😕 Bitte versuchen Sie es erneut.", "AccessDenied": "Der Zugang zu Steam wurde verweigert.", - "dotnet-required": ".NET 6 Runtime muss installiert sein, um eine Version von BeatSaber herunterzuladen. Lade es herunter, indem Du auf die Schaltfläche unten klickst." + "dotnet-required": ".NET 8 Runtime muss installiert sein, um eine Version von BeatSaber herunterzuladen. Lade es herunter, indem Du auf die Schaltfläche unten klickst." }, "actions": { - "download-dotnet": ".NET 6 Herunterladen" + "download-dotnet": ".NET 8 Herunterladen" } } }, diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json index b185748e..9315eb7d 100644 --- a/assets/jsons/translations/en.json +++ b/assets/jsons/translations/en.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": ".NET 6 Required" + "dotnet-required": ".NET 8 Required" }, "msg": { "401": "Steam doesn't seem to want to let us download Beat Saber 😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "You've tried too many times, wait a while and try again later.", "TokenRejected": "Your login token has been rejected 😕 Please try again.", "AccessDenied": "Access to Steam has been denied.", - "dotnet-required": ".NET 6 Runtime must be installed in order to download a version of Beat Saber. Download it by clicking the button below." + "dotnet-required": ".NET 8 Runtime must be installed in order to download a version of Beat Saber. Download it by clicking the button below." }, "actions": { - "download-dotnet": "Download .NET 6" + "download-dotnet": "Download .NET 8" } } }, diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json index 252e96cf..e176908e 100644 --- a/assets/jsons/translations/es.json +++ b/assets/jsons/translations/es.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": ".NET 6 Requerido" + "dotnet-required": ".NET 8 Requerido" }, "msg": { "401": "Parece que Steam no quiere dejarnos descargar Beat Saber 😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "Lo has intentado demasiadas veces, espera un poco y vuelve a intentarlo más tarde.", "TokenRejected": "Tu token de inicio de sesión ha sido rechazada 😕 Por favor, inténtalo de nuevo.", "AccessDenied": "El acceso a Steam ha sido denegado.", - "dotnet-required": "Se debe instalar el tiempo de ejecución de .NET 6 para descargar una versión de Beat Saber. Descárgalo haciendo clic en el botón de abajo." + "dotnet-required": "Se debe instalar el tiempo de ejecución de .NET 8 para descargar una versión de Beat Saber. Descárgalo haciendo clic en el botón de abajo." }, "actions": { - "download-dotnet": "Descargar .NET 6" + "download-dotnet": "Descargar .NET 8" } } }, diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json index 1a7c724e..c6672e29 100644 --- a/assets/jsons/translations/fr.json +++ b/assets/jsons/translations/fr.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": ".NET 6 Requis" + "dotnet-required": ".NET 8 Requis" }, "msg": { "401": "Steam ne semble pas vouloir nous laisser télécharger Beat Saber 😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "Tu as essayé trop de fois attends un peu et recommence plus tard.", "TokenRejected": "Votre token de connexion a été rejeté 😕 Veuillez réessayer.", "AccessDenied": "L'accès à Steam a été refusé.", - "dotnet-required": ".NET 6 Runtime doit être installé pour pouvoir télécharger une version de Beat Saber. Télécharge-le en cliquant sur le bouton ci-dessous." + "dotnet-required": ".NET 8 Runtime doit être installé pour pouvoir télécharger une version de Beat Saber. Télécharge-le en cliquant sur le bouton ci-dessous." }, "actions": { - "download-dotnet": "Télécharger .NET 6" + "download-dotnet": "Télécharger .NET 8" } } }, diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json index 6a721d5c..f4185b5e 100644 --- a/assets/jsons/translations/ja.json +++ b/assets/jsons/translations/ja.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": ".NET 6が必要です!" + "dotnet-required": ".NET 8が必要です!" }, "msg": { "401": "SteamがBeat Saberのダウンロードを許可してくれないようだ。😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "何度も試しているのでしばらくたって、もう一度お試しください。", "TokenRejected": "ログイントークンが拒否されました 😕 もう一度お試しください。", "AccessDenied": "Steamへのアクセスが拒否されました。", - "dotnet-required": "Beat Saberをダウンロードするには、.NET 6 Runtimeがインストールされている必要があります。下のボタンをクリックしてダウンロードしてください。" + "dotnet-required": "Beat Saberをダウンロードするには、.NET 8 Runtimeがインストールされている必要があります。下のボタンをクリックしてダウンロードしてください。" }, "actions": { - "download-dotnet": ".NET 6をダウンロード" + "download-dotnet": ".NET 8をダウンロード" } } }, diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json index aa0d5f2e..bcbbc6c1 100644 --- a/assets/jsons/translations/ru.json +++ b/assets/jsons/translations/ru.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": "Требуется .NET 6" + "dotnet-required": "Требуется .NET 8" }, "msg": { "401": "Похоже Steam не хочет, чтобы мы скачали Beat Saber 😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "Слишком много попыток, вернитесь позже и попробуйте снова.", "TokenRejected": "Ваш токен для входа был отклонен 😕 Пожалуйста, попробуйте снова.", "AccessDenied": "Доступ к Steam был отклонен.", - "dotnet-required": "Среда запуска .NET 6 должна быть установлена, чтобы скачать Beat Saber. Скачайте её с помощью кнопки ниже." + "dotnet-required": "Среда запуска .NET 8 должна быть установлена, чтобы скачать Beat Saber. Скачайте её с помощью кнопки ниже." }, "actions": { - "download-dotnet": "Скачать .NET 6" + "download-dotnet": "Скачать .NET 8" } } }, diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json index 09455531..267473ea 100644 --- a/assets/jsons/translations/zh-tw.json +++ b/assets/jsons/translations/zh-tw.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": "需要 .NET 6" + "dotnet-required": "需要 .NET 8" }, "msg": { "401": "Steam 似乎不想讓我們下載 Beat Saber😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "你已經嘗試了太多次，請稍等片刻，稍後再試。", "TokenRejected": "你的登錄令牌已被拒絕 😕 請重試。", "AccessDenied": "訪問 Steam 被拒絕。", - "dotnet-required": "必須安裝 .NET 6 Runtime 才能下載 Beat Saber 版本。單擊下面的按鈕下載它。" + "dotnet-required": "必須安裝 .NET 8 Runtime 才能下載 Beat Saber 版本。單擊下面的按鈕下載它。" }, "actions": { - "download-dotnet": "下載 .NET 6" + "download-dotnet": "下載 .NET 8" } } }, diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json index 7aeb6af7..b55c8eff 100644 --- a/assets/jsons/translations/zh.json +++ b/assets/jsons/translations/zh.json @@ -235,7 +235,7 @@ }, "errors": { "titles": { - "dotnet-required": "需要 .NET 6" + "dotnet-required": "需要 .NET 8" }, "msg": { "401": "Steam 似乎不想让我们下载 Beat Saber😢", @@ -260,10 +260,10 @@ "RateLimitExceeded": "你已经尝试了太多次，请稍等片刻，稍后再试。", "TokenRejected": "你的登录令牌已被拒绝 😕 请重试。", "AccessDenied": "访问 Steam 被拒绝。", - "dotnet-required": "必须安装 .NET 6 Runtime 才能下载 Beat Saber 版本。单击下面的按钮下载它。" + "dotnet-required": "必须安装 .NET 8 Runtime 才能下载 Beat Saber 版本。单击下面的按钮下载它。" }, "actions": { - "download-dotnet": "下载 .NET 6" + "download-dotnet": "下载 .NET 8" } } }, diff --git a/assets/scripts/depot-downloader/DepotDownloader.deps.json b/assets/scripts/depot-downloader/DepotDownloader.deps.json index 3b286c60..a443ea12 100644 --- a/assets/scripts/depot-downloader/DepotDownloader.deps.json +++ b/assets/scripts/depot-downloader/DepotDownloader.deps.json @@ -1,16 +1,17 @@ { "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", + "name": ".NETCoreApp,Version=v8.0/win-x64", "signature": "" }, "compilationOptions": {}, "targets": { - ".NETCoreApp,Version=v6.0": { - "DepotDownloader/2.5.0": { + ".NETCoreApp,Version=v8.0": {}, + ".NETCoreApp,Version=v8.0/win-x64": { + "DepotDownloader/2.7.3": { "dependencies": { - "QRCoder": "1.4.3", - "SteamKit2": "2.5.0-Beta.1", - "protobuf-net": "3.2.16" + "Microsoft.Windows.CsWin32": "0.3.106", + "SteamKit2": "3.0.0-Beta.4", + "protobuf-net": "3.2.30" }, "runtime": { "DepotDownloader.dll": {} @@ -23,60 +24,64 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "protobuf-net/3.2.16": { + "Microsoft.Windows.CsWin32/0.3.106": { "dependencies": { - "protobuf-net.Core": "3.2.16" + "Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha", + "Microsoft.Windows.SDK.Win32Metadata": "60.0.34-preview", + "Microsoft.Windows.WDK.Win32Metadata": "0.11.4-experimental" + } + }, + "Microsoft.Windows.SDK.Win32Docs/0.1.42-alpha": {}, + "Microsoft.Windows.SDK.Win32Metadata/60.0.34-preview": {}, + "Microsoft.Windows.WDK.Win32Metadata/0.11.4-experimental": { + "dependencies": { + "Microsoft.Windows.SDK.Win32Metadata": "60.0.34-preview" + } + }, + "protobuf-net/3.2.30": { + "dependencies": { + "protobuf-net.Core": "3.2.30" }, "runtime": { "lib/net6.0/protobuf-net.dll": { "assemblyVersion": "3.0.0.0", - "fileVersion": "3.2.16.54102" + "fileVersion": "3.2.30.709" } } }, - "protobuf-net.Core/3.2.16": { + "protobuf-net.Core/3.2.30": { "dependencies": { "System.Collections.Immutable": "7.0.0" }, "runtime": { "lib/net6.0/protobuf-net.Core.dll": { "assemblyVersion": "3.0.0.0", - "fileVersion": "3.2.16.54102" + "fileVersion": "3.2.30.709" } } }, - "QRCoder/1.4.3": { - "runtime": { - "lib/net6.0/QRCoder.dll": { - "assemblyVersion": "1.4.3.0", - "fileVersion": "1.4.3.0" - } - } - }, - "SteamKit2/2.5.0-Beta.1": { + "SteamKit2/3.0.0-Beta.4": { "dependencies": { "Microsoft.Win32.Registry": "5.0.0", - "protobuf-net": "3.2.16" + "System.IO.Hashing": "8.0.0", + "protobuf-net": "3.2.30" }, "runtime": { - "lib/net6.0/SteamKit2.dll": { - "assemblyVersion": "2.5.0.0", - "fileVersion": "2.5.0.0" + "lib/net8.0/SteamKit2.dll": { + "assemblyVersion": "3.0.0.0", + "fileVersion": "3.0.0.0" } } }, - "System.Collections.Immutable/7.0.0": { - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - }, + "System.Collections.Immutable/7.0.0": {}, + "System.IO.Hashing/8.0.0": { "runtime": { - "lib/net6.0/System.Collections.Immutable.dll": { - "assemblyVersion": "7.0.0.0", - "fileVersion": "7.0.22.51805" + "lib/net8.0/System.IO.Hashing.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.23.53103" } } }, - "System.Runtime.CompilerServices.Unsafe/6.0.0": {}, "System.Security.AccessControl/5.0.0": { "dependencies": { "Microsoft.NETCore.Platforms": "5.0.0", @@ -87,7 +92,7 @@ } }, "libraries": { - "DepotDownloader/2.5.0": { + "DepotDownloader/2.7.3": { "type": "project", "serviceable": false, "sha512": "" @@ -106,33 +111,54 @@ "path": "microsoft.win32.registry/5.0.0", "hashPath": "microsoft.win32.registry.5.0.0.nupkg.sha512" }, - "protobuf-net/3.2.16": { + "Microsoft.Windows.CsWin32/0.3.106": { "type": "package", "serviceable": true, - "sha512": "sha512-W6RM2B2f5O7SigBGfkXFYzI/a7Mks+rCHtuGlE/b5O3NMupDon7I0akjCLhrfcnqIfdWDkDafseav/MnIzUSHA==", - "path": "protobuf-net/3.2.16", - "hashPath": "protobuf-net.3.2.16.nupkg.sha512" + "sha512": "sha512-Mx5fK7uN6fwLR4wUghs6//HonAnwPBNmC2oonyJVhCUlHS/r6SUS3NkBc3+gaQiv+0/9bqdj1oSCKQFkNI+21Q==", + "path": "microsoft.windows.cswin32/0.3.106", + "hashPath": "microsoft.windows.cswin32.0.3.106.nupkg.sha512" }, - "protobuf-net.Core/3.2.16": { + "Microsoft.Windows.SDK.Win32Docs/0.1.42-alpha": { "type": "package", "serviceable": true, - "sha512": "sha512-ZFoY0lfMUWGJ4RoyI0oNj2o2l8t08n3k27YyDD0kYWQ+vXj0hTbWEwYWOpGAfCWvyUPkq9Jcc/4uR74GICZL2g==", - "path": "protobuf-net.core/3.2.16", - "hashPath": "protobuf-net.core.3.2.16.nupkg.sha512" + "sha512": "sha512-Z/9po23gUA9aoukirh2ItMU2ZS9++Js9Gdds9fu5yuMojDrmArvY2y+tq9985tR3cxFxpZO1O35Wjfo0khj5HA==", + "path": "microsoft.windows.sdk.win32docs/0.1.42-alpha", + "hashPath": "microsoft.windows.sdk.win32docs.0.1.42-alpha.nupkg.sha512" }, - "QRCoder/1.4.3": { + "Microsoft.Windows.SDK.Win32Metadata/60.0.34-preview": { "type": "package", "serviceable": true, - "sha512": "sha512-fWuFqjm8GTlEb2GqBl3Hi8HZZeZQwBSHxvRPtPjyNbT82H0ff0JwavKRBmMaXCno1Av6McPC8aJzri0Mj2w9Jw==", - "path": "qrcoder/1.4.3", - "hashPath": "qrcoder.1.4.3.nupkg.sha512" + "sha512": "sha512-TA3DUNi4CTeo+ItTXBnGZFt2159XOGSl0UOlG5vjDj4WHqZjhwYyyUnzOtrbCERiSaP2Hzg7otJNWwOSZgutyA==", + "path": "microsoft.windows.sdk.win32metadata/60.0.34-preview", + "hashPath": "microsoft.windows.sdk.win32metadata.60.0.34-preview.nupkg.sha512" }, - "SteamKit2/2.5.0-Beta.1": { + "Microsoft.Windows.WDK.Win32Metadata/0.11.4-experimental": { "type": "package", "serviceable": true, - "sha512": "sha512-fwwdF0cZZEIdNpcUc1+B9zbP5Q48A3DFOAclPhBh2dMTU03aROaIDktFW+Ww/NN1Z/Emp/LwVqHB+hCM8uxS4Q==", - "path": "steamkit2/2.5.0-beta.1", - "hashPath": "steamkit2.2.5.0-beta.1.nupkg.sha512" + "sha512": "sha512-bf5MCmUyZf0gBlYQjx9UpRAZWBkRndyt9XicR+UNLvAUAFTZQbu6YaX/sNKZlR98Grn0gydfh/yT4I3vc0AIQA==", + "path": "microsoft.windows.wdk.win32metadata/0.11.4-experimental", + "hashPath": "microsoft.windows.wdk.win32metadata.0.11.4-experimental.nupkg.sha512" + }, + "protobuf-net/3.2.30": { + "type": "package", + "serviceable": true, + "sha512": "sha512-C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==", + "path": "protobuf-net/3.2.30", + "hashPath": "protobuf-net.3.2.30.nupkg.sha512" + }, + "protobuf-net.Core/3.2.30": { + "type": "package", + "serviceable": true, + "sha512": "sha512-v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==", + "path": "protobuf-net.core/3.2.30", + "hashPath": "protobuf-net.core.3.2.30.nupkg.sha512" + }, + "SteamKit2/3.0.0-Beta.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gDLccGTbvg5RzqQE75uqL3z2Z0F8MTOnier97DdbBGi9F6DDbZQvquHf0INOAEyN7S5Ku+CgaKnkm409UD7avA==", + "path": "steamkit2/3.0.0-beta.4", + "hashPath": "steamkit2.3.0.0-beta.4.nupkg.sha512" }, "System.Collections.Immutable/7.0.0": { "type": "package", @@ -141,12 +167,12 @@ "path": "system.collections.immutable/7.0.0", "hashPath": "system.collections.immutable.7.0.0.nupkg.sha512" }, - "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "System.IO.Hashing/8.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", - "path": "system.runtime.compilerservices.unsafe/6.0.0", - "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512" + "sha512": "sha512-ne1843evDugl0md7Fjzy6QjJrzsjh46ZKbhf8GwBXb5f/gw97J4bxMs0NQKifDuThh/f0bZ0e62NPl1jzTuRqA==", + "path": "system.io.hashing/8.0.0", + "hashPath": "system.io.hashing.8.0.0.nupkg.sha512" }, "System.Security.AccessControl/5.0.0": { "type": "package", diff --git a/assets/scripts/depot-downloader/DepotDownloader.dll b/assets/scripts/depot-downloader/DepotDownloader.dll index 049150fd..5ee609da 100644 Binary files a/assets/scripts/depot-downloader/DepotDownloader.dll and b/assets/scripts/depot-downloader/DepotDownloader.dll differ diff --git a/assets/scripts/depot-downloader/DepotDownloader.exe b/assets/scripts/depot-downloader/DepotDownloader.exe index 30eacd56..def62f3f 100644 Binary files a/assets/scripts/depot-downloader/DepotDownloader.exe and b/assets/scripts/depot-downloader/DepotDownloader.exe differ diff --git a/assets/scripts/depot-downloader/DepotDownloader.pdb b/assets/scripts/depot-downloader/DepotDownloader.pdb index 1e9f07ed..7ef512e7 100644 Binary files a/assets/scripts/depot-downloader/DepotDownloader.pdb and b/assets/scripts/depot-downloader/DepotDownloader.pdb differ diff --git a/assets/scripts/depot-downloader/DepotDownloader.runtimeconfig.json b/assets/scripts/depot-downloader/DepotDownloader.runtimeconfig.json index 3c15255d..8ce36db2 100644 --- a/assets/scripts/depot-downloader/DepotDownloader.runtimeconfig.json +++ b/assets/scripts/depot-downloader/DepotDownloader.runtimeconfig.json @@ -1,13 +1,16 @@ { "runtimeOptions": { - "tfm": "net6.0", + "tfm": "net8.0", "rollForward": "LatestMajor", "framework": { "name": "Microsoft.NETCore.App", - "version": "6.0.0" + "version": "8.0.0" }, "configProperties": { - "System.Reflection.Metadata.MetadataUpdater.IsSupported": false + "System.Globalization.Invariant": true, + "System.Globalization.PredefinedCulturesOnly": true, + "System.Reflection.Metadata.MetadataUpdater.IsSupported": false, + "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false } } } \ No newline at end of file diff --git a/assets/scripts/depot-downloader/LICENSE b/assets/scripts/depot-downloader/LICENSE new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/assets/scripts/depot-downloader/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/assets/scripts/depot-downloader/QRCoder.dll b/assets/scripts/depot-downloader/QRCoder.dll deleted file mode 100644 index a6fabe90..00000000 Binary files a/assets/scripts/depot-downloader/QRCoder.dll and /dev/null differ diff --git a/assets/scripts/depot-downloader/SteamKit2.dll b/assets/scripts/depot-downloader/SteamKit2.dll index c0384d50..06d69798 100644 Binary files a/assets/scripts/depot-downloader/SteamKit2.dll and b/assets/scripts/depot-downloader/SteamKit2.dll differ diff --git a/assets/scripts/depot-downloader/System.Collections.Immutable.dll b/assets/scripts/depot-downloader/System.Collections.Immutable.dll deleted file mode 100644 index 86773fe8..00000000 Binary files a/assets/scripts/depot-downloader/System.Collections.Immutable.dll and /dev/null differ diff --git a/assets/scripts/depot-downloader/System.IO.Hashing.dll b/assets/scripts/depot-downloader/System.IO.Hashing.dll new file mode 100644 index 00000000..233a5c89 Binary files /dev/null and b/assets/scripts/depot-downloader/System.IO.Hashing.dll differ diff --git a/assets/scripts/depot-downloader/protobuf-net.Core.dll b/assets/scripts/depot-downloader/protobuf-net.Core.dll index 59ff491c..845a8403 100644 Binary files a/assets/scripts/depot-downloader/protobuf-net.Core.dll and b/assets/scripts/depot-downloader/protobuf-net.Core.dll differ diff --git a/assets/scripts/depot-downloader/protobuf-net.dll b/assets/scripts/depot-downloader/protobuf-net.dll index 361af4f4..e4b68393 100644 Binary files a/assets/scripts/depot-downloader/protobuf-net.dll and b/assets/scripts/depot-downloader/protobuf-net.dll differ diff --git a/package.json b/package.json index 24abeafb..aa62fc2e 100644 --- a/package.json +++ b/package.json @@ -317,5 +317,8 @@ "!assets/**" ], "logLevel": "quiet" + }, + "volta": { + "node": "20.18.0" } } diff --git a/src/main/ipcs/bs-version-download/bs-download-ipcs.ts b/src/main/ipcs/bs-version-download/bs-download-ipcs.ts index 9ca8405d..03bd6968 100644 --- a/src/main/ipcs/bs-version-download/bs-download-ipcs.ts +++ b/src/main/ipcs/bs-version-download/bs-download-ipcs.ts @@ -12,11 +12,11 @@ ipc.on("import-version", (req, reply) => { reply(versionManager.importVersion(req.args)); }); -// #region Steam +// #region Steam -ipc.on("is-dotnet-6-installed", (_, reply) => { +ipc.on("is-dotnet-installed", (_, reply) => { const installer = BsSteamDownloaderService.getInstance(); - reply(from(installer.isDotNet6Installed())); + reply(from(installer.isDotNetInstalled())); }); ipc.on("bs-download.installation-folder", (_, reply) => { @@ -83,4 +83,4 @@ ipc.on("bs-oculus-clear-auth-token", async (_, reply) => { reply(from(oculusDownloader.clearAuthToken())); }); -// #endregion \ No newline at end of file +// #endregion diff --git a/src/main/services/bs-version-download/bs-steam-downloader.service.ts b/src/main/services/bs-version-download/bs-steam-downloader.service.ts index 2660b929..1543dd85 100644 --- a/src/main/services/bs-version-download/bs-steam-downloader.service.ts +++ b/src/main/services/bs-version-download/bs-steam-downloader.service.ts @@ -44,7 +44,7 @@ export class BsSteamDownloaderService { return path.join(this.utils.getAssetsScriptsPath(), "depot-downloader", `DepotDownloader.${process.platform === 'linux' ? 'dll' : 'exe'}`); } - public async isDotNet6Installed(): Promise { + public async isDotNetInstalled(): Promise { try { const proc = process.platform === 'linux' ? spawnSync('dotnet', [this.getDepotDownloaderExePath()]) @@ -55,7 +55,7 @@ export class BsSteamDownloaderService { } return true; } catch (e) { - log.error("Error while checking .NET 6", e); + log.error("Error while checking .NET 8", e); return false; } } diff --git a/src/renderer/services/bs-version-download/steam-downloader.service.ts b/src/renderer/services/bs-version-download/steam-downloader.service.ts index 5ef92526..fbd0df64 100644 --- a/src/renderer/services/bs-version-download/steam-downloader.service.ts +++ b/src/renderer/services/bs-version-download/steam-downloader.service.ts @@ -45,8 +45,8 @@ export class SteamDownloaderService extends AbstractBsDownloaderService implemen this.linkOpener = LinkOpenerService.getInstance(); } - public isDotNet6Installed(): Promise { - return lastValueFrom(this.ipcService.sendV2("is-dotnet-6-installed")); + public isDotNetInstalled(): Promise { + return lastValueFrom(this.ipcService.sendV2("is-dotnet-installed")); } private setSteamSession(username: string): void { localStorage.setItem(this.STEAM_SESSION_USERNAME_KEY, username); } @@ -63,7 +63,7 @@ export class SteamDownloaderService extends AbstractBsDownloaderService implemen }); if (choice === "0") { - this.linkOpener.open("https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-6.0.12-windows-x64-installer"); + this.linkOpener.open("https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.10-windows-x64-installer"); } } @@ -221,7 +221,7 @@ export class SteamDownloaderService extends AbstractBsDownloaderService implemen const downloadPromise = (async () => { - const haveDotNet = await this.isDotNet6Installed().catch(() => false); + const haveDotNet = await this.isDotNetInstalled().catch(() => false); if(!haveDotNet){ this.showDotNetNotInstalledError(); return Promise.reject(new Error("DotNet not installed"));