Skip to content

chore: Improve launcher framework combobox (#2895) #2899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AIFSKATE wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: Improve launcher framework combobox (#2895) #2899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions sources/launcher/Stride.Launcher/ViewModels/FrameworkConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ public override object Convert(object value, [NotNull] Type targetType, object p
var frameworkFolder = (string)value;

var framework = NuGetFramework.ParseFolder(frameworkFolder);
if (framework.Framework == ".NETFramework")
return $".NET {framework.Version.ToString(3)}";
else if (framework.Framework == ".NETCoreApp")
return $".NET Core {framework.Version.ToString(2)}";
if (framework.Framework == ".NETCoreApp")
return $".NET {framework.Version.ToString(2)}";

// fallback
return $"{framework.Framework} {framework.Version.ToString(3)}";
Expand Down
2 changes: 1 addition & 1 deletion sources/launcher/Stride.Launcher/Views/LauncherWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
</i:Interaction.Behaviors>
</Button>
</Grid>
<ComboBox Margin="0,4" Name="FrameworkSelector" IsEnabled="{Binding ActiveVersion.Frameworks.Count, Converter={sskk:Chained {sskk:IsGreater}, Parameter1={sskk:Double 1}}}" ItemsSource="{Binding ActiveVersion.Frameworks}" SelectedItem="{Binding ActiveVersion.SelectedFramework}" SelectionChanged="FrameworkChanged">
<ComboBox Margin="0,4" Name="FrameworkSelector" IsEnabled="{Binding ActiveVersion.Frameworks.Count, Converter={sskk:Chained {sskk:IsGreater}, Parameter1={sskk:Double 0}}}" ItemsSource="{Binding ActiveVersion.Frameworks}" SelectedItem="{Binding ActiveVersion.SelectedFramework}" SelectionChanged="FrameworkChanged">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={vm:FrameworkConverter}}" />
Expand Down