Update packages

This commit is contained in:
Yoshi Askharoun
2024-03-12 17:06:06 -05:00
parent dafecd86da
commit f1d3b58682
19 changed files with 101 additions and 113 deletions
@@ -1,7 +1,7 @@
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using OwlCore.AbstractUI.ViewModels; using OwlCore.AbstractUI.ViewModels;
using Microsoft.Toolkit.Diagnostics; using CommunityToolkit.Diagnostics;
using OwlCore.AbstractUI.Models; using OwlCore.AbstractUI.Models;
using OwlCore.Wpf.Extensions; using OwlCore.Wpf.Extensions;
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractBooleanStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractBooleanStyle"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls">
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractButtonStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractButtonStyle"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"
xmlns:local="clr-namespace:OwlCore.Wpf.AbstractUI.Themes"> xmlns:local="clr-namespace:OwlCore.Wpf.AbstractUI.Themes">
@@ -1,12 +1,8 @@
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using OwlCore.AbstractUI.Models; using OwlCore.AbstractUI.Models;
using OwlCore.AbstractUI.ViewModels; using OwlCore.AbstractUI.ViewModels;
using Microsoft.Toolkit.Diagnostics; using CommunityToolkit.Diagnostics;
using OwlCore.Wpf.AbstractUI.Controls;
using System.Windows.Data; using System.Windows.Data;
using System.Globalization; using System.Globalization;
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractDataListStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractDataListStyle"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"
xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes" xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"
@@ -2,7 +2,7 @@
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using OwlCore.AbstractUI.ViewModels; using OwlCore.AbstractUI.ViewModels;
using Microsoft.Toolkit.Diagnostics; using CommunityToolkit.Diagnostics;
using OwlCore.AbstractUI.Models; using OwlCore.AbstractUI.Models;
namespace OwlCore.Wpf.AbstractUI.Themes namespace OwlCore.Wpf.AbstractUI.Themes
@@ -2,7 +2,7 @@
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using OwlCore.AbstractUI.ViewModels; using OwlCore.AbstractUI.ViewModels;
using Microsoft.Toolkit.Diagnostics; using CommunityToolkit.Diagnostics;
using OwlCore.AbstractUI.Models; using OwlCore.AbstractUI.Models;
namespace OwlCore.Wpf.AbstractUI.Themes namespace OwlCore.Wpf.AbstractUI.Themes
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractMultiChoiceUIElementStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractMultiChoiceUIElementStyle"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"
xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes"> xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes">
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractProgressUIElementStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractProgressUIElementStyle"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls">
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractRichTextBlockStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractRichTextBlockStyle"
xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractTextBoxStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractTextBoxStyle"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls">
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractUIGroupPresenterStyle" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractUIGroupPresenterStyle"
xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"
xmlns:abstractUIVm="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" xmlns:abstractUIVm="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI"
xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes" xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes"
xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"> xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible">
+4 -3
View File
@@ -7,9 +7,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Diagnostics" Version="7.1.2" /> <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="OwlCore" Version="0.0.43" /> <PackageReference Include="OwlCore" Version="0.4.1" />
<PackageReference Include="OwlCore.AbstractUI" Version="0.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
+4 -7
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using Vestris.ResourceLib; using Vestris.ResourceLib;
using ZuneModCore.Win32; using ZuneModCore.Win32;
@@ -22,21 +21,19 @@ namespace ZuneModCore.Mods
public override AbstractUICollection? GetDefaultOptionsUI() public override AbstractUICollection? GetDefaultOptionsUI()
{ {
return new(nameof(BackgroundImageMod)) AbstractUICollection optionsUi = new(nameof(BackgroundImageMod))
{
Title = "Select background image:",
Items = new List<AbstractUIElement>
{ {
new AbstractTextBox("fileBox", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures)), new AbstractTextBox("fileBox", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures)),
}
}; };
optionsUi.Title = "Select background image:";
return optionsUi;
} }
public override IReadOnlyList<Type>? DependentMods => null; public override IReadOnlyList<Type>? DependentMods => null;
public override async Task<string?> Apply() public override async Task<string?> Apply()
{ {
string bgimgPath = ((AbstractTextBox)OptionsUI!.Items[0]).Value; string bgimgPath = ((AbstractTextBox)OptionsUI![0]).Value;
FileInfo bgimgInfo = new(bgimgPath); FileInfo bgimgInfo = new(bgimgPath);
if (!bgimgInfo.Exists) if (!bgimgInfo.Exists)
{ {
+5 -7
View File
@@ -21,10 +21,7 @@ namespace ZuneModCore.Mods
public override AbstractUICollection? GetDefaultOptionsUI() public override AbstractUICollection? GetDefaultOptionsUI()
{ {
return new(nameof(FeaturesOverrideMod)) AbstractUICollection optionsUi = new(nameof(FeaturesOverrideMod))
{
Title = "Select features:",
Items = new List<AbstractUIElement>
{ {
// We don't know what some of these overrides do exactly, so hide them from the user. // We don't know what some of these overrides do exactly, so hide them from the user.
// The ID is the name of the registry key, the label is the display name // The ID is the name of the registry key, the label is the display name
@@ -52,15 +49,16 @@ namespace ZuneModCore.Mods
new AbstractBoolean("SocialMarketplace", "Social Marketplace"), new AbstractBoolean("SocialMarketplace", "Social Marketplace"),
new AbstractBoolean("SubscriptionFreeTracks", "Subscription Free Tracks"), new AbstractBoolean("SubscriptionFreeTracks", "Subscription Free Tracks"),
new AbstractBoolean("Videos", "Videos"), new AbstractBoolean("Videos", "Videos"),
}
}; };
optionsUi.Title = "Select features:";
return optionsUi;
} }
public override IReadOnlyList<Type>? DependentMods => null; public override IReadOnlyList<Type>? DependentMods => null;
public override Task Init() public override Task Init()
{ {
foreach (AbstractUIElement uiElem in OptionsUI.Items) foreach (AbstractUIElement uiElem in OptionsUI!)
{ {
if (uiElem is AbstractBoolean boolElem) if (uiElem is AbstractBoolean boolElem)
{ {
@@ -77,7 +75,7 @@ namespace ZuneModCore.Mods
public async Task<string?> Apply(bool applyAll = false) public async Task<string?> Apply(bool applyAll = false)
{ {
// Use user choices from AbstractUI // Use user choices from AbstractUI
foreach (AbstractUIElement uiElem in OptionsUI!.Items) foreach (AbstractUIElement uiElem in OptionsUI!)
{ {
if (uiElem is AbstractBoolean boolElem && (boolElem.State || applyAll)) if (uiElem is AbstractBoolean boolElem && (boolElem.State || applyAll))
{ {
+5 -7
View File
@@ -31,15 +31,13 @@ namespace ZuneModCore.Mods
public override AbstractUICollection? GetDefaultOptionsUI() public override AbstractUICollection? GetDefaultOptionsUI()
{ {
return new(nameof(MbidLocatorMod)) AbstractUICollection optionsUi = new(nameof(MbidLocatorMod))
{
Title = "Select music folder:",
Items = new List<AbstractUIElement>
{ {
new AbstractTextBox("folderBox", Environment.GetFolderPath(Environment.SpecialFolder.MyMusic)), new AbstractTextBox("folderBox", Environment.GetFolderPath(Environment.SpecialFolder.MyMusic)),
new AbstractBoolean("recursiveBox", "Search recursively") new AbstractBoolean("recursiveBox", "Search recursively")
}
}; };
optionsUi.Title = "Select music folder:";
return optionsUi;
} }
public override IReadOnlyList<Type>? DependentMods => null; public override IReadOnlyList<Type>? DependentMods => null;
@@ -47,8 +45,8 @@ namespace ZuneModCore.Mods
public override async Task<string?> Apply() public override async Task<string?> Apply()
{ {
// Use user choices from AbstractUI // Use user choices from AbstractUI
string folderPath = ((AbstractTextBox)OptionsUI!.Items[0]).Value; string folderPath = ((AbstractTextBox)OptionsUI![0]).Value;
bool recursive = ((AbstractBoolean)OptionsUI.Items[1]).State; bool recursive = ((AbstractBoolean)OptionsUI[1]).State;
string errorString = string.Empty; string errorString = string.Empty;
// Verify that the folder exists // Verify that the folder exists
+7 -10
View File
@@ -1,5 +1,4 @@
using OwlCore; using OwlCore.AbstractUI.Models;
using OwlCore.AbstractUI.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -32,10 +31,7 @@ namespace ZuneModCore.Mods
public override AbstractUICollection? GetDefaultOptionsUI() public override AbstractUICollection? GetDefaultOptionsUI()
{ {
return new(nameof(FeaturesOverrideMod)) AbstractUICollection optionsUi = new(nameof(FeaturesOverrideMod))
{
Title = string.Empty,
Items = new List<AbstractUIElement>
{ {
new AbstractTextBox("hostBox", string.Empty, "zune.net") new AbstractTextBox("hostBox", string.Empty, "zune.net")
{ {
@@ -63,8 +59,9 @@ namespace ZuneModCore.Mods
IsUserEditingEnabled = false, IsUserEditingEnabled = false,
PreferredDisplayMode = AbstractDataListPreferredDisplayMode.Grid, PreferredDisplayMode = AbstractDataListPreferredDisplayMode.Grid,
} }
}
}; };
optionsUi.Title = string.Empty;
return optionsUi;
} }
private static AbstractUIMetadata GetWebserviceAvailabilityUI(string name, string subDomain) private static AbstractUIMetadata GetWebserviceAvailabilityUI(string name, string subDomain)
@@ -80,7 +77,7 @@ namespace ZuneModCore.Mods
public override Task Init() public override Task Init()
{ {
AbstractTextBox newHostBox = (AbstractTextBox)OptionsUI!.Items[0]; AbstractTextBox newHostBox = (AbstractTextBox)OptionsUI![0];
newHostBox.ValueChanged += OnHostChanged; newHostBox.ValueChanged += OnHostChanged;
newHostBox.Value = "zunes.me"; newHostBox.Value = "zunes.me";
@@ -120,7 +117,7 @@ namespace ZuneModCore.Mods
// Get and validate replacement host // Get and validate replacement host
string oldHost = "zune.net"; string oldHost = "zune.net";
string newHost = ((AbstractTextBox)OptionsUI!.Items[0]).Value; string newHost = ((AbstractTextBox)OptionsUI![0]).Value;
if (newHost.Length != oldHost.Length) if (newHost.Length != oldHost.Length)
{ {
return $"The new host (\"{newHost}\") must have the same length as \"{oldHost}\"."; return $"The new host (\"{newHost}\") must have the same length as \"{oldHost}\".";
@@ -225,7 +222,7 @@ namespace ZuneModCore.Mods
async void OnHostChanged(object? sender, string newHost) async void OnHostChanged(object? sender, string newHost)
{ {
AbstractDataList list = (AbstractDataList)OptionsUI!.Items[1]; AbstractDataList list = (AbstractDataList)OptionsUI![1];
// Reset all statuses // Reset all statuses
foreach (AbstractUIMetadata metadata in list.Items) foreach (AbstractUIMetadata metadata in list.Items)
+5 -4
View File
@@ -10,11 +10,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="OwlCore" Version="0.0.43" /> <PackageReference Include="OwlCore" Version="0.4.1" />
<PackageReference Include="OwlCore.AbstractUI" Version="0.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" /> <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="TagLibSharp" Version="2.2.0" /> <PackageReference Include="TagLibSharp" Version="2.3.0" />
<PackageReference Include="Vanara.PInvoke.Kernel32" Version="3.4.6" /> <PackageReference Include="Vanara.PInvoke.Kernel32" Version="3.4.17" />
<PackageReference Include="Vanara.PInvoke.Security" Version="3.4.6" /> <PackageReference Include="Vanara.PInvoke.Security" Version="3.4.17" />
<PackageReference Include="Vestris.ResourceLib" Version="2.1.0" /> <PackageReference Include="Vestris.ResourceLib" Version="2.1.0" />
</ItemGroup> </ItemGroup>
+8 -8
View File
@@ -20,14 +20,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Flurl.Http" Version="3.2.0" /> <PackageReference Include="Flurl.Http" Version="4.0.2" />
<PackageReference Include="MahApps.Metro" Version="2.4.9" /> <PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.4.0" /> <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" /> <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="OwlCore" Version="0.0.43" /> <PackageReference Include="OwlCore" Version="0.4.1" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" /> <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
<PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.2.3" /> <PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>