Update dependencies

Closes #320
Closes #322
This commit is contained in:
Kurt
2023-02-27 20:25:52 -08:00
parent e34701b893
commit be54eaac8e
8 changed files with 125 additions and 9 deletions

View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FlatSharp" Version="6.3.3" />
<PackageReference Include="FlatSharp" Version="6.3.5" />
</ItemGroup>
<ItemGroup>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

View File

@@ -1,5 +1,6 @@
using System;
using System.Windows.Forms;
using PKHeX.Core;
using pkNX.Structures;
using PKHeX.Drawing.PokeSprite;
@@ -31,8 +32,8 @@ public MegaEvoEntry()
private void ChangeSpecies(int form)
{
PB_Base.Image = SpriteUtil.GetSprite((ushort)Species, 0, 0, 0, 0, false, PKHeX.Core.Shiny.Never, 7);
PB_Preview.Image = SpriteUtil.GetSprite((ushort)Species, (byte)form, 0, 0, 0, false, PKHeX.Core.Shiny.Never, 7);
PB_Base.Image = SpriteUtil.GetSprite((ushort)Species, 0, 0, 0, 0, false, PKHeX.Core.Shiny.Never, EntityContext.Gen7);
PB_Preview.Image = SpriteUtil.GetSprite((ushort)Species, (byte)form, 0, 0, 0, false, PKHeX.Core.Shiny.Never, EntityContext.Gen7);
PB_Preview.Visible = PB_Base.Visible = L_Into.Visible = CB_Method.SelectedIndex > 0;
}

View File

@@ -538,7 +538,7 @@ private static void DumpPretty(IFileInternal ROM, DeliveryRaidEnemyTableArray ta
private static string GetItemName(ushort item, ReadOnlySpan<string> items, ReadOnlySpan<string> moves)
{
bool isTM = IsTM(item);
var tm = PKHeX.Core.LearnSource9SV.TM_SV.ToArray();
var tm = PersonalDumperSV.TMIndexes;
if (isTM) // append move name to TM
return GetNameTM(item, items, moves, tm);
@@ -559,6 +559,6 @@ private static string GetItemName(ushort item, ReadOnlySpan<string> items, ReadO
>= 328 and <= 419 => $"{items[item]} {moves[tm[001 + item - 328]]}", // TM001 to TM092, skip TM000 Mega Punch
618 or 619 or 620 => $"{items[item]} {moves[tm[093 + item - 618]]}", // TM093 to TM095
690 or 691 or 692 or 693 => $"{items[item]} {moves[tm[096 + item - 690]]}", // TM096 to TM099
_ => $"{items[item]} {moves[tm[100 + item - 2160]]}" // TM100 to TM171
_ => $"{items[item]} {moves[tm[100 + item - 2160]]}", // TM100 to TM171
};
}

View File

@@ -0,0 +1,115 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v7.0",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v7.0": {
"PKHeX.Drawing.PokeSprite/23.02.27": {
"dependencies": {
"PKHeX.Core": "23.2.27",
"PKHeX.Drawing": "23.2.27",
"System.Resources.Extensions": "7.0.0"
},
"runtime": {
"PKHeX.Drawing.PokeSprite.dll": {}
}
},
"Microsoft.Win32.SystemEvents/7.0.0": {
"runtime": {
"lib/net7.0/Microsoft.Win32.SystemEvents.dll": {
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
},
"runtimeTargets": {
"runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.dll": {
"rid": "win",
"assetType": "runtime",
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
}
},
"System.Drawing.Common/7.0.0": {
"dependencies": {
"Microsoft.Win32.SystemEvents": "7.0.0"
},
"runtime": {
"lib/net7.0/System.Drawing.Common.dll": {
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
},
"runtimeTargets": {
"runtimes/win/lib/net7.0/System.Drawing.Common.dll": {
"rid": "win",
"assetType": "runtime",
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
}
},
"System.Resources.Extensions/7.0.0": {
"runtime": {
"lib/net7.0/System.Resources.Extensions.dll": {
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
}
},
"PKHeX.Core/23.2.27": {
"runtime": {
"PKHeX.Core.dll": {}
}
},
"PKHeX.Drawing/23.2.27": {
"dependencies": {
"System.Drawing.Common": "7.0.0"
},
"runtime": {
"PKHeX.Drawing.dll": {}
}
}
}
},
"libraries": {
"PKHeX.Drawing.PokeSprite/23.02.27": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.Win32.SystemEvents/7.0.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ==",
"path": "microsoft.win32.systemevents/7.0.0",
"hashPath": "microsoft.win32.systemevents.7.0.0.nupkg.sha512"
},
"System.Drawing.Common/7.0.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
"path": "system.drawing.common/7.0.0",
"hashPath": "system.drawing.common.7.0.0.nupkg.sha512"
},
"System.Resources.Extensions/7.0.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-65ufm9ABXvxRkQ//hMcUDrQXbGWkC7z0WWZAvHlQ6Qv+JmrIwHH1lmX8aXlNlXpIrT9KxDpuZPqJTVqqwzMD8Q==",
"path": "system.resources.extensions/7.0.0",
"hashPath": "system.resources.extensions.7.0.0.nupkg.sha512"
},
"PKHeX.Core/23.2.27": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"PKHeX.Drawing/23.2.27": {
"type": "project",
"serviceable": false,
"sha512": ""
}
}
}

Binary file not shown.

View File

@@ -23,7 +23,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="PKHeX.Core" Version="22.12.19" />
<PackageReference Include="PKHeX.Core" Version="23.2.27" />
</ItemGroup>
<ItemGroup>