From 57b2f393f8b42b0cef18d9901364cf22a667a05b Mon Sep 17 00:00:00 2001 From: doxoh Date: Tue, 26 Mar 2024 21:59:25 +0100 Subject: [PATCH 1/3] chore: bump to dotnet8 --- download_dotnet.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download_dotnet.ps1 b/download_dotnet.ps1 index 2fa8edd..88f9d2f 100644 --- a/download_dotnet.ps1 +++ b/download_dotnet.ps1 @@ -10,7 +10,7 @@ $start = $pwd cd $path -$dotnetRelease = Invoke-WebRequest 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json' | ConvertFrom-Json +$dotnetRelease = Invoke-WebRequest 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/8.0/releases.json' | ConvertFrom-Json $dotnetVersion = $dotnetRelease."latest-release" From a4d32b0b229a5764ba763e020d0fcea21e85996d Mon Sep 17 00:00:00 2001 From: doxoh Date: Tue, 26 Mar 2024 22:19:01 +0100 Subject: [PATCH 2/3] fix(client): load correct dotnet version --- client/src/coreclr/CoreClr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/coreclr/CoreClr.cpp b/client/src/coreclr/CoreClr.cpp index ce299aa..7566bd9 100644 --- a/client/src/coreclr/CoreClr.cpp +++ b/client/src/coreclr/CoreClr.cpp @@ -193,7 +193,7 @@ uint8_t GetCachedAssembly(const char* name, int* bufferSize, void** buffer) { auto stream = std::ifstream(path, std::ios::binary); miniz_cpp::zip_file zip(stream); std::stringstream contentStream; - auto fileName = std::string("lib/net6.0/") + name + ".dll"; + auto fileName = std::string("lib/net8.0/") + name + ".dll"; if (!zip.has_file(fileName)) { cs::Log::Warning << "Nupkg was found, but no dll was found in it" << cs::Log::Endl; zip.printdir(); From 92e84acbb50ab3c4e661dae7b69c0845ba2e9660 Mon Sep 17 00:00:00 2001 From: doxoh Date: Wed, 3 Apr 2024 22:46:50 +0200 Subject: [PATCH 3/3] fix(client): fix some errors for downloading required files --- client/src/coreclr/CoreClr.cpp | 2 +- client/src/coreclr/CoreClrValidation.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/coreclr/CoreClr.cpp b/client/src/coreclr/CoreClr.cpp index 7566bd9..d244b15 100644 --- a/client/src/coreclr/CoreClr.cpp +++ b/client/src/coreclr/CoreClr.cpp @@ -195,7 +195,7 @@ uint8_t GetCachedAssembly(const char* name, int* bufferSize, void** buffer) { std::stringstream contentStream; auto fileName = std::string("lib/net8.0/") + name + ".dll"; if (!zip.has_file(fileName)) { - cs::Log::Warning << "Nupkg was found, but no dll was found in it" << cs::Log::Endl; + cs::Log::Warning << "Nupkg was found, but no dll was found in it " << fileName << cs::Log::Endl; zip.printdir(); return false; } diff --git a/client/src/coreclr/CoreClrValidation.cpp b/client/src/coreclr/CoreClrValidation.cpp index 23e4c8b..98e4887 100644 --- a/client/src/coreclr/CoreClrValidation.cpp +++ b/client/src/coreclr/CoreClrValidation.cpp @@ -13,6 +13,7 @@ namespace fs = std::filesystem; std::string CoreClr::GetBaseCdnUrl() const { static auto branch = _core->GetBranch(); + if (branch == "internal") branch = "dev"; return "https://cdn.alt-mp.com/coreclr-client-module/" + branch + "/x64_win32/"; }