Explorar o código

almost compiling

Krzysztof Krysiński %!s(int64=2) %!d(string=hai) anos
pai
achega
1dacb772df
Modificáronse 19 ficheiros con 307 adicións e 240 borrados
  1. 2 0
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/WidthToBitmapScalingModeConverter.cs
  2. 15 7
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/ServiceCollectionHelpers.cs
  3. 4 2
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Dialogs/OptionsDialog.cs
  4. 8 4
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Dialogs/ResizeDocumentDialog.cs
  5. 1 1
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/PixiEditor.Avalonia.csproj
  6. 2 1
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Styles/PixiEditor.Controls.axaml
  7. 2 2
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Styles/PortingWipStyles.axaml
  8. 3 2
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/Document/DocumentManagerViewModel.cs
  9. 5 4
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/SubViewModels/DebugViewModel.cs
  10. 6 4
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/SubViewModels/FileViewModel.cs
  11. 13 9
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/SubViewModels/WindowViewModel.cs
  12. 5 3
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/Tools/ToolSettings/Settings/ColorSetting.cs
  13. 4 2
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/Tools/ToolSettings/Settings/SizeSetting.cs
  14. 0 1
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/ViewModelMain.cs
  15. 21 14
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/Input/SizeInput.axaml.cs
  16. 3 0
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/MainWindow.axaml.cs
  17. 11 12
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/Windows/HelloTherePopup.axaml
  18. 4 4
      src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/Windows/HelloTherePopup.axaml.cs
  19. 198 168
      src/PixiEditor.sln

+ 2 - 0
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/WidthToBitmapScalingModeConverter.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 using Avalonia;
+using Avalonia.Data.Converters;
 using Avalonia.Media.Imaging;
 
 namespace PixiEditor.Helpers.Converters;

+ 15 - 7
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/ServiceCollectionHelpers.cs

@@ -3,16 +3,24 @@ using PixiEditor.Avalonia.ViewModels;
 using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Common.UserPreferences;
 using PixiEditor.Extensions.Palettes;
+using PixiEditor.Extensions.Palettes.Parsers;
 using PixiEditor.Extensions.Windowing;
 using PixiEditor.Models.AppExtensions;
 using PixiEditor.Models.AppExtensions.Services;
 using PixiEditor.Models.Commands;
 using PixiEditor.Models.Containers;
+using PixiEditor.Models.Controllers;
+using PixiEditor.Models.DataProviders;
+using PixiEditor.Models.IO.PaletteParsers;
+using PixiEditor.Models.IO.PaletteParsers.JascPalFile;
 using PixiEditor.Models.Localization;
 using PixiEditor.Models.Preferences;
 using PixiEditor.ViewModels.SubViewModels;
 using PixiEditor.ViewModels.SubViewModels.AdditionalContent;
+using PixiEditor.ViewModels.SubViewModels.Document;
 using PixiEditor.ViewModels.SubViewModels.Main;
+using PixiEditor.ViewModels.SubViewModels.Tools;
+using PixiEditor.ViewModels.SubViewModels.Tools.Tools;
 
 namespace PixiEditor.Helpers.Extensions;
 
@@ -30,7 +38,7 @@ internal static class ServiceCollectionHelpers
         // View Models
         .AddSingleton<ToolsViewModel>()
         .AddSingleton<IToolsHandler, ToolsViewModel>()
-        /*.AddSingleton<StylusViewModel>()
+        .AddSingleton<StylusViewModel>()
         .AddSingleton<WindowViewModel>()
         .AddSingleton<FileViewModel>()
         .AddSingleton<UpdateViewModel>()
@@ -44,13 +52,13 @@ internal static class ServiceCollectionHelpers
         .AddSingleton<RegistryViewModel>()
         .AddSingleton(static x => new DiscordViewModel(x.GetService<ViewModelMain>(), "764168193685979138"))
         .AddSingleton<DebugViewModel>()
-        .AddSingleton<SearchViewModel>()*/
+        .AddSingleton<SearchViewModel>()
         .AddSingleton<AdditionalContentViewModel>()
-        //.AddSingleton(x => new ExtensionsViewModel(x.GetService<ViewModelMain>(), extensionLoader))
+        .AddSingleton(x => new ExtensionsViewModel(x.GetService<ViewModelMain>(), extensionLoader))
         // Controllers
-        //.AddSingleton<ShortcutController>()
-        .AddSingleton<CommandController>();
-        /*.AddSingleton<DocumentManagerViewModel>()
+        .AddSingleton<ShortcutController>()
+        .AddSingleton<CommandController>()
+        .AddSingleton<DocumentManagerViewModel>()
         // Tools
         .AddSingleton<ToolViewModel, MoveViewportToolViewModel>()
         .AddSingleton<ToolViewModel, RotateViewportToolViewModel>()
@@ -76,7 +84,7 @@ internal static class ServiceCollectionHelpers
         .AddSingleton<PaletteFileParser, GimpGplParser>()
         .AddSingleton<PaletteFileParser, PixiPaletteParser>()
         // Palette data sources
-        .AddSingleton<PaletteListDataSource, LocalPalettesFetcher>();*/
+        .AddSingleton<PaletteListDataSource, LocalPalettesFetcher>();
 
     public static IServiceCollection AddExtensionServices(this IServiceCollection collection) =>
         collection.AddSingleton<IWindowProvider, WindowProvider>()

+ 4 - 2
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Dialogs/OptionsDialog.cs

@@ -56,7 +56,8 @@ internal class OptionsDialog<T> : CustomDialog, IEnumerable<T>
 
     public override async Task<bool> ShowDialog()
     {
-        var popup = new OptionPopup(Title, Content, new(_results.Keys.Select(x => (object)x)));
+        //TODO: Implement
+        /*var popup = new OptionPopup(Title, Content, new(_results.Keys.Select(x => (object)x)));
         var popupResult = popup.ShowDialog();
 
         Result = (T)popup.Result;
@@ -65,7 +66,8 @@ internal class OptionsDialog<T> : CustomDialog, IEnumerable<T>
             _results[Result]?.Invoke(Result);
         }
 
-        return popupResult.GetValueOrDefault(false);
+        return popupResult.GetValueOrDefault(false);*/
+        return false;
     }
 
     public void Add(T name) => _results.Add(name, null);

+ 8 - 4
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Dialogs/ResizeDocumentDialog.cs

@@ -72,10 +72,10 @@ internal class ResizeDocumentDialog : CustomDialog
             {
                 Width = popup.NewAbsoluteWidth;
                 Height = popup.NewAbsoluteHeight;
-                if (popup is ResizeCanvasPopup resizeCanvas)
+                /*if (popup is ResizeCanvasPopup resizeCanvas) TODO: Implement
                 {
                     ResizeAnchor = resizeCanvas.SelectedAnchorPoint;
-                }
+                }*/
             }
         });
 
@@ -84,11 +84,15 @@ internal class ResizeDocumentDialog : CustomDialog
 
     private async Task<bool> ShowResizeDocumentCanvas()
     {
-        return await ShowDialog<ResizeDocumentPopup>();
+        //TODO: Implement
+        //return await ShowDialog<ResizeDocumentPopup>();
+        return false;
     }
 
     private async Task<bool> ShowResizeCanvasDialog()
     {
-        return await ShowDialog<ResizeCanvasPopup>();
+        //TODO: Implement
+        //return await ShowDialog<ResizeCanvasPopup>();
+        return false;
     }
 }

+ 1 - 1
src/PixiEditor.Avalonia/PixiEditor.Avalonia/PixiEditor.Avalonia.csproj

@@ -45,7 +45,7 @@
       <ProjectReference Include="..\..\PixiEditor.Platform\PixiEditor.Platform.csproj" />
       <ProjectReference Include="..\..\PixiEditor.UI.Common\PixiEditor.UI.Common.csproj" />
       <ProjectReference Include="..\..\PixiEditor.UpdateModule\PixiEditor.UpdateModule.csproj" />
-      <ProjectReference Include="..\..\PixiEditorGen\PixiEditorGen.csproj" />
+      <ProjectReference Include="..\..\PixiEditorGen\PixiEditorGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
   
     <ItemGroup>

+ 2 - 1
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Styles/PixiEditor.Controls.axaml

@@ -5,8 +5,9 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <MergeResourceInclude Source="avares://PixiEditor.Avalonia/Styles/CommandsMenu.axaml"/>
-                <MergeResourceInclude Source="avares://PixiEditor.Avalonia/Styles/PortingWipStyles.axaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
+
+    <StyleInclude Source="avares://PixiEditor.Avalonia/Styles/PortingWipStyles.axaml"/>
 </Styles>

+ 2 - 2
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Styles/PortingWipStyles.axaml

@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
         <Border Padding="20">
@@ -9,4 +9,4 @@
     <Style Selector="Button.SocialMediaButton">
 
     </Style>
-</ResourceDictionary>
+</Styles>

+ 3 - 2
src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/Document/DocumentManagerViewModel.cs

@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Input;
 using ChunkyImageLib.Operations;
@@ -148,7 +149,7 @@ internal class DocumentManagerViewModel : SubViewModel<ViewModelMain>, IDocument
 
     [Command.Basic("PixiEditor.Document.ResizeDocument", false, "RESIZE_DOCUMENT", "RESIZE_DOCUMENT", CanExecute = "PixiEditor.HasDocument", Key = Key.I, Modifiers = KeyModifiers.Control | KeyModifiers.Shift)]
     [Command.Basic("PixiEditor.Document.ResizeCanvas", true, "RESIZE_CANVAS", "RESIZE_CANVAS", CanExecute = "PixiEditor.HasDocument", Key = Key.C, Modifiers = KeyModifiers.Control | KeyModifiers.Shift)]
-    public void OpenResizePopup(bool canvas)
+    public async Task OpenResizePopup(bool canvas)
     {
         DocumentViewModel? doc = Owner.DocumentManagerSubViewModel.ActiveDocument;
         if (doc is null)
@@ -158,7 +159,7 @@ internal class DocumentManagerViewModel : SubViewModel<ViewModelMain>, IDocument
             doc.Width,
             doc.Height,
             canvas);
-        if (dialog.ShowDialog())
+        if (await dialog.ShowDialog())
         {
             if (canvas)
             {

+ 5 - 4
src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/SubViewModels/DebugViewModel.cs

@@ -216,9 +216,9 @@ internal class DebugViewModel : SubViewModel<ViewModelMain>
     [Command.Debug("PixiEditor.Debug.OpenCommandDebugWindow", "OPEN_CMD_DEBUG_WINDOW", "OPEN_CMD_DEBUG_WINDOW")]
     public void OpenCommandDebugWindow()
     {
-        //TODO: Fix this
+        //TODO: Fix this and implement CommandDebugPopup
         //Mouse.OverrideCursor = Cursors.Wait;
-        new CommandDebugPopup().Show();
+        //new CommandDebugPopup().Show();
         //Mouse.OverrideCursor = null;
     }
 
@@ -227,9 +227,10 @@ internal class DebugViewModel : SubViewModel<ViewModelMain>
     {
         if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            var window = desktop.Windows.OfType<LocalizationDebugWindow>().FirstOrDefault(new LocalizationDebugWindow());
+            //TODO: Implement LocalizationDebugWindow
+            /*var window = desktop.Windows.OfType<LocalizationDebugWindow>().FirstOrDefault(new LocalizationDebugWindow());
             window.Show();
-            window.Activate();
+            window.Activate();*/
         }
 
     }

+ 6 - 4
src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/SubViewModels/FileViewModel.cs

@@ -271,7 +271,8 @@ internal class FileViewModel : SubViewModel<ViewModelMain>
     [Command.Basic("PixiEditor.File.New", "NEW_IMAGE", "CREATE_NEW_IMAGE", Key = Key.N, Modifiers = KeyModifiers.Control)]
     public async Task CreateFromNewFileDialog()
     {
-        NewFileDialog newFile = new NewFileDialog();
+        //TODO: Implement NewFileDialog
+        /*NewFileDialog newFile = new NewFileDialog();
         if (newFile.ShowDialog())
         {
             NewDocument(b => b
@@ -279,7 +280,7 @@ internal class FileViewModel : SubViewModel<ViewModelMain>
                 .WithLayer(l => l
                     .WithName(new LocalizedString("BASE_LAYER_NAME"))
                     .WithSurface(new Surface(new VecI(newFile.Width, newFile.Height)))));
-        }
+        }*/
     }
 
     private DocumentViewModel NewDocument(Action<DocumentViewModelBuilder> builder)
@@ -350,7 +351,8 @@ internal class FileViewModel : SubViewModel<ViewModelMain>
         if (doc is null)
             return;
 
-        ExportFileDialog info = new ExportFileDialog(doc.SizeBindable);
+        //TODO: Implement ExportFileDialog
+        /*ExportFileDialog info = new ExportFileDialog(doc.SizeBindable);
         if (info.ShowDialog())
         {
             SaveResult result = Exporter.TrySaveUsingDataFromDialog(doc, info.FilePath, info.ChosenFormat, out string finalPath, new(info.FileWidth, info.FileHeight));
@@ -358,7 +360,7 @@ internal class FileViewModel : SubViewModel<ViewModelMain>
                 ProcessHelper.OpenInExplorer(finalPath);
             else
                 ShowSaveError((DialogSaveResult)result);
-        }
+        }*/
     }
 
     private void ShowSaveError(DialogSaveResult result)

+ 13 - 9
src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/SubViewModels/WindowViewModel.cs

@@ -16,8 +16,8 @@ namespace PixiEditor.ViewModels.SubViewModels.Main;
 internal class WindowViewModel : SubViewModel<ViewModelMain>
 {
     private CommandController commandController;
-    private ShortcutPopup? shortcutPopup;
-    private ShortcutPopup ShortcutPopup => shortcutPopup ??= new(commandController);
+    /*private ShortcutPopup? shortcutPopup; TODO: Add shortcut popup
+    private ShortcutPopup ShortcutPopup => shortcutPopup ??= new(commandController);*/
     public RelayCommand<string> ShowAvalonDockWindowCommand { get; set; }
     public ObservableCollection<ViewportWindowViewModel> Viewports { get; } = new();
     public event EventHandler<ViewportWindowViewModel>? ActiveViewportChanged;
@@ -140,8 +140,9 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
             page = 0;
         }
 
-        var settings = new SettingsWindow(page);
-        settings.Show();
+        //TODO: Add settings window
+        /*var settings = new SettingsWindow(page);
+        settings.Show();*/
     }
 
     [Command.Basic("PixiEditor.Window.OpenStartupWindow", "OPEN_STARTUP_WINDOW", "OPEN_STARTUP_WINDOW")]
@@ -153,8 +154,9 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
     [Command.Basic("PixiEditor.Window.OpenShortcutWindow", "OPEN_SHORTCUT_WINDOW", "OPEN_SHORTCUT_WINDOW", Key = Key.F1)]
     public void ShowShortcutWindow()
     {
-        ShortcutPopup.Show();
-        ShortcutPopup.Activate();
+        //TODO: Add shortcut window
+        /*ShortcutPopup.Show();
+        ShortcutPopup.Activate();*/
     }
 
     [Command.Basic("PixiEditor.Window.OpenPalettesBrowserWindow", "OPEN_PALETTE_BROWSER", "OPEN_PALETTE_BROWSER",
@@ -168,13 +170,15 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
     [Command.Basic("PixiEditor.Window.OpenAboutWindow", "OPEN_ABOUT_WINDOW", "OPEN_ABOUT_WINDOW")]
     public void OpenAboutWindow()
     {
-        new AboutPopup().Show();
+        //TODO: Add about window
+        //new AboutPopup().Show();
     }
 
     [Command.Basic("PixiEditor.Window.OpenNavigationWindow", "navigation", "OPEN_NAVIGATION_WINDOW", "OPEN_NAVIGATION_WINDOW")]
     public static void ShowAvalonDockWindow(string id)
     {
-        if (MainWindow.Current?.LayoutRoot?.Manager?.Layout == null) return;
+        //TODO: Implement this
+        /*if (MainWindow.Current?.LayoutRoot?.Manager?.Layout == null) return;
         var anchorables = new List<LayoutAnchorable>(MainWindow.Current.LayoutRoot.Manager.Layout
             .Descendents()
             .OfType<LayoutAnchorable>());
@@ -186,6 +190,6 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
                 la.Show();
                 la.IsActive = true;
             }
-        }
+        }*/
     }
 }

+ 5 - 3
src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/Tools/ToolSettings/Settings/ColorSetting.cs

@@ -19,7 +19,8 @@ internal sealed class ColorSetting : Setting<Color>
         Value = defaultValue;
     }
 
-    private ToolSettingColorPicker GenerateColorPicker()
+    //TODO: Implement
+    /*private ToolSettingColorPicker GenerateColorPicker()
     {
         var resourceDictionary = new ResourceDictionary();
         resourceDictionary.Source = new Uri(
@@ -39,10 +40,11 @@ internal sealed class ColorSetting : Setting<Color>
         Interaction.GetBehaviors(picker).Add(behavior);
         picker.SetBinding(ToolSettingColorPicker.SelectedColorProperty, selectedColorBinding);
         return picker;
-    }
+    }*/
 
     public override Control GenerateControl()
     {
-        return GenerateColorPicker();
+        return new Border();
+        //return GenerateColorPicker();
     }
 }

+ 4 - 2
src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/Tools/ToolSettings/Settings/SizeSetting.cs

@@ -1,6 +1,8 @@
-using Avalonia.Controls;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Layout;
+using PixiEditor.Views.UserControls;
 
 namespace PixiEditor.ViewModels.SubViewModels.Tools.ToolSettings.Settings;
 
@@ -27,7 +29,7 @@ internal sealed class SizeSetting : Setting<int>
         {
             Mode = BindingMode.TwoWay,
         };
-        tb.SetBinding(SizeInput.SizeProperty, binding);
+        tb.Bind(SizeInput.SizeProperty, binding);
         return tb;
     }
 

+ 0 - 1
src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/ViewModelMain.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
 using PixiEditor.Avalonia.ViewModels;

+ 21 - 14
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/Input/SizeInput.axaml.cs

@@ -12,7 +12,7 @@ namespace PixiEditor.Views.UserControls;
 internal partial class SizeInput : UserControl
 {
     public static readonly StyledProperty<int> SizeProperty =
-        AvaloniaProperty.Register<SizeInput, int>(nameof(Size), defaultValue: 1, notifyingSetter: SizePropertyChanged);
+        AvaloniaProperty.Register<SizeInput, int>(nameof(Size), defaultValue: 1);
 
     public static readonly StyledProperty<int> MaxSizeProperty =
         AvaloniaProperty.Register<SizeInput, int>(nameof(MaxSize), defaultValue: int.MaxValue);
@@ -32,12 +32,17 @@ internal partial class SizeInput : UserControl
     public static readonly StyledProperty<Action> OnScrollActionProperty =
         AvaloniaProperty.Register<SizeInput, Action>(nameof(OnScrollAction));
 
+    static SizeInput()
+    {
+        SizeProperty.Changed.Subscribe(InputSizeChanged);
+    }
+
     public SizeInput()
     {
         InitializeComponent();
     }
 
-    private void SizeInput_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+    private void SizeInput_GotKeyboardFocus(object sender, GotFocusEventArgs e)
     {
         textBox.Focus();
     }
@@ -66,16 +71,18 @@ internal partial class SizeInput : UserControl
         textBox.SelectAll();
     }
 
-    private void Border_MouseLeftButtonDown(object? sender, PointerPressedEventArgs pointerPressedEventArgs)
+    private void Border_MouseLeftButtonDown(object? sender, PointerPressedEventArgs e)
     {
-        Point pos = Mouse.GetPosition(textBox);
+        /*Point pos = Mouse.GetPosition(textBox);
         int charIndex = textBox.GetCharacterIndexFromPoint(pos, true);
         var charRect = textBox.GetRectFromCharacterIndex(charIndex);
         double middleX = (charRect.Left + charRect.Right) / 2;
         if (pos.X > middleX)
             textBox.CaretIndex = charIndex + 1;
         else
-            textBox.CaretIndex = charIndex;
+            textBox.CaretIndex = charIndex;*/
+        //TODO: Above functions not found in Avalonia
+        textBox.SelectAll();
         e.Handled = true;
         if (!textBox.IsFocused)
             textBox.Focus();
@@ -87,34 +94,34 @@ internal partial class SizeInput : UserControl
         set => SetValue(UnitProperty, value);
     }
 
-    private static void InputSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private static void InputSizeChanged(AvaloniaPropertyChangedEventArgs<int> e)
     {
-        int newValue = (int)e.NewValue;
-        int maxSize = (int)d.GetValue(MaxSizeProperty);
+        int newValue = e.NewValue.Value;
+        int maxSize = (int)e.Sender.GetValue(MaxSizeProperty);
 
         if (newValue > maxSize)
         {
-            d.SetValue(SizeProperty, maxSize);
+            e.Sender.SetValue(SizeProperty, maxSize);
 
             return;
         }
         else if (newValue <= 0)
         {
-            d.SetValue(SizeProperty, 1);
+            e.Sender.SetValue(SizeProperty, 1);
 
             return;
         }
     }
 
-    private void Border_MouseWheel(object? sender, PointerWheelEventArgs pointerWheelEventArgs)
+    private void Border_MouseWheel(object? sender, PointerWheelEventArgs e)
     {
-        int step = e.Delta / 100;
+        int step = (int)e.Delta.Y / 100;
 
-        if (Keyboard.IsKeyDown(Key.LeftShift))
+        if (e.KeyModifiers.HasFlag(KeyModifiers.Shift))
         {
             Size += step * 2;
         }
-        else if (Keyboard.IsKeyDown(Key.LeftCtrl))
+        else if (e.KeyModifiers.HasFlag(KeyModifiers.Control))
         {
             if (step < 0)
             {

+ 3 - 0
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/MainWindow.axaml.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
 using Microsoft.Extensions.DependencyInjection;
 using PixiEditor.Avalonia.ViewModels;
@@ -26,6 +28,7 @@ internal partial class MainWindow : Window
 
     public MainWindow(ExtensionLoader extensionLoader)
     {
+        (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).MainWindow = this;
         extLoader = extensionLoader;
 
         services = new ServiceCollection()

+ 11 - 12
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/Windows/HelloTherePopup.axaml

@@ -19,25 +19,24 @@
         xmlns:dataHolders="clr-namespace:PixiEditor.Models.DataHolders"
         mc:Ignorable="d" ShowInTaskbar="False"
         Title="Hello there!" Height="662" Width="982" MinHeight="500" MinWidth="500"
-        d:DataContext="{d:DesignInstance local:HelloTherePopup}"
         WindowStartupLocation="CenterScreen" Loaded="HelloTherePopup_OnLoaded"
         FlowDirection="{helpers:Localization FlowDirection}">
 
-    <Window.Resources>
+    <Window.Styles>
         <Style Selector="TextBlock">
             <Setter Property="Foreground" Value="White"/>
             <Setter Property="FontSize" Value="16"/>
         </Style>
-    </Window.Resources>
+    </Window.Styles>
 
-    <Grid Background="{StaticResource ThemeBackgroundBrush}">
+    <Grid Background="{StaticResource ThemeBackgroundBrush}" x:Name="grid">
         <Grid.RowDefinitions>
             <RowDefinition Height="35" />
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="300" x:Name="newsColumn"/>
+            <ColumnDefinition Width="300"/>
         </Grid.ColumnDefinitions>
 
         <ScrollViewer Grid.Column="0" Grid.Row="1" VerticalScrollBarVisibility="Auto" Margin="3,0">
@@ -107,7 +106,7 @@
                             <Binding Path="RecentlyOpened.Count"
                                      Converter="{converters:EqualityBoolToIsVisibleConverter}">
                                 <Binding.ConverterParameter>
-                                    <system:Int32/>
+                                    <system:Int32>0</system:Int32>
                                 </Binding.ConverterParameter>
                             </Binding>
                         </TextBlock.IsVisible>
@@ -126,12 +125,12 @@
                                                 x:Name="fileButton">
                                             <Grid Width="100" Height="100">
                                                 <Image Source="{Binding PreviewBitmap}" x:Name="image" Margin="20">
-                                                    <RenderOptions.BitmapInterpolationMode>
+                                                    <!--<RenderOptions.BitmapInterpolationMode> TODO: Fix
                                                         <MultiBinding Converter="{converters:WidthToBitmapScalingModeConverter}">
-                                                            <Binding Path="PreviewBitmap.PixelWidth"/>
-                                                            <Binding ElementName="image" Path="ActualWidth"/>
+                                                            <Binding Path="PreviewBitmap.PixelSize.Width"/>
+                                                            <Binding ElementName="image" Path="Width"/>
                                                         </MultiBinding>
-                                                    </RenderOptions.BitmapInterpolationMode>
+                                                    </RenderOptions.BitmapInterpolationMode>-->
                                                 </Image>
                                                 <Border Grid.Row="1" Height="8" Width="8" x:Name="extensionBorder" Margin="5"
                                                         Background="{Binding FileExtension, Converter={converters:FileExtensionToColorConverter}}" 
@@ -215,7 +214,7 @@
                                                         </Grid.Style>-->
                                                         <TextBlock x:Name="extension" VerticalAlignment="Top" Text="{Binding FileExtension}" FontSize="15" TextAlignment="Center"/>
                                                         <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center">
-                                                            <StackPanel.Resources>
+                                                            <StackPanel.Styles>
                                                                 <Style Selector="Button">
                                                                     <Setter Property="Margin" Value="0,0,0,5"/>
                                                                     <Setter Property="Width" Value="25"/>
@@ -227,7 +226,7 @@
                                                                   <Style Selector="Button:hover">
                                                                       <Setter Property="Background" Value="#70FFFFFF"/>
                                                                   </Style>
-                                                            </StackPanel.Resources>
+                                                            </StackPanel.Styles>
                                                             <Button Command="{Binding DataContext.OpenInExplorerCommand, RelativeSource={RelativeSource AncestorType=uc:AlignableWrapPanel}}"
                                                                     CommandParameter="{Binding FilePath}"
                                                                     ToolTip.Tip="Open in File Explorer">

+ 4 - 4
src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/Windows/HelloTherePopup.axaml.cs

@@ -119,7 +119,7 @@ internal partial class HelloTherePopup : Window
 
         if (_newsDisabled || NewsPanelCollapsed)
         {
-            newsColumn.Width = new GridLength(0);
+            grid.ColumnDefinitions.Last().Width = new GridLength(0);
             newsWidth = 0;
         }
 
@@ -147,15 +147,15 @@ internal partial class HelloTherePopup : Window
         if(helloTherePopup._newsDisabled)
             return;
 
-        if (newValue)
+        if (e.NewValue.Value)
         {
             helloTherePopup.Width -= 300;
-            helloTherePopup.newsColumn.Width = new GridLength(0);
+            helloTherePopup.grid.ColumnDefinitions.Last().Width = new GridLength(0);
         }
         else
         {
             helloTherePopup.Width += 300;
-            helloTherePopup.newsColumn.Width = new GridLength(300);
+            helloTherePopup.grid.ColumnDefinitions.Last().Width = new GridLength(300);
         }
 
         IPreferences.Current.UpdatePreference(PreferencesConstants.NewsPanelCollapsed, e.NewValue.Value);

+ 198 - 168
src/PixiEditor.sln

@@ -40,11 +40,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditorGen", "PixiEditor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Builder", "PixiEditor.Builder\build\PixiEditor.Builder.csproj", "{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Platform.Steam", "PixiEditor.Platform.Steam\PixiEditor.Platform.Steam.csproj", "{9BCD0764-9C16-4A2A-B153-C676FEF38887}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Platform.Steam", "PixiEditor.Platform.Steam\PixiEditor.Platform.Steam.csproj", "{9BCD0764-9C16-4A2A-B153-C676FEF38887}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Platform", "PixiEditor.Platform\PixiEditor.Platform.csproj", "{2BDEB8C6-F22D-43EA-A309-B3387A803689}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Platform", "PixiEditor.Platform\PixiEditor.Platform.csproj", "{2BDEB8C6-F22D-43EA-A309-B3387A803689}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Platform.MSStore", "PixiEditor.Platform.MSStore\PixiEditor.Platform.MSStore.csproj", "{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Platform.MSStore", "PixiEditor.Platform.MSStore\PixiEditor.Platform.MSStore.csproj", "{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{9A81B795-66AB-4743-9284-90565941343D}"
 EndProject
@@ -54,29 +54,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deployment", "Deployment",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{5AFBF881-C054-4CE4-8159-8D4017FFD27A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Platform.Standalone", "PixiEditor.Platform.Standalone\PixiEditor.Platform.Standalone.csproj", "{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Platform.Standalone", "PixiEditor.Platform.Standalone\PixiEditor.Platform.Standalone.csproj", "{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions", "PixiEditor.Extensions\PixiEditor.Extensions.csproj", "{1249EE2B-EB0D-411C-B311-53A7A22B7743}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Extensions", "PixiEditor.Extensions\PixiEditor.Extensions.csproj", "{1249EE2B-EB0D-411C-B311-53A7A22B7743}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E4FF4CE6-5831-450D-8006-0539353C030B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleExtension", "SampleExtension\SampleExtension.csproj", "{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleExtension", "SampleExtension\SampleExtension.csproj", "{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.UpdateInstaller.Desktop", "PixiEditor.UpdateInstaller\PixiEditor.UpdateInstaller.Desktop\PixiEditor.UpdateInstaller.Desktop.csproj", "{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.UpdateInstaller.Desktop", "PixiEditor.UpdateInstaller\PixiEditor.UpdateInstaller.Desktop\PixiEditor.UpdateInstaller.Desktop.csproj", "{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.UI.Common", "PixiEditor.UI.Common\PixiEditor.UI.Common.csproj", "{FA98BFA6-2E83-41C6-9102-76875B261F51}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.UI.Common", "PixiEditor.UI.Common\PixiEditor.UI.Common.csproj", "{FA98BFA6-2E83-41C6-9102-76875B261F51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Avalonia", "PixiEditor.Avalonia\PixiEditor.Avalonia\PixiEditor.Avalonia.csproj", "{27B4583C-539B-4D75-AF2C-71CAB1B4A153}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Avalonia", "PixiEditor.Avalonia\PixiEditor.Avalonia\PixiEditor.Avalonia.csproj", "{27B4583C-539B-4D75-AF2C-71CAB1B4A153}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Avalonia.Desktop", "PixiEditor.Avalonia\PixiEditor.Avalonia.Desktop\PixiEditor.Avalonia.Desktop.csproj", "{20406C86-4833-4E8B-8880-8674984AC03C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Avalonia.Desktop", "PixiEditor.Avalonia\PixiEditor.Avalonia.Desktop\PixiEditor.Avalonia.Desktop.csproj", "{20406C86-4833-4E8B-8880-8674984AC03C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Avalonia.Browser", "PixiEditor.Avalonia\PixiEditor.Avalonia.Browser\PixiEditor.Avalonia.Browser.csproj", "{6B71BBFF-27D2-4A65-9357-1376356B5ECC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Avalonia.Browser", "PixiEditor.Avalonia\PixiEditor.Avalonia.Browser\PixiEditor.Avalonia.Browser.csproj", "{6B71BBFF-27D2-4A65-9357-1376356B5ECC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OperatingSystems", "OperatingSystems", "{2CC7ED59-C25E-4EED-8FED-D48E13EB9CC0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.OperatingSystem", "PixiEditor.OperatingSystem\PixiEditor.OperatingSystem.csproj", "{16519035-0FF4-456F-B3F0-0ACA16E6920C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.OperatingSystem", "PixiEditor.OperatingSystem\PixiEditor.OperatingSystem.csproj", "{16519035-0FF4-456F-B3F0-0ACA16E6920C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Windows", "PixiEditor.Windows\PixiEditor.Windows.csproj", "{3DF64622-87E3-4870-B694-05D565251BB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.Windows", "PixiEditor.Windows\PixiEditor.Windows.csproj", "{3DF64622-87E3-4870-B694-05D565251BB9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -86,6 +86,9 @@ Global
 		DevRelease|Any CPU = DevRelease|Any CPU
 		DevRelease|x64 = DevRelease|x64
 		DevRelease|x86 = DevRelease|x86
+		DevSteam|Any CPU = DevSteam|Any CPU
+		DevSteam|x64 = DevSteam|x64
+		DevSteam|x86 = DevSteam|x86
 		MSIX Debug|Any CPU = MSIX Debug|Any CPU
 		MSIX Debug|x64 = MSIX Debug|x64
 		MSIX Debug|x86 = MSIX Debug|x86
@@ -98,9 +101,6 @@ Global
 		Steam|Any CPU = Steam|Any CPU
 		Steam|x64 = Steam|x64
 		Steam|x86 = Steam|x86
-		DevSteam|x86 = DevSteam|x86
-		DevSteam|x64 = DevSteam|x64
-		DevSteam|Any CPU = DevSteam|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -115,6 +115,12 @@ Global
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevRelease|x64.Build.0 = DevRelease|x64
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevRelease|x86.ActiveCfg = DevRelease|x86
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevRelease|x86.Build.0 = DevRelease|x86
+		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x64.Build.0 = DevSteam|x64
+		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x86.Build.0 = DevSteam|x86
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.MSIX Debug|Any CPU.ActiveCfg = MSIX Debug|Any CPU
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.MSIX Debug|Any CPU.Build.0 = MSIX Debug|Any CPU
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.MSIX Debug|x64.ActiveCfg = MSIX Debug|x64
@@ -139,12 +145,6 @@ Global
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.Steam|x64.Build.0 = Steam|x64
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.Steam|x86.ActiveCfg = Steam|x86
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.Steam|x86.Build.0 = Steam|x86
-		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x86.Build.0 = DevSteam|x86
-		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|x64.Build.0 = DevSteam|x64
-		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{2CCDDE79-06CB-4771-AF85-7B25313EBA30}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Debug|x64.ActiveCfg = Debug|x64
@@ -157,6 +157,12 @@ Global
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevRelease|x64.Build.0 = DevRelease|x64
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevRelease|x86.ActiveCfg = DevRelease|x86
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevRelease|x86.Build.0 = DevRelease|x86
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x64.Build.0 = DevSteam|x64
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x86.Build.0 = DevSteam|x86
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.MSIX Debug|x64.ActiveCfg = Debug|x64
@@ -181,12 +187,6 @@ Global
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Steam|x64.Build.0 = Steam|x64
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Steam|x86.ActiveCfg = Steam|x86
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Steam|x86.Build.0 = Steam|x86
-		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x86.Build.0 = DevSteam|x86
-		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|x64.Build.0 = DevSteam|x64
-		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Debug|x64.ActiveCfg = Debug|x64
@@ -199,6 +199,12 @@ Global
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevRelease|x64.Build.0 = DevRelease|x64
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevRelease|x86.ActiveCfg = DevRelease|x86
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevRelease|x86.Build.0 = DevRelease|x86
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x64.Build.0 = DevSteam|x64
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x86.Build.0 = DevSteam|x86
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.MSIX Debug|x64.ActiveCfg = Debug|x64
@@ -223,12 +229,6 @@ Global
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Steam|x64.Build.0 = Steam|x64
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Steam|x86.ActiveCfg = Steam|x86
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Steam|x86.Build.0 = Steam|x86
-		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x86.Build.0 = DevSteam|x86
-		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|x64.Build.0 = DevSteam|x64
-		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.Debug|x64.ActiveCfg = Debug|x64
@@ -241,6 +241,12 @@ Global
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevRelease|x64.Build.0 = DevRelease|x64
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevRelease|x86.ActiveCfg = DevRelease|x86
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevRelease|x86.Build.0 = DevRelease|x86
+		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x64.Build.0 = DevSteam|x64
+		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x86.Build.0 = DevSteam|x86
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.MSIX Debug|x64.ActiveCfg = Debug|x64
@@ -265,12 +271,6 @@ Global
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.Steam|x64.Build.0 = Steam|x64
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.Steam|x86.ActiveCfg = Steam|x86
 		{5193C1C1-8362-40FD-802B-E097E8C88082}.Steam|x86.Build.0 = Steam|x86
-		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x86.Build.0 = DevSteam|x86
-		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|x64.Build.0 = DevSteam|x64
-		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{5193C1C1-8362-40FD-802B-E097E8C88082}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -289,6 +289,12 @@ Global
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevRelease|x86.ActiveCfg = Release|x86
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevRelease|x86.Build.0 = Release|x86
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevRelease|x86.Deploy.0 = Release|x86
+		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x64.Build.0 = DevSteam|x64
+		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x86.Build.0 = DevSteam|x86
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.MSIX Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -325,12 +331,6 @@ Global
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Steam|x86.ActiveCfg = Debug|x86
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Steam|x86.Build.0 = Debug|x86
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Steam|x86.Deploy.0 = Debug|x86
-		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x86.Build.0 = DevSteam|x86
-		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|x64.Build.0 = DevSteam|x64
-		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -343,6 +343,12 @@ Global
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevRelease|x64.Build.0 = DevRelease|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevRelease|x86.ActiveCfg = DevRelease|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevRelease|x86.Build.0 = DevRelease|Any CPU
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x64.Build.0 = DevSteam|x64
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x86.Build.0 = DevSteam|x86
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -367,12 +373,6 @@ Global
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Steam|x64.Build.0 = Steam|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Steam|x86.ActiveCfg = Steam|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Steam|x86.Build.0 = Steam|Any CPU
-		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x86.Build.0 = DevSteam|x86
-		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|x64.Build.0 = DevSteam|x64
-		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.Debug|x64.ActiveCfg = Debug|x64
@@ -385,6 +385,12 @@ Global
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevRelease|x64.Build.0 = DevRelease|x64
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevRelease|x86.ActiveCfg = DevRelease|x86
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevRelease|x86.Build.0 = DevRelease|x86
+		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x64.Build.0 = DevSteam|x64
+		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x86.Build.0 = DevSteam|x86
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.MSIX Debug|x64.ActiveCfg = Debug|x64
@@ -409,12 +415,6 @@ Global
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.Steam|x64.Build.0 = Steam|x64
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.Steam|x86.ActiveCfg = Steam|x86
 		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.Steam|x86.Build.0 = Steam|x86
-		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x86.Build.0 = DevSteam|x86
-		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|x64.Build.0 = DevSteam|x64
-		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Debug|x64.ActiveCfg = Debug|x64
@@ -427,6 +427,12 @@ Global
 		{510ED47C-2455-4DCE-A561-1074725E1236}.DevRelease|x64.Build.0 = DevRelease|x64
 		{510ED47C-2455-4DCE-A561-1074725E1236}.DevRelease|x86.ActiveCfg = DevRelease|x86
 		{510ED47C-2455-4DCE-A561-1074725E1236}.DevRelease|x86.Build.0 = DevRelease|x86
+		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x64.Build.0 = DevSteam|x64
+		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x86.Build.0 = DevSteam|x86
 		{510ED47C-2455-4DCE-A561-1074725E1236}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{510ED47C-2455-4DCE-A561-1074725E1236}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{510ED47C-2455-4DCE-A561-1074725E1236}.MSIX Debug|x64.ActiveCfg = Debug|x64
@@ -451,12 +457,6 @@ Global
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Steam|x64.Build.0 = Steam|x64
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Steam|x86.ActiveCfg = Steam|x86
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Steam|x86.Build.0 = Steam|x86
-		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x86.Build.0 = DevSteam|x86
-		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|x64.Build.0 = DevSteam|x64
-		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{510ED47C-2455-4DCE-A561-1074725E1236}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -469,6 +469,12 @@ Global
 		{294FD171-9536-474C-A679-83F0266275FB}.DevRelease|x64.Build.0 = DevRelease|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.DevRelease|x86.ActiveCfg = DevRelease|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.DevRelease|x86.Build.0 = DevRelease|Any CPU
+		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x64.Build.0 = DevSteam|x64
+		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x86.Build.0 = DevSteam|x86
 		{294FD171-9536-474C-A679-83F0266275FB}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -493,12 +499,6 @@ Global
 		{294FD171-9536-474C-A679-83F0266275FB}.Steam|x64.Build.0 = Steam|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.Steam|x86.ActiveCfg = Steam|Any CPU
 		{294FD171-9536-474C-A679-83F0266275FB}.Steam|x86.Build.0 = Steam|Any CPU
-		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x86.Build.0 = DevSteam|x86
-		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|x64.Build.0 = DevSteam|x64
-		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{294FD171-9536-474C-A679-83F0266275FB}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -511,6 +511,12 @@ Global
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevRelease|x64.Build.0 = DevRelease|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevRelease|x86.ActiveCfg = DevRelease|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevRelease|x86.Build.0 = DevRelease|Any CPU
+		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x64.Build.0 = DevSteam|x64
+		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x86.Build.0 = DevSteam|x86
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -535,12 +541,6 @@ Global
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.Steam|x64.Build.0 = Steam|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.Steam|x86.ActiveCfg = Steam|Any CPU
 		{758DF7DF-A8B1-4409-B79A-018E542B7251}.Steam|x86.Build.0 = Steam|Any CPU
-		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x86.Build.0 = DevSteam|x86
-		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|x64.Build.0 = DevSteam|x64
-		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{758DF7DF-A8B1-4409-B79A-018E542B7251}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -553,6 +553,12 @@ Global
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevRelease|x64.Build.0 = DevRelease|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevRelease|x86.ActiveCfg = DevRelease|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevRelease|x86.Build.0 = DevRelease|Any CPU
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x64.Build.0 = DevSteam|x64
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x86.Build.0 = DevSteam|x86
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -577,12 +583,6 @@ Global
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Steam|x64.Build.0 = Steam|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Steam|x86.ActiveCfg = Steam|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Steam|x86.Build.0 = Steam|Any CPU
-		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x86.Build.0 = DevSteam|x86
-		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|x64.Build.0 = DevSteam|x64
-		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -595,6 +595,12 @@ Global
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevRelease|x64.Build.0 = DevRelease|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevRelease|x86.ActiveCfg = DevRelease|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevRelease|x86.Build.0 = DevRelease|Any CPU
+		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x64.Build.0 = DevSteam|x64
+		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x86.Build.0 = DevSteam|x86
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -619,12 +625,6 @@ Global
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.Steam|x64.Build.0 = Steam|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.Steam|x86.ActiveCfg = Steam|Any CPU
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.Steam|x86.Build.0 = Steam|Any CPU
-		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x86.Build.0 = DevSteam|x86
-		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|x64.Build.0 = DevSteam|x64
-		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -637,6 +637,12 @@ Global
 		{98040E8A-F08E-45F8-956F-6480C8272049}.DevRelease|x64.Build.0 = DevRelease|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.DevRelease|x86.ActiveCfg = DevRelease|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.DevRelease|x86.Build.0 = DevRelease|Any CPU
+		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x64.Build.0 = DevSteam|x64
+		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x86.Build.0 = DevSteam|x86
 		{98040E8A-F08E-45F8-956F-6480C8272049}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -661,12 +667,6 @@ Global
 		{98040E8A-F08E-45F8-956F-6480C8272049}.Steam|x64.Build.0 = Steam|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.Steam|x86.ActiveCfg = Steam|Any CPU
 		{98040E8A-F08E-45F8-956F-6480C8272049}.Steam|x86.Build.0 = Steam|Any CPU
-		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x86.Build.0 = DevSteam|x86
-		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|x64.Build.0 = DevSteam|x64
-		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{98040E8A-F08E-45F8-956F-6480C8272049}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -679,6 +679,12 @@ Global
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevRelease|x64.Build.0 = DevRelease|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevRelease|x86.ActiveCfg = DevRelease|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevRelease|x86.Build.0 = DevRelease|Any CPU
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x64.Build.0 = DevSteam|x64
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x86.Build.0 = DevSteam|x86
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -703,12 +709,6 @@ Global
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Steam|x64.Build.0 = Steam|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Steam|x86.ActiveCfg = Steam|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Steam|x86.Build.0 = Steam|Any CPU
-		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x86.Build.0 = DevSteam|x86
-		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|x64.Build.0 = DevSteam|x64
-		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -721,6 +721,12 @@ Global
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevRelease|x64.Build.0 = DevRelease|x64
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevRelease|x86.ActiveCfg = DevRelease|x86
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevRelease|x86.Build.0 = DevRelease|x86
+		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x64.Build.0 = DevSteam|x64
+		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x86.Build.0 = DevSteam|x86
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.MSIX Debug|x64.ActiveCfg = Debug|x64
@@ -745,12 +751,6 @@ Global
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.Steam|x64.Build.0 = Debug|x64
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.Steam|x86.ActiveCfg = Debug|x86
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.Steam|x86.Build.0 = Debug|x86
-		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x86.Build.0 = DevSteam|x86
-		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|x64.Build.0 = DevSteam|x64
-		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -763,6 +763,12 @@ Global
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x64.Build.0 = DevSteam|x64
+		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x86.Build.0 = DevSteam|x86
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -787,12 +793,6 @@ Global
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Steam|x64.Build.0 = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Steam|x86.Build.0 = Debug|Any CPU
-		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x86.Build.0 = DevSteam|x86
-		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|x64.Build.0 = DevSteam|x64
-		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -805,6 +805,12 @@ Global
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x64.Build.0 = DevSteam|x64
+		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x86.Build.0 = DevSteam|x86
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -829,12 +835,6 @@ Global
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.Steam|x64.Build.0 = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.Steam|x86.Build.0 = Debug|Any CPU
-		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x86.Build.0 = DevSteam|x86
-		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|x64.Build.0 = DevSteam|x64
-		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{2BDEB8C6-F22D-43EA-A309-B3387A803689}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -847,6 +847,12 @@ Global
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x64.Build.0 = DevSteam|x64
+		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x86.Build.0 = DevSteam|x86
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -871,12 +877,6 @@ Global
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.Steam|x64.Build.0 = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.Steam|x86.Build.0 = Debug|Any CPU
-		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x86.Build.0 = DevSteam|x86
-		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|x64.Build.0 = DevSteam|x64
-		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -889,6 +889,12 @@ Global
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x64.Build.0 = DevSteam|x64
+		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x86.Build.0 = DevSteam|x86
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -913,12 +919,6 @@ Global
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.Steam|x64.Build.0 = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.Steam|x86.Build.0 = Debug|Any CPU
-		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x86.Build.0 = DevSteam|x86
-		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|x64.Build.0 = DevSteam|x64
-		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -931,6 +931,12 @@ Global
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x64.Build.0 = DevSteam|x64
+		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x86.Build.0 = DevSteam|x86
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -955,12 +961,6 @@ Global
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.Steam|x64.Build.0 = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.Steam|x86.Build.0 = Debug|Any CPU
-		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x86.Build.0 = DevSteam|x86
-		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|x64.Build.0 = DevSteam|x64
-		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{1249EE2B-EB0D-411C-B311-53A7A22B7743}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -973,6 +973,12 @@ Global
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
+		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
+		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x64.ActiveCfg = DevSteam|x64
+		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x64.Build.0 = DevSteam|x64
+		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x86.ActiveCfg = DevSteam|x86
+		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x86.Build.0 = DevSteam|x86
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1009,6 +1015,12 @@ Global
 		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
+		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
+		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevSteam|x86.ActiveCfg = Debug|Any CPU
+		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.DevSteam|x86.Build.0 = Debug|Any CPU
 		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10BF4001-214C-4869-8F78-2B6BDBDC7E7D}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1045,6 +1057,12 @@ Global
 		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
+		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevSteam|x86.ActiveCfg = Debug|Any CPU
+		{FA98BFA6-2E83-41C6-9102-76875B261F51}.DevSteam|x86.Build.0 = Debug|Any CPU
 		{FA98BFA6-2E83-41C6-9102-76875B261F51}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA98BFA6-2E83-41C6-9102-76875B261F51}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA98BFA6-2E83-41C6-9102-76875B261F51}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1081,6 +1099,12 @@ Global
 		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
+		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
+		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevSteam|x86.ActiveCfg = Debug|Any CPU
+		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.DevSteam|x86.Build.0 = Debug|Any CPU
 		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27B4583C-539B-4D75-AF2C-71CAB1B4A153}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1117,6 +1141,12 @@ Global
 		{20406C86-4833-4E8B-8880-8674984AC03C}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{20406C86-4833-4E8B-8880-8674984AC03C}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{20406C86-4833-4E8B-8880-8674984AC03C}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{20406C86-4833-4E8B-8880-8674984AC03C}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
+		{20406C86-4833-4E8B-8880-8674984AC03C}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
+		{20406C86-4833-4E8B-8880-8674984AC03C}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{20406C86-4833-4E8B-8880-8674984AC03C}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{20406C86-4833-4E8B-8880-8674984AC03C}.DevSteam|x86.ActiveCfg = Debug|Any CPU
+		{20406C86-4833-4E8B-8880-8674984AC03C}.DevSteam|x86.Build.0 = Debug|Any CPU
 		{20406C86-4833-4E8B-8880-8674984AC03C}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20406C86-4833-4E8B-8880-8674984AC03C}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{20406C86-4833-4E8B-8880-8674984AC03C}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1153,6 +1183,12 @@ Global
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
+		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevSteam|x86.ActiveCfg = Debug|Any CPU
+		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.DevSteam|x86.Build.0 = Debug|Any CPU
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1177,12 +1213,6 @@ Global
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.Steam|x64.Build.0 = Debug|Any CPU
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{6B71BBFF-27D2-4A65-9357-1376356B5ECC}.Steam|x86.Build.0 = Debug|Any CPU
-		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x86.ActiveCfg = DevSteam|x86
-		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x86.Build.0 = DevSteam|x86
-		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x64.ActiveCfg = DevSteam|x64
-		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|x64.Build.0 = DevSteam|x64
-		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|Any CPU.ActiveCfg = DevSteam|Any CPU
-		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814}.DevSteam|Any CPU.Build.0 = DevSteam|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1195,6 +1225,12 @@ Global
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
+		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
+		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x86.ActiveCfg = Debug|Any CPU
+		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x86.Build.0 = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1219,12 +1255,6 @@ Global
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.Steam|x64.Build.0 = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.Steam|x86.Build.0 = Debug|Any CPU
-		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x86.ActiveCfg = Debug|Any CPU
-		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x86.Build.0 = Debug|Any CPU
-		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x64.ActiveCfg = Debug|Any CPU
-		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|x64.Build.0 = Debug|Any CPU
-		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
-		{16519035-0FF4-456F-B3F0-0ACA16E6920C}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1237,6 +1267,12 @@ Global
 		{3DF64622-87E3-4870-B694-05D565251BB9}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.DevRelease|x86.ActiveCfg = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.DevRelease|x86.Build.0 = Debug|Any CPU
+		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
+		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x86.ActiveCfg = Debug|Any CPU
+		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x86.Build.0 = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1261,38 +1297,29 @@ Global
 		{3DF64622-87E3-4870-B694-05D565251BB9}.Steam|x64.Build.0 = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{3DF64622-87E3-4870-B694-05D565251BB9}.Steam|x86.Build.0 = Debug|Any CPU
-		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x86.ActiveCfg = Debug|Any CPU
-		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x86.Build.0 = Debug|Any CPU
-		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x64.ActiveCfg = Debug|Any CPU
-		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|x64.Build.0 = Debug|Any CPU
-		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DF64622-87E3-4870-B694-05D565251BB9}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{2BDEB8C6-F22D-43EA-A309-B3387A803689} = {9A81B795-66AB-4743-9284-90565941343D}
-		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6} = {9A81B795-66AB-4743-9284-90565941343D}
-		{9BCD0764-9C16-4A2A-B153-C676FEF38887} = {9A81B795-66AB-4743-9284-90565941343D}
-		{6A9DA760-1E47-414C-B8E8-3B4927F18131} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{2CCDDE79-06CB-4771-AF85-7B25313EBA30} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE} = {68C3DA2D-D2EA-426E-A866-0019E425C816}
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
+		{5193C1C1-8362-40FD-802B-E097E8C88082} = {5AFBF881-C054-4CE4-8159-8D4017FFD27A}
+		{1F97F972-F9E8-4F35-A8B5-3F71408D2230} = {68C3DA2D-D2EA-426E-A866-0019E425C816}
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
+		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6} = {5AFBF881-C054-4CE4-8159-8D4017FFD27A}
+		{510ED47C-2455-4DCE-A561-1074725E1236} = {5AFBF881-C054-4CE4-8159-8D4017FFD27A}
 		{294FD171-9536-474C-A679-83F0266275FB} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{758DF7DF-A8B1-4409-B79A-018E542B7251} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{5FC5E9C5-F439-43AA-92AF-9B7554D6FA13} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{98040E8A-F08E-45F8-956F-6480C8272049} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
-		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
-		{69DD5830-C682-49FB-B1A5-D2A506EEA06B} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{7AEE19FA-A4F8-4ACA-9E39-401AA1F603C2} = {68C3DA2D-D2EA-426E-A866-0019E425C816}
-		{1F97F972-F9E8-4F35-A8B5-3F71408D2230} = {68C3DA2D-D2EA-426E-A866-0019E425C816}
-		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE} = {68C3DA2D-D2EA-426E-A866-0019E425C816}
-		{E31A8266-5BCA-4877-B9E5-9C5BB42829D6} = {5AFBF881-C054-4CE4-8159-8D4017FFD27A}
-		{510ED47C-2455-4DCE-A561-1074725E1236} = {5AFBF881-C054-4CE4-8159-8D4017FFD27A}
-		{5193C1C1-8362-40FD-802B-E097E8C88082} = {5AFBF881-C054-4CE4-8159-8D4017FFD27A}
+		{9BCD0764-9C16-4A2A-B153-C676FEF38887} = {9A81B795-66AB-4743-9284-90565941343D}
+		{2BDEB8C6-F22D-43EA-A309-B3387A803689} = {9A81B795-66AB-4743-9284-90565941343D}
+		{8EF48E6C-8219-4EE2-87C6-5176D8D092E6} = {9A81B795-66AB-4743-9284-90565941343D}
 		{7A12C96B-8B5C-45E1-9EF6-0B1DA7F270DE} = {9A81B795-66AB-4743-9284-90565941343D}
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{CE1C8DC9-E26B-4BBB-AB87-34054DE34814} = {E4FF4CE6-5831-450D-8006-0539353C030B}
@@ -1304,4 +1331,7 @@ Global
 		{16519035-0FF4-456F-B3F0-0ACA16E6920C} = {2CC7ED59-C25E-4EED-8FED-D48E13EB9CC0}
 		{3DF64622-87E3-4870-B694-05D565251BB9} = {2CC7ED59-C25E-4EED-8FED-D48E13EB9CC0}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}
+	EndGlobalSection
 EndGlobal