Prep for 4x. (#107)

* Updated help message.
Looks a bit odd.

* Add method to read dotnet runtime version from registry, or return null if not found.

* simpler

* Add comment explaining odd step.

* Move check for dotnet

* boom

* Switch to a mdxaml so that net5 won't get compatibility warnings.

* Switch to Kpressier.Ui.TaskDialog

* Checkback in the footer.

* Switch to new way to handle process starts.

* Ensure add/remove works even when filted

* Use pattern matching

* Pattern matching changes

* cleanup

Co-authored-by: Amir Burbea <amir.burbea@gmail.com>

Author: mburbea

KoAR.Core/GameSave.cs

@@ -33,7 +33,7 @@ public GameSave(string fileName)
             IsRemaster = BitConverter.ToInt32(Bytes, 8) == 0;
             SaveType = IsRemaster switch
             {
-                true when Path.GetExtension(fileName) is "" && Bytes.Length != 4_462_592 => SaveType.Switch,
+                true when Path.GetExtension(fileName) is "" => SaveType.Switch,
                 true => SaveType.Remaster,
                 false => SaveType.Original,
             };
@@ -151,11 +151,10 @@ static int GetBagOffset(ReadOnlySpan<byte> data)
         private void FindEquippedItems(int playerActor)
         {
             var data = Body.AsSpan();
-            ReadOnlySpan<byte> signature = new byte[9] { 0x0B, 0x00, 0x00, 0x00, 0x41, 0xF5, 0x7E, 0x00, (byte)(SaveType == SaveType.Switch ? 0x05 : 0x04) };
-            Span<byte> temp = stackalloc byte[13];
+            Span<byte> temp = stackalloc byte[12];
             MemoryUtilities.Write(temp, 0, playerActor);
-            signature.CopyTo(temp[4..]);
-            int offset = data.IndexOf(MemoryMarshal.AsBytes(temp));
+            MemoryUtilities.Write(temp, 4, 0x00_7E_F5_41_00_00_00_0Bul);
+            int offset = data.IndexOf(temp);
             int dataLength = MemoryUtilities.Read<int>(data, offset + 13);
             // 17 is the loot table
             // 21 is the count of items in the inventory.

KoAR.SaveEditor/App.xaml.cs

@@ -6,7 +6,7 @@
 using System.Windows.Threading;
 using KoAR.SaveEditor.Properties;
 using Microsoft.Windows.Themes;
-using TaskDialogInterop;
+using KPreisser.UI;
 
 namespace KoAR.SaveEditor
 {
@@ -19,19 +19,26 @@ partial class App
         public static void ShowExceptionDialog(string mainInstruction, Exception exception)
         {
             string content = $"{exception.GetType().FullName}: {exception.Message}";
-            TaskDialogResult dialogResult = TaskDialog.Show(new()
+            TaskDialog dialog = new(new()
             {
                 Title = "KoAR Save Editor",
-                MainInstruction = mainInstruction,
-                Content = content,
-                ExpandedInfo = exception.StackTrace,
-                VerificationText = "Open GitHub bug report? (requires free account)",
-                MainIcon = VistaTaskDialogIcon.Error,
+                Instruction = mainInstruction,
+                Text = content,
+                Expander = {
+                    Text = exception.StackTrace,
+                    ExpandFooterArea = true,
+                },
+                CheckBox = new("Open GitHub bug report? (requires free account)"),
+                Icon = TaskDialogStandardIcon.Error,
             });
-            if (dialogResult.VerificationChecked == true)
+            dialog.Show();
+            if (dialog.Page.CheckBox.Checked)
             {
-                string title = $"{content} (in v{App.Version})";
-                Process.Start($"https://github.com/mburbea/koar-item-editor/issues/new?labels=bug&template=bug_report.md&title={WebUtility.UrlEncode(title)}");
+                string title = $"{content} (in v{App.Version})";                
+                Process.Start(new ProcessStartInfo($"https://github.com/mburbea/koar-item-editor/issues/new?labels=bug&template=bug_report.md&title={WebUtility.UrlEncode(title)}")
+                {
+                    UseShellExecute = true
+                })?.Dispose();
             }
         }
 

KoAR.SaveEditor/Constructs/DataContainer.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
@@ -38,11 +37,13 @@ int IComparable.CompareTo(object obj)
 
         private sealed class DataContainerCollectionConverter : IValueConverter
         {
-            [SuppressMessage("Style", "IDE0039:Use local function", Justification = "Prevent a delegate creation on each usage.")]
+            private static readonly Func<object, DataContainer> _getContainer = value => value is DataContainer container ? container : new(value);
+
             object IValueConverter.Convert(object value, Type targetType, object parameter, CultureInfo culture)
             {
-                Func<object, DataContainer> getContainer = value => value is DataContainer container ? container : new(value);
-                return value is IEnumerable collection ? collection.Cast<object>().Select(getContainer).ToArray() : new[] { getContainer(value) };
+                return value is IEnumerable collection 
+                    ? collection.Cast<object>().Select(DataContainerCollectionConverter._getContainer).ToArray() 
+                    : new[] { DataContainerCollectionConverter._getContainer(value) };
             }
 
             object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();

KoAR.SaveEditor/Constructs/ScrollingTabControl.cs

@@ -92,8 +92,7 @@ private void LeftButton_Click(object sender, RoutedEventArgs e)
                 return;
             }
             double offset = Math.Max(this._scrollViewer.HorizontalOffset - 2d, 0d);
-            TabItem? tabItem = this.GetItemByOffset(offset);
-            if (tabItem != null)
+            if (this.GetItemByOffset(offset) is TabItem tabItem)
             {
                 this.ScrollToItem(tabItem);
             }
@@ -106,8 +105,7 @@ private void RightButton_Click(object sender, RoutedEventArgs e)
                 return;
             }
             double offset = Math.Min(this._scrollViewer.HorizontalOffset + this._scrollViewer.ViewportWidth + 2d, this._scrollViewer.ExtentWidth);
-            TabItem? tabItem = this.GetItemByOffset(offset);
-            if (tabItem != null)
+            if (this.GetItemByOffset(offset) is TabItem tabItem)
             {
                 this.ScrollToItem(tabItem);
             }
@@ -132,16 +130,17 @@ private void ScrollToItem(TabItem item)
 
         private void ScrollToSelectedItem()
         {
-            if (this._scrollViewer != null && this.ItemContainerGenerator.ContainerFromItem(this.SelectedItem) is TabItem tabItem)
+            if (this._scrollViewer == null || this.ItemContainerGenerator.ContainerFromItem(this.SelectedItem) is not TabItem tabItem)
             {
-                if (tabItem.IsLoaded)
-                {
-                    this.ScrollToItem(tabItem);
-                }
-                else
-                {
-                    tabItem.Loaded += this.TabItem_Loaded;
-                }
+                return;
+            }
+            if (tabItem.IsLoaded)
+            {
+                this.ScrollToItem(tabItem);
+            }
+            else
+            {
+                tabItem.Loaded += this.TabItem_Loaded;
             }
         }
 

KoAR.SaveEditor/Constructs/TaskbarItemInfoOverlay.cs

@@ -53,8 +53,7 @@ private static void OnPropertyChanged(DependencyObject d, DependencyPropertyChan
             {
                 return;
             }
-            object? content = TaskbarItemInfoOverlay.GetContent(info);
-            if (content == null)
+            if (TaskbarItemInfoOverlay.GetContent(info) is not object content)
             {
                 info.Overlay = null;
                 return;

KoAR.SaveEditor/Constructs/ValidatingPropertyBehavior.cs

@@ -13,75 +13,44 @@ namespace KoAR.SaveEditor.Constructs
     /// </summary>
     public static class ValidatingPropertyBehavior
     {
-        /// <summary>
-        /// Defines the ValidatingProperty dependency property.
-        /// </summary>
         public static readonly DependencyProperty ValidatingPropertyProperty = DependencyProperty.RegisterAttached("ValidatingProperty", typeof(DependencyProperty), typeof(ValidatingPropertyBehavior),
             new(ValidatingPropertyBehavior.ValidatingPropertyProperty_PropertyChanged));
 
-        /// <summary>
-        /// Gets the validating dependency property for a dependency object.
-        /// </summary>
-        /// <param name="dependencyObject">The dependency object.</param>
-        /// <returns>Dependency property.</returns>
         public static DependencyProperty? GetValidatingProperty(DependencyObject dependencyObject)
         {
             return (DependencyProperty?)dependencyObject?.GetValue(ValidatingPropertyBehavior.ValidatingPropertyProperty);
         }
 
-        /// <summary>
-        /// Sets the validating dependency property for a dependency object.
-        /// </summary>
-        /// <param name="dependencyObject">The dependency object.</param>
-        /// <param name="property">The dependency property.</param>
         public static void SetValidatingProperty(DependencyObject dependencyObject, DependencyProperty? property)
         {
             dependencyObject?.SetValue(ValidatingPropertyBehavior.ValidatingPropertyProperty, property);
         }
 
-        /// <summary>
-        /// Called when the value of a validating property changes.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">Event arguments.</param>
         private static void DependencyProperty_ValueChanged(object sender, EventArgs e)
         {
             DependencyObject dependencyObject = (DependencyObject)sender;
-            DependencyProperty? property = ValidatingPropertyBehavior.GetValidatingProperty(dependencyObject);
-            if (property != null)
+            if (ValidatingPropertyBehavior.GetValidatingProperty(dependencyObject) is DependencyProperty property)
             {
                 dependencyObject.Validate(property);
             }
         }
 
-        /// <summary>
-        /// Validate a value against a collection of validation rules.
-        /// </summary>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="validationRules">The validation rules collection.</param>
-        /// <param name="bindingExpression">The binding expression.</param>
         private static void Validate(object value, IEnumerable<ValidationRule>? validationRules, BindingExpressionBase bindingExpression)
         {
             if (validationRules != null)
             {
                 foreach (ValidationRule rule in validationRules)
                 {
-                    ValidationResult result = rule.Validate(value, CultureInfo.InvariantCulture);
-                    if (!result.IsValid)
+                    if (rule.Validate(value, null) is { IsValid: false, ErrorContent: object errorContent })
                     {
-                        Validation.MarkInvalid(bindingExpression, new(rule, bindingExpression.ParentBindingBase, result.ErrorContent, null));
+                        Validation.MarkInvalid(bindingExpression, new(rule, bindingExpression.ParentBindingBase, errorContent, null));
                         return;
                     }
                 }
             }
             Validation.ClearInvalid(bindingExpression);
         }
 
-        /// <summary>
-        /// Validate that a value of a dependency object/property combination does not violate any binding validation rules.
-        /// </summary>
-        /// <param name="dependencyObject">The dependency object.</param>
-        /// <param name="dependencyProperty">The dependency property.</param>
         private static void Validate(this DependencyObject dependencyObject, DependencyProperty dependencyProperty)
         {
             BindingExpressionBase bindingExpression = BindingOperations.GetBindingExpressionBase(dependencyObject, dependencyProperty);
@@ -101,11 +70,6 @@ private static void Validate(this DependencyObject dependencyObject, DependencyP
             }
         }
 
-        /// <summary>
-        /// Called when the value of the ValidatingProperty dependency property changes.
-        /// </summary>
-        /// <param name="d">The source of the event.</param>
-        /// <param name="e">Event arguments.</param>
         private static void ValidatingPropertyProperty_PropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (e.OldValue != null)

KoAR.SaveEditor/KoAR.SaveEditor.csproj

@@ -208,8 +208,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Markdown.Xaml" Version="1.0.0" />
-    <PackageReference Include="WPFTaskDialog" Version="1.7.1" />
+    <PackageReference Include="KPreisser.UI.TaskDialog" Version="1.0.0" />
+    <PackageReference Include="MdXaml_migfree" Version="1.9.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\KoAR.Core\KoAR.Core.csproj" />

KoAR.SaveEditor/Updates/UpdateMethods.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -11,6 +12,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using KoAR.Core;
+using Microsoft.Win32;
 
 namespace KoAR.SaveEditor.Updates
 {
@@ -19,6 +21,18 @@ public static class UpdateMethods
         private static readonly Lazy<string?> _credentials = new(UpdateMethods.LoadCredentials);
         private static readonly JsonSerializerOptions _jsonOptions = new() { PropertyNamingPolicy = JsonSnakeCaseNamingPolicy.Instance };
 
+        public static bool CheckForNet5()
+        {
+            string arch = Environment.Is64BitProcess ? "x64" : "x86";
+            using RegistryKey baseKey = Registry.LocalMachine.OpenSubKey($@"SOFTWARE\dotnet\Setup\InstalledVersions\{arch}\sharedhost");
+            // Check for version string with extra info not applicable to
+            // a version number and strip it out (6.0.0-preview.2.21154.6)
+            return baseKey?.GetValue("Version") is string { Length: > 0 } value &&
+                value.IndexOf('.') is int index and > -1 &&
+                int.TryParse(value[..index], NumberStyles.Integer, CultureInfo.InvariantCulture, out int major) &&
+                major >= 5;
+        }
+
         /// <summary>
         /// Given the path to a zip file containing an update, executes the update process.
         /// </summary>
@@ -36,22 +50,22 @@ public static async void ExecuteUpdate(string zipFilePath)
         }
 
         /// <summary>
-        /// Fetches the latest 2.x release.
+        /// Fetches the latest release with the specified <paramref name="majorVersion"/>.
         /// </summary>
+        /// <param name="majorVersion">The major version of the release.</param>
         /// <param name="cancellationToken">Optionally used to propagate cancellation requests.</param>
         /// <returns>Information related to a release. Returns <see langword="null"/> if not found or an error occurs.</returns>
-        public static async Task<IReleaseInfo?> FetchLatest2xReleaseAsync(CancellationToken cancellationToken = default)
+        public static async Task<IReleaseInfo?> FetchLatestVersionedRelease(int majorVersion, CancellationToken cancellationToken = default)
         {
             try
             {
                 foreach (Tag tag in await UpdateMethods.FetchTagsAsync(cancellationToken).ConfigureAwait(false))
                 {
-                    if (tag.Version.Major != 2)
+                    if (tag.Version.Major != majorVersion)
                     {
                         continue;
                     }
-                    Release? release = await UpdateMethods.FetchReleaseAsync(tag.Name, cancellationToken).ConfigureAwait(false);
-                    if (release != null && release.HasUpdateAsset)
+                    if (await UpdateMethods.FetchReleaseAsync(tag.Name, cancellationToken).ConfigureAwait(false) is { HasUpdateAsset: true } release)
                     {
                         return release;
                     }
@@ -63,6 +77,14 @@ public static async void ExecuteUpdate(string zipFilePath)
             return default;
         }
 
+        /// <summary>
+        /// Fetches the latest 2.x release.
+        /// </summary>
+        /// <param name="cancellationToken">Optionally used to propagate cancellation requests.</param>
+        /// <returns>Information related to a release. Returns <see langword="null"/> if not found or an error occurs.</returns>
+        public static Task<IReleaseInfo?> FetchLatest2xReleaseAsync(CancellationToken cancellationToken = default) =>
+            UpdateMethods.FetchLatestVersionedRelease(2, cancellationToken);
+
         /// <summary>
         /// Fetches an array of the interim update releases for the current major version of the application to the latest.
         /// Only checks up to <paramref name="maxReleases"/> number of tags/releases.

KoAR.SaveEditor/Views/ItemDefinitionControl.cs

@@ -65,17 +65,15 @@ private static void Definition_ValueChanged(DependencyObject d, DependencyProper
         private static void ItemProperty_ValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             ItemDefinitionControl control = (ItemDefinitionControl)d;
-            if (e.OldValue != null)
+            if (e.OldValue is ItemModelBase oldItem)
             {
-                ItemModelBase oldItem = (ItemModelBase)e.OldValue;
                 PropertyChangedEventManager.RemoveHandler(oldItem, control.Item_DefinitionChanged, nameof(oldItem.Definition));
             }
-            ItemModelBase? item = (ItemModelBase)e.NewValue;
-            if (item != null)
+            if (e.NewValue is ItemModelBase newItem)
             {
-                control.Definition = item.Definition;
-                PropertyChangedEventManager.AddHandler(item, control.Item_DefinitionChanged, nameof(item.Definition));
-                control.Sockets = item.Item.GetSockets();
+                control.Definition = newItem.Definition;
+                PropertyChangedEventManager.AddHandler(newItem, control.Item_DefinitionChanged, nameof(newItem.Definition));
+                control.Sockets = newItem.Item.GetSockets();
             }
             else
             {

KoAR.SaveEditor/Views/Main/MainWindow.xaml.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Windows.Input;
 using KoAR.SaveEditor.Properties;
-using TaskDialogInterop;
 
 namespace KoAR.SaveEditor.Views.Main
 {
@@ -27,20 +26,7 @@ protected override void OnPreviewKeyDown(KeyEventArgs e)
             base.OnPreviewKeyDown(e);
         }
 
-        private void Help_Executed(object sender, ExecutedRoutedEventArgs e) => TaskDialog.Show(new()
-        {
-            Owner = this,
-            Title = $"KoAR Save Editor",
-            MainInstruction = "Help",
-            MainIcon = VistaTaskDialogIcon.Information,
-            CommonButtons = TaskDialogCommonButtons.Close,
-            Content = @"1. Your saves are usually not in the same folder as the game.  The editor attemps to make
-educated guesses as to the save file directory.
-
-2. When modifying item names, do NOT use special characters.
-
-3. Editing equipped items may cause your file to not load."
-        });
+        private void Help_Executed(object sender, ExecutedRoutedEventArgs e) => this.ViewModel.ShowHelp();
 
         private void Open_Executed(object sender, ExecutedRoutedEventArgs e) => this.ViewModel.OpenFile();