Compare commits

...

7 Commits

Author SHA1 Message Date
Bugadinho
303d8e9512
Merge bfcd493a96 into 055695e014 2025-03-25 10:48:53 +01:00
bluepilledgreat
055695e014 update cancel button text in the simple template
Some checks failed
CI (Debug) / build (push) Has been cancelled
CI (Release) / build (push) Has been cancelled
CI (Release) / release (push) Has been cancelled
CI (Release) / release-test (push) Has been cancelled
2025-03-25 09:10:45 +00:00
bluepilledgreat
18ca67df27 update name (#4906) 2025-03-25 09:06:36 +00:00
bluepilledgreat
0f13750d7c make background updates opt-in 2025-03-25 09:05:17 +00:00
Matt
4dcb72b27f
Add help link to web environments (#4934) 2025-03-25 09:02:44 +00:00
Bugadinho
bfcd493a96
Adjust build paths to accomodate changed target framework 2025-01-06 21:40:08 -03:00
Bugadinho
7afffd8172
Use a WinRT compatible TargetFramework 2025-01-06 21:39:45 -03:00
7 changed files with 8 additions and 7 deletions

View File

@ -27,4 +27,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: Bloxstrap (Debug) (${{ github.sha }})
path: .\Bloxstrap\bin\Debug\net6.0-windows\win-x64\publish\*
path: .\Bloxstrap\bin\Debug\net6.0-windows10.0.17763.0\win-x64\publish\*

View File

@ -31,7 +31,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: Bloxstrap (Release) (${{ github.sha }})
path: .\Bloxstrap\bin\Release\net6.0-windows\win-x64\publish\*
path: .\Bloxstrap\bin\Release\net6.0-windows10.0.17763.0\win-x64\publish\*
release:
needs: build

View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<UseWindowsForms>True</UseWindowsForms>

View File

@ -20,7 +20,7 @@ namespace Bloxstrap.Models.Persistable
public bool UseFastFlagManager { get; set; } = true;
public bool WPFSoftwareRender { get; set; } = false;
public bool EnableAnalytics { get; set; } = true;
public bool BackgroundUpdatesEnabled { get; set; } = true;
public bool BackgroundUpdatesEnabled { get; set; } = false;
public bool DebugDisableVersionPackageCleanup { get; set; } = false;
public string? SelectedCustomTheme { get; set; } = null;
public WebEnvironment WebEnvironment { get; set; } = WebEnvironment.Production;

View File

@ -5,5 +5,5 @@
<Image Source="{Icon}" Height="100" Width="100" HorizontalAlignment="Center" Margin="0,15,0,0" />
<TextBlock HorizontalAlignment="Center" Name="StatusText" FontSize="20" Margin="0,170,0,0" />
<ProgressBar Width="450" Height="12" Name="PrimaryProgressBar" HorizontalAlignment="Center" Margin="0,200,0,0" />
<Button Content="Cancel" Name="CancelButton" HorizontalAlignment="Center" Margin="0,225,0,0" Height="30" Width="100" />
<Button Content="{Common.Cancel}" Name="CancelButton" HorizontalAlignment="Center" Margin="0,225,0,0" Height="30" Width="100" />
</BloxstrapCustomBootstrapper>

View File

@ -127,7 +127,7 @@
<controls:MarkdownTextBlock MarkdownText="[nakoyasha](https://github.com/nakoyasha)" />
<controls:MarkdownTextBlock MarkdownText="[exurd](https://github.com/exurd)" />
<controls:MarkdownTextBlock MarkdownText="[0xFE0F](https://github.com/0xFE0F)" />
<controls:MarkdownTextBlock MarkdownText="[Tezos](https://github.com/GoingCrazyDude)" />
<controls:MarkdownTextBlock MarkdownText="[Alexa](https://github.com/GoingCrazyDude)" />
<controls:MarkdownTextBlock MarkdownText="[CfwSky](https://www.roblox.com/users/129425241/profile)" />
<controls:MarkdownTextBlock MarkdownText="[ruubloo](https://www.roblox.com/users/158082266/profile)" />
<controls:MarkdownTextBlock MarkdownText="[toyoda165](https://www.roblox.com/users/923416649/profile)" />

View File

@ -33,7 +33,8 @@
<controls:OptionControl
Visibility="{Binding Path=WebEnvironmentVisibility, Mode=OneTime}"
Header="Web environment"
Description="Site to use for metrics">
Description="Site to use for metrics"
HelpLink="https://admin.bloxstraplabs.com/Wiki/Developers/Web-Environments">
<ComboBox Width="200" Padding="10,5,10,5" ItemsSource="{Binding WebEnvironments, Mode=OneWay}" SelectedValue="{Binding WebEnvironment, Mode=TwoWay}" />
</controls:OptionControl>