mirror of
https://github.com/bloxstraplabs/bloxstrap.git
synced 2025-04-21 10:01:27 -07:00
Remove 32-bit support
💀💀💀 32 bit is GONE 💀💀💀
This commit is contained in:
parent
7d672d6a0f
commit
85ecef310a
9
.github/workflows/ci.yml
vendored
9
.github/workflows/ci.yml
vendored
@ -13,7 +13,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
configuration: [Debug, Release]
|
configuration: [Debug, Release]
|
||||||
platform: [x64, x86]
|
platform: [x64]
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -47,20 +47,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: Bloxstrap (Release, x64)
|
name: Bloxstrap (Release, x64)
|
||||||
path: x64
|
path: x64
|
||||||
- name: Download x86 release artifact
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: Bloxstrap (Release, x86)
|
|
||||||
path: x86
|
|
||||||
- name: Rename binaries
|
- name: Rename binaries
|
||||||
run: |
|
run: |
|
||||||
mv x64/Bloxstrap.exe Bloxstrap-${{ github.ref_name }}-x64.exe
|
mv x64/Bloxstrap.exe Bloxstrap-${{ github.ref_name }}-x64.exe
|
||||||
mv x86/Bloxstrap.exe Bloxstrap-${{ github.ref_name }}-x86.exe
|
|
||||||
- name: Release
|
- name: Release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
draft: true
|
draft: true
|
||||||
files: |
|
files: |
|
||||||
Bloxstrap-${{ github.ref_name }}-x64.exe
|
Bloxstrap-${{ github.ref_name }}-x64.exe
|
||||||
Bloxstrap-${{ github.ref_name }}-x86.exe
|
|
||||||
name: Bloxstrap ${{ github.ref_name }}
|
name: Bloxstrap ${{ github.ref_name }}
|
||||||
|
@ -169,29 +169,6 @@ namespace Bloxstrap
|
|||||||
Visible = !IsMenuLaunch
|
Visible = !IsMenuLaunch
|
||||||
};
|
};
|
||||||
|
|
||||||
// todo: remove this once 32-bit support is fully gone
|
|
||||||
if (!App.IsQuiet && !Environment.Is64BitOperatingSystem)
|
|
||||||
{
|
|
||||||
string message = "In the near future, Roblox will no longer support 32-bit Windows devices. To keep playing Roblox, please use a device that is 64-bit compatible.";
|
|
||||||
|
|
||||||
// check if the processor actually supports 64-bit with wmic
|
|
||||||
// chances are the user just has a 32-bit version of windows installed on 64-bit hardware
|
|
||||||
Process p = new();
|
|
||||||
p.StartInfo.CreateNoWindow = true;
|
|
||||||
p.StartInfo.UseShellExecute = false;
|
|
||||||
p.StartInfo.RedirectStandardOutput = true;
|
|
||||||
p.StartInfo.FileName = "wmic.exe";
|
|
||||||
p.StartInfo.Arguments = "cpu get Architecture";
|
|
||||||
p.Start();
|
|
||||||
|
|
||||||
// https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-processor
|
|
||||||
// architecture type 9 is x64
|
|
||||||
if (p.StandardOutput.ReadToEnd().Contains('9'))
|
|
||||||
message += "\n\nYour computer is running a 32-bit version of Windows but is actually 64-bit compatible. Search online for how to upgrade to a 64-bit version of Windows.";
|
|
||||||
|
|
||||||
ShowMessageBox(message, MessageBoxImage.Warning);
|
|
||||||
}
|
|
||||||
|
|
||||||
// check if installed
|
// check if installed
|
||||||
using (RegistryKey? registryKey = Registry.CurrentUser.OpenSubKey($@"Software\{ProjectName}"))
|
using (RegistryKey? registryKey = Registry.CurrentUser.OpenSubKey($@"Software\{ProjectName}"))
|
||||||
{
|
{
|
||||||
|
@ -99,15 +99,10 @@ namespace Bloxstrap
|
|||||||
|
|
||||||
// check if the webview2 runtime needs to be installed
|
// check if the webview2 runtime needs to be installed
|
||||||
// webview2 can either be installed be per-user or globally, so we need to check in both hklm and hkcu
|
// webview2 can either be installed be per-user or globally, so we need to check in both hklm and hkcu
|
||||||
// https://learn.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#online-only-deployment
|
// https://learn.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#detect-if-a-suitable-webview2-runtime-is-already-installed
|
||||||
|
|
||||||
string hklmLocation = "SOFTWARE\\WOW6432Node\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
|
string registryLocation = "SOFTWARE\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
|
||||||
string hkcuLocation = "Software\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
|
ShouldInstallWebView2 = Registry.LocalMachine.OpenSubKey(registryLocation) is null && Registry.CurrentUser.OpenSubKey(registryLocation) is null;
|
||||||
|
|
||||||
if (!Environment.Is64BitOperatingSystem)
|
|
||||||
hklmLocation = "SOFTWARE\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
|
|
||||||
|
|
||||||
ShouldInstallWebView2 = Registry.LocalMachine.OpenSubKey(hklmLocation) is null && Registry.CurrentUser.OpenSubKey(hkcuLocation) is null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetStatus(string message)
|
private void SetStatus(string message)
|
||||||
@ -581,7 +576,7 @@ namespace Bloxstrap
|
|||||||
SetStatus($"Getting the latest {App.ProjectName}...");
|
SetStatus($"Getting the latest {App.ProjectName}...");
|
||||||
|
|
||||||
// 64-bit is always the first option
|
// 64-bit is always the first option
|
||||||
GithubReleaseAsset asset = releaseInfo.Assets[Environment.Is64BitOperatingSystem ? 0 : 1];
|
GithubReleaseAsset asset = releaseInfo.Assets[0];
|
||||||
string downloadLocation = Path.Combine(Directories.LocalAppData, "Temp", asset.Name);
|
string downloadLocation = Path.Combine(Directories.LocalAppData, "Temp", asset.Name);
|
||||||
|
|
||||||
App.Logger.WriteLine($"[Bootstrapper::CheckForUpdates] Downloading {releaseInfo.Name}...");
|
App.Logger.WriteLine($"[Bootstrapper::CheckForUpdates] Downloading {releaseInfo.Name}...");
|
||||||
|
Loading…
Reference in New Issue
Block a user