STUDIO_FEATURES

Bloxstrap/Bootstrapper.cs

@@ -531,14 +531,12 @@ public static void CheckInstall()
 
             ProtocolHandler.Register("roblox", "Roblox", Paths.Application);
             ProtocolHandler.Register("roblox-player", "Roblox", Paths.Application);
-#if STUDIO_FEATURES
             ProtocolHandler.Register("roblox-studio", "Roblox", Paths.Application);
             ProtocolHandler.Register("roblox-studio-auth", "Roblox", Paths.Application);
 
             ProtocolHandler.RegisterRobloxPlace(Paths.Application);
             ProtocolHandler.RegisterExtension(".rbxl");
             ProtocolHandler.RegisterExtension(".rbxlx");
-#endif
 
             if (Environment.ProcessPath is not null && Environment.ProcessPath != Paths.Application)
             {
@@ -572,9 +570,7 @@ public static void CheckInstall()
 
             Utility.Shortcut.Create(Paths.Application, "", Path.Combine(Paths.StartMenu, "Play Roblox.lnk"));
             Utility.Shortcut.Create(Paths.Application, "-menu", Path.Combine(Paths.StartMenu, $"{App.ProjectName} Menu.lnk"));
-#if STUDIO_FEATURES
             Utility.Shortcut.Create(Paths.Application, "-ide", Path.Combine(Paths.StartMenu, $"Roblox Studio ({App.ProjectName}).lnk"));
-#endif
 
             if (App.Settings.Prop.CreateDesktopIcon)
             {
@@ -704,13 +700,11 @@ private void Uninstall()
                         process.Close();
                     }
 
-#if STUDIO_FEATURES
                     foreach (Process process in Process.GetProcessesByName(App.RobloxStudioAppName))
                     {
                         process.Kill();
                         process.Close();
                     }
-#endif
                 }
                 catch (Exception ex)
                 {
@@ -745,7 +739,6 @@ private void Uninstall()
                 ProtocolHandler.Register("roblox-player", "Roblox", bootstrapperLocation);
             }
 
-#if STUDIO_FEATURES
             using RegistryKey? studioBootstrapperKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Uninstall\roblox-studio");
             if (studioBootstrapperKey is null)
             {
@@ -766,7 +759,6 @@ private void Uninstall()
 
                 ProtocolHandler.RegisterRobloxPlace(studioLocation);
             }
-#endif
 
             // if the folder we're installed to does not end with "Bloxstrap", we're installed to a user-selected folder
             // in which case, chances are they chose to install to somewhere they didn't really mean to (prior to the added warning in 2.4.0)
@@ -970,11 +962,7 @@ private async Task InstallLatestVersion()
             // delete any old version folders
             // we only do this if roblox isnt running just in case an update happened
             // while they were launching a second instance or something idk
-#if STUDIO_FEATURES
             if (!Process.GetProcessesByName(App.RobloxPlayerAppName).Any() && !Process.GetProcessesByName(App.RobloxStudioAppName).Any())
-#else
-            if (!Process.GetProcessesByName(App.RobloxPlayerAppName).Any())
-#endif
             {
                 foreach (DirectoryInfo dir in new DirectoryInfo(Paths.Versions).GetDirectories())
                 {

Bloxstrap/RobloxDeployment.cs

@@ -111,8 +111,9 @@ public static string GetLocation(string resource, string? channel = null)
             return location;
         }
 
-        public static async Task<ClientVersion> GetInfo(string channel, bool extraInformation = false, string binaryType = "WindowsPlayer")
+        public static async Task<ClientVersion> GetInfo(string notusedchannel, bool extraInformation = false, string binaryType = "WindowsPlayer")
         {
+            string channel = DefaultChannel
             const string LOG_IDENT = "RobloxDeployment::GetInfo";
 
             App.Logger.WriteLine(LOG_IDENT, $"Getting deploy info for channel {channel} (extraInformation={extraInformation})");