update dependencies

ZingBallyhoo · ZingBallyhoo · commit ad970cbe8c52 · 2025-11-15T17:11:11.000Z
diff --git a/DataTool/ConvertLogic/TexDecoder.cs b/DataTool/ConvertLogic/TexDecoder.cs
@@ -139,35 +139,35 @@ public TexDecoder(teTexture texture, bool grayscale) {
                 }
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC1_UNORM:
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC1_UNORM_SRGB: {
-                    Bc1.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
+                    Bc1.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
                     break;
                 }
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC2_UNORM:
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC2_UNORM_SRGB: {
-                    Bc2.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
+                    Bc2.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
                     break;
                 }
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC3_UNORM:
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC3_UNORM_SRGB: {
-                    Bc3.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
+                    Bc3.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
                     break;
                 }
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC4_UNORM: {
-                    Bc4.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
+                    Bc4.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
                     break;
                 }
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC5_UNORM: {
-                    Bc5.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
+                    Bc5.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
                     break;
                 }
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_UF16:
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_SF16: {
-                    Bc6h.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, format is TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_SF16, surfaceOutputData);
+                    Bc6h.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, format is TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_SF16, surfaceOutputData);
                     break;
                 }
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC7_UNORM:
                 case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC7_UNORM_SRGB: {
-                    Bc7.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
+                    Bc7.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);
                     break;
                 }
                 default:
diff --git a/DataTool/DataTool.csproj b/DataTool/DataTool.csproj
@@ -32,16 +32,16 @@
         </Content>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="AssetRipper.TextureDecoder" Version="2.3.0" />
-        <PackageReference Include="CsvHelper" Version="33.0.1" />
+        <PackageReference Include="AssetRipper.TextureDecoder" Version="2.4.0" />
+        <PackageReference Include="CsvHelper" Version="33.1.0" />
         <PackageReference Include="DirectXTexNet" Version="1.0.7" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
         <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
-        <PackageReference Include="Spectre.Console" Version="0.50.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+        <PackageReference Include="Spectre.Console" Version="0.54.0" />
         <PackageReference Include="SymSpell" Version="6.7.3" />
-        <PackageReference Include="ValveKeyValue" Version="0.13.1.398" />
+        <PackageReference Include="ValveKeyValue" Version="0.20.0.417" />
     </ItemGroup>
     <Target Name="SetSourceRevisionIdGit" BeforeTargets="BeforeBuild">
         <Exec Command="git describe --long --always --dirty --exclude=* --abbrev=8" ConsoleToMSBuild="True" IgnoreExitCode="False" ContinueOnError="True">
diff --git a/TankLib/TankLib.csproj b/TankLib/TankLib.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>13</LangVersion>
     <Version>1.0.0.0</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -15,7 +15,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DynamicExpresso.Core" Version="2.18.0" />
+    <PackageReference Include="DynamicExpresso.Core" Version="2.19.3" />
     <PackageReference Include="lz4net" Version="1.0.15.93" />
     <PackageReference Include="ZstdNet" Version="1.4.5" />
   </ItemGroup>
diff --git a/TankView/TankView.csproj b/TankView/TankView.csproj
@@ -39,9 +39,9 @@
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
     <PackageReference Include="NVorbis" Version="0.10.5" />
-    <PackageReference Include="VirtualizingWrapPanel" Version="2.1.1" />
-    <PackageReference Include="WindowsAPICodePackCore" Version="8.0.8" />
-    <PackageReference Include="WindowsAPICodePackShell" Version="8.0.8" />
+    <PackageReference Include="VirtualizingWrapPanel" Version="2.3.2" />
+    <PackageReference Include="WindowsAPICodePackCore" Version="8.0.12" />
+    <PackageReference Include="WindowsAPICodePackShell" Version="8.0.12" />
   </ItemGroup>
   <Target Name="SetSourceRevisionIdGit" BeforeTargets="BeforeBuild">
     <Exec Command="git describe --long --always --dirty --exclude=* --abbrev=8" ConsoleToMSBuild="True" IgnoreExitCode="False" ContinueOnError="True">

Original file line number	Diff line number	Diff line change
`@@ -139,35 +139,35 @@ public TexDecoder(teTexture texture, bool grayscale) {`
`139`	`139`	`}`
`140`	`140`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC1_UNORM:`
`141`	`141`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC1_UNORM_SRGB: {`
`142`		`- Bc1.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
	`142`	`+ Bc1.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
`143`	`143`	`break;`
`144`	`144`	`}`
`145`	`145`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC2_UNORM:`
`146`	`146`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC2_UNORM_SRGB: {`
`147`		`- Bc2.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
	`147`	`+ Bc2.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
`148`	`148`	`break;`
`149`	`149`	`}`
`150`	`150`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC3_UNORM:`
`151`	`151`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC3_UNORM_SRGB: {`
`152`		`- Bc3.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
	`152`	`+ Bc3.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
`153`	`153`	`break;`
`154`	`154`	`}`
`155`	`155`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC4_UNORM: {`
`156`		`- Bc4.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
	`156`	`+ Bc4.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
`157`	`157`	`break;`
`158`	`158`	`}`
`159`	`159`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC5_UNORM: {`
`160`		`- Bc5.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
	`160`	`+ Bc5.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
`161`	`161`	`break;`
`162`	`162`	`}`
`163`	`163`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_UF16:`
`164`	`164`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_SF16: {`
`165`		`- Bc6h.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, format is TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_SF16, surfaceOutputData);`
	`165`	`+ Bc6h.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, format is TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC6H_SF16, surfaceOutputData);`
`166`	`166`	`break;`
`167`	`167`	`}`
`168`	`168`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC7_UNORM:`
`169`	`169`	`case TextureTypes.DXGI_PIXEL_FORMAT.DXGI_FORMAT_BC7_UNORM_SRGB: {`
`170`		`- Bc7.Decompress(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
	`170`	`+ Bc7.Decompress<ColorBGRA32, byte>(surfaceInputData, texture.Header.Width, texture.Header.Height, surfaceOutputData);`
`171`	`171`	`break;`
`172`	`172`	`}`
`173`	`173`	`default:`