Merge branch 'wip' of https://github.com/bdidk235/bloxstrap-fork

Author: bdidk235

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -45,6 +45,16 @@ body:
       description: Provide a comprehensive description of the problem you're facing. Don't forget to attach any additional resources you may have, such as log files and screenshots.
     validations:
       required: true
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: How do you reproduce the problem?
+      description: Include the steps to reproduce the problem from start to finish. Include details such as FastFlags you added and settings you changed.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
   - type: textarea
     id: log
     attributes:

Bloxstrap/App.xaml

@@ -11,6 +11,8 @@
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemesDictionary Theme="Dark" />
                 <ui:ControlsDictionary />
+                <ResourceDictionary x:Name="CustomTheme" Source="UI/Style/Dark.xaml" /> <!-- NOTE: WpfUiWindow::ApplyTheme relies on this order. If you plan to change the order, please update the index in the function. -->
+                <ResourceDictionary x:Name="Default" Source="UI/Style/Default.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <FontFamily x:Key="Rubik">pack://application:,,,/Resources/Fonts/#Rubik Light</FontFamily>

Bloxstrap/App.xaml.cs

@@ -42,7 +42,7 @@ public partial class App : Application
 
         public static bool IsProductionBuild => IsActionBuild && BuildMetadata.CommitRef.StartsWith("tag", StringComparison.Ordinal);
 
-        public static bool IsStudioVisible => !String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid);
+        public static bool IsStudioVisible => !String.IsNullOrEmpty(App.RobloxState.Prop.Studio.VersionGuid);
 
         public static readonly MD5 MD5Provider = MD5.Create();
 
@@ -54,6 +54,8 @@ public partial class App : Application
 
         public static readonly JsonManager<State> State = new();
 
+        public static readonly JsonManager<RobloxState> RobloxState = new();
+
         public static readonly FastFlagManager FastFlags = new();
 
         public static readonly HttpClient HttpClient = new(
@@ -63,6 +65,20 @@ public partial class App : Application
         );
 
         private static bool _showingExceptionDialog = false;
+
+        private static string? _webUrl = null;
+        public static string WebUrl
+        {
+            get {
+                if (_webUrl != null)
+                    return _webUrl;
+
+                string url = ConstructBloxstrapWebUrl();
+                if (Settings.Loaded) // only cache if settings are done loading
+                    _webUrl = url;
+                return url;
+            }
+        }
 
         public static void Terminate(ErrorCode exitCode = ErrorCode.ERROR_SUCCESS)
         {
@@ -124,6 +140,25 @@ public static void FinalizeExceptionHandling(Exception ex, bool log = true)
             Terminate(ErrorCode.ERROR_INSTALL_FAILURE);
         }
 
+        public static string ConstructBloxstrapWebUrl()
+        {
+            // dont let user switch web environment if debug mode is not on
+            if (Settings.Prop.WebEnvironment == WebEnvironment.Production || !Settings.Prop.DeveloperMode)
+                return "bloxstraplabs.com";
+
+            string? sub = Settings.Prop.WebEnvironment.GetDescription();
+            return $"web-{sub}.bloxstraplabs.com";
+        }
+
+        public static bool CanSendLogs()
+        {
+            // non developer mode always uses production
+            if (!Settings.Prop.DeveloperMode || Settings.Prop.WebEnvironment == WebEnvironment.Production)
+                return IsProductionBuild;
+
+            return true;
+        }
+
         public static async Task<GithubRelease?> GetLatestRelease()
         {
             const string LOG_IDENT = "App::GetLatestRelease";
@@ -155,7 +190,7 @@ public static async void SendStat(string key, string value)
 
             try
             {
-                await HttpClient.GetAsync($"https://bloxstraplabs.com/metrics/post?key={key}&value={value}");
+                await HttpClient.GetAsync($"https://{WebUrl}/metrics/post?key={key}&value={value}");
             }
             catch (Exception ex)
             {
@@ -165,13 +200,13 @@ public static async void SendStat(string key, string value)
 
         public static async void SendLog()
         {
-            if (!Settings.Prop.EnableAnalytics || !IsProductionBuild)
+            if (!Settings.Prop.EnableAnalytics || !CanSendLogs())
                 return;
 
             try
             {
                 await HttpClient.PostAsync(
-                    $"https://bloxstraplabs.com/metrics/post-exception", 
+                    $"https://{WebUrl}/metrics/post-exception", 
                     new StringContent(Logger.AsDocument)
                 );
             }
@@ -181,6 +216,22 @@ await HttpClient.PostAsync(
             }
         }
 
+        public static void AssertWindowsOSVersion()
+        {
+            const string LOG_IDENT = "App::AssertWindowsOSVersion";
+
+            int major = Environment.OSVersion.Version.Major;
+            if (major < 10) // Windows 10 and newer only
+            {
+                Logger.WriteLine(LOG_IDENT, $"Detected unsupported Windows version ({Environment.OSVersion.Version}).");
+
+                if (!LaunchSettings.QuietFlag.Active)
+                    Frontend.ShowMessageBox(Strings.App_OSDeprecation_Win7_81, MessageBoxImage.Error);
+
+                Terminate(ErrorCode.ERROR_INVALID_FUNCTION);
+            }
+        }
+
         protected override void OnStartup(StartupEventArgs e)
         {
             const string LOG_IDENT = "App::OnStartup";
@@ -213,6 +264,8 @@ protected override void OnStartup(StartupEventArgs e)
 #endif
             }
 
+            Logger.WriteLine(LOG_IDENT, $"OSVersion: {Environment.OSVersion}");
+
             Logger.WriteLine(LOG_IDENT, $"Loaded from {Paths.Process}");
             Logger.WriteLine(LOG_IDENT, $"Temp path is {Paths.Temp}");
             Logger.WriteLine(LOG_IDENT, $"WindowsStartMenu path is {Paths.WindowsStartMenu}");
@@ -292,6 +345,7 @@ protected override void OnStartup(StartupEventArgs e)
             {
                 Logger.Initialize(true);
                 Logger.WriteLine(LOG_IDENT, "Not installed, launching the installer");
+                AssertWindowsOSVersion(); // prevent new installs from unsupported operating systems
                 LaunchHandler.LaunchInstaller();
             }
             else
@@ -317,6 +371,7 @@ protected override void OnStartup(StartupEventArgs e)
 
                 Settings.Load();
                 State.Load();
+                RobloxState.Load();
                 FastFlags.Load();
 
                 if (!Locale.SupportedLocales.ContainsKey(Settings.Prop.Locale))
@@ -325,6 +380,9 @@ protected override void OnStartup(StartupEventArgs e)
                     Settings.Save();
                 }
 
+                Logger.WriteLine(LOG_IDENT, $"Developer mode: {Settings.Prop.DeveloperMode}");
+                Logger.WriteLine(LOG_IDENT, $"Web environment: {Settings.Prop.WebEnvironment}");
+
                 Locale.Set(Settings.Prop.Locale);
 
                 if (!LaunchSettings.BypassUpdateCheck)

Bloxstrap/AppData/RobloxPlayerData.cs

@@ -16,7 +16,7 @@ public class RobloxPlayerData : CommonAppData, IAppData
 
         public override string ExecutableName => "RobloxPlayerBeta.exe";
 
-        public override AppState State => App.State.Prop.Player;
+        public override AppState State => App.RobloxState.Prop.Player;
 
         public override IReadOnlyDictionary<string, string> PackageDirectoryMap { get; set; } = new Dictionary<string, string>()
         {

Bloxstrap/AppData/RobloxStudioData.cs

@@ -10,7 +10,7 @@ public class RobloxStudioData : CommonAppData, IAppData
 
         public override string ExecutableName => "RobloxStudioBeta.exe";
 
-        public override AppState State => App.State.Prop.Studio;
+        public override AppState State => App.RobloxState.Prop.Studio;
 
         public override IReadOnlyDictionary<string, string> PackageDirectoryMap { get; set; } = new Dictionary<string, string>()
         {

Bloxstrap/Bloxstrap.csproj

@@ -7,8 +7,8 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
-    <Version>2.8.6</Version>
-    <FileVersion>2.8.6</FileVersion>
+    <Version>2.9.0</Version>
+    <FileVersion>2.9.0</FileVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
@@ -25,9 +25,14 @@
     <Resource Include="Resources\MessageBox\Information.png" />
     <Resource Include="Resources\MessageBox\Question.png" />
     <Resource Include="Resources\MessageBox\Warning.png" />
+    <EmbeddedResource Include="UI\Style\Editor-Theme-Dark.xshd" />
+    <EmbeddedResource Include="UI\Style\Editor-Theme-Light.xshd" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Resources\CustomBootstrapperSchema.json" />
+    <EmbeddedResource Include="Resources\CustomBootstrapperTemplate_Blank.xml" />
+    <EmbeddedResource Include="Resources\CustomBootstrapperTemplate_Simple.xml" />
     <EmbeddedResource Include="Resources\Icon2008.ico" />
     <EmbeddedResource Include="Resources\Icon2011.ico" />
     <EmbeddedResource Include="Resources\Icon2017.ico" />
@@ -49,16 +54,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageReference Include="Markdig" Version="0.37.0" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
+    <PackageReference Include="Markdig" Version="0.40.0" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
       <!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
     <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
+    <PackageReference Include="XamlAnimatedGif" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>