Make UpgradeHelper compliant with .NET RID catalog

Fetching updates return an error because the UpgradeHelper returns an invalid RID, and we use the RID to create automated builds. This updates the UpgradeHelper to be compliant with the catalog.
This commit is contained in:
breadbyte 2023-03-29 20:15:22 +08:00 committed by GitHub
parent 74d29321b4
commit cd39c1ec12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -241,27 +241,27 @@ namespace MinecraftClient
{ {
string OSPlatformName; string OSPlatformName;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
OSPlatformName = "Windows"; OSPlatformName = "win";
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
OSPlatformName = "Linux"; OSPlatformName = "linux";
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
OSPlatformName = "OSX"; OSPlatformName = "osx";
else if (RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD))
OSPlatformName = "FreeBSD"; OSPlatformName = "freebsd";
else else
return string.Empty; return string.Empty;
string architecture = RuntimeInformation.ProcessArchitecture switch string architecture = RuntimeInformation.ProcessArchitecture switch
{ {
Architecture.X86 => "X86", Architecture.X86 => "x86",
Architecture.X64 => "X64", Architecture.X64 => "x64",
Architecture.Arm => "Arm32", Architecture.Arm => "arm32",
Architecture.Arm64 => "Arm64", Architecture.Arm64 => "arm64",
Architecture.Wasm => "Wasm", Architecture.Wasm => "wasm",
Architecture.S390x => "S390x", Architecture.S390x => "s390x",
Architecture.LoongArch64 => "LoongArch64", Architecture.LoongArch64 => "loongarch64",
Architecture.Armv6 => "Armv6", Architecture.Armv6 => "armv6",
Architecture.Ppc64le => "Ppc64le", Architecture.Ppc64le => "ppc64le",
_ => RuntimeInformation.ProcessArchitecture.ToString(), _ => RuntimeInformation.ProcessArchitecture.ToString(),
}; };