Update packages and refactor HtmlExtensions methods

Updated NUnit3TestAdapter to 5.0.0 in multiple test projects.
Updated AssetRipper.Text.SourceGeneration to 1.2.2 in several projects.
Updated AssetRipper.Text.Html to 2.1.0 in AssetRipper.GUI.Web.csproj.
Updated Moq to 4.20.72 in AssetRipper.Tests.csproj.
Removed MaybeWithChecked, MaybeWithDisabled, MaybeSelected methods from HtmlExtensions.cs.
Replaced MaybeSelected with MaybeWithSelected in SettingsPage.cs.
This commit is contained in:
ds5678 2025-02-09 13:31:48 -08:00
parent 7ba1ea7417
commit 86118b6adf
14 changed files with 14 additions and 29 deletions

View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -18,7 +18,7 @@
<ItemGroup>
<!-- Generator dependencies -->
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.0" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.2" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="System.Text.Json" Version="9.0.1" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

View File

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.0" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.2" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\AssetRipper.GUI.Localizations.SourceGenerator\AssetRipper.GUI.Localizations.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>

View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.0" />
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -27,7 +27,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AssetRipper.Text.Html" Version="2.0.0" />
<PackageReference Include="AssetRipper.Text.Html" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.1" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
<PackageReference Include="NativeFileDialogs.Net" Version="1.2.1" />

View File

@ -9,21 +9,6 @@ internal static class HtmlExtensions
return element.WithTarget("_blank").WithRel("noopener noreferrer");
}
public static Input MaybeWithChecked(this Input element, bool @checked)
{
return @checked ? element.WithChecked() : element;
}
public static Input MaybeWithDisabled(this Input element, bool disabled)
{
return disabled ? element.WithDisabled() : element;
}
public static Option MaybeSelected(this Option element, bool selected)
{
return selected ? element.WithSelected() : element;
}
public static Div WithTextCenter(this Div element)
{
return element.WithClass("text-center");

View File

@ -256,7 +256,7 @@ public sealed partial class SettingsPage : DefaultPage
DropDownItem<T> item = items[i];
new Option(writer)
.WithValue(item.Value.ToString().ToHtml())
.MaybeSelected(EqualityComparer<T>.Default.Equals(item.Value, value))
.MaybeWithSelected(EqualityComparer<T>.Default.Equals(item.Value, value))
.WithCustomAttribute("option-description", CreateUniqueID(id, i))
.Close(item.DisplayName);
}

View File

@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="AssetRipper.IO.Endian" Version="1.1.0" />
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.0" />
<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.2.2" />
</ItemGroup>
</Project>

View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -9,9 +9,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>