Updated Nuget dependencies.

MeltyPlayer · Oct 11, 2023 · c8d1242 · c8d1242
1 parent 3339782
commit c8d1242
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 38 deletions.
diff --git a/FinModelUtility/Benchmarks/Benchmarks.csproj b/FinModelUtility/Benchmarks/Benchmarks.csproj
@@ -14,10 +14,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
     <PackageReference Include="FastBitmapLib" Version="2.1.0" />
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/FinModelUtility/Fin/Fin Tests/Fin Tests.csproj b/FinModelUtility/Fin/Fin Tests/Fin Tests.csproj
@@ -16,7 +16,7 @@
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Fin.Ui\Fin.Ui.csproj" />

diff --git a/FinModelUtility/Fin/Fin/Fin.csproj b/FinModelUtility/Fin/Fin/Fin.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.6.0">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -39,9 +39,9 @@
     <PackageReference Include="NVorbis" Version="0.10.5" />
     <PackageReference Include="OpenAL.Soft" Version="1.19.1" />
     <PackageReference Include="OpenTK" Version="3.3.3" />
-    <PackageReference Include="Pfim" Version="0.10.3" />
+    <PackageReference Include="Pfim" Version="0.11.2" />
     <PackageReference Include="SharpGLTF.Toolkit" Version="1.0.0-alpha0027" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
     <PackageReference Include="SubstreamSharp" Version="1.0.3" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="19.2.51" />

diff --git a/FinModelUtility/Fin/Fin/src/image/DdsReader.cs b/FinModelUtility/Fin/Fin/src/image/DdsReader.cs
@@ -12,7 +12,7 @@
 namespace fin.image {
   public class DdsReader {
     public unsafe IMipMap<IImage> Read(Stream stream) {
-      using var pfimImage = Pfim.Pfim.FromStream(stream);
+      using var pfimImage = Pfimage.FromStream(stream);
 
       return MipMapUtil.From(
           pfimImage.MipMaps.Select(pfimMipMap => {

diff --git a/FinModelUtility/Formats/Ast/Ast Tests/Ast Tests.csproj b/FinModelUtility/Formats/Ast/Ast Tests/Ast Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/Formats/Cmb/Cmb Tests/Cmb Tests.csproj b/FinModelUtility/Formats/Cmb/Cmb Tests/Cmb Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/Formats/Glo/Glo Tests/Glo Tests.csproj b/FinModelUtility/Formats/Glo/Glo Tests/Glo Tests.csproj
@@ -20,7 +20,7 @@
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/J3d/J3d Tests/J3d Tests.csproj b/FinModelUtility/Formats/J3d/J3d Tests/J3d Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/Formats/Level5/Level5 Tests/Level5 Tests.csproj b/FinModelUtility/Formats/Level5/Level5 Tests/Level5 Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/Formats/Mod/Mod Tests/Mod Tests.csproj b/FinModelUtility/Formats/Mod/Mod Tests/Mod Tests.csproj
@@ -19,7 +19,7 @@
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Modl/Modl Tests/Modl Tests.csproj b/FinModelUtility/Formats/Modl/Modl Tests/Modl Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/Formats/Visceral/Visceral Tests/Visceral Tests.csproj b/FinModelUtility/Formats/Visceral/Visceral Tests/Visceral Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/Games/HaloWars Tests/HaloWars Tests.csproj b/FinModelUtility/Games/HaloWars Tests/HaloWars Tests.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/src/schema/omd/Omd.cs b/FinModelUtility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/src/schema/omd/Omd.cs
@@ -10,11 +10,9 @@ public void Read(ITextReader tr) {
       var something = tr.ReadInt32();
 
       var materialCount = tr.ReadInt32();
-      tr.ReadLine();
       this.Materials = tr.ReadNewArray<OmdMaterial>(materialCount);
 
       var meshCount = tr.ReadInt32();
-      tr.ReadLine();
       this.Meshes = tr.ReadNewArray<OmdMesh>(meshCount);
     }
   }

diff --git a/FinModelUtility/Games/SuperMario64/SuperMario64 Tests/SuperMario64 Tests.csproj b/FinModelUtility/Games/SuperMario64/SuperMario64 Tests/SuperMario64 Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj b/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IronPython" Version="3.4.0" />
+    <PackageReference Include="IronPython" Version="3.4.1" />
     <PackageReference Include="schema" Version="0.3.0" />
   </ItemGroup>
 

diff --git a/FinModelUtility/SceneGate/Ekona/src/Directory.Packages.props b/FinModelUtility/SceneGate/Ekona/src/Directory.Packages.props
@@ -16,6 +16,6 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.7.0.75501" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.4.0" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/SceneGate/Lemon/src/Directory.Packages.props b/FinModelUtility/SceneGate/Lemon/src/Directory.Packages.props
@@ -11,6 +11,6 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.7.0.75501" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.4.0" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/SceneGate/Texim/src/Directory.Packages.props b/FinModelUtility/SceneGate/Texim/src/Directory.Packages.props
@@ -3,13 +3,13 @@
   <ItemGroup>
     <PackageVersion Include="Yarhl" Version="4.0.0-preview.153" />
     <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.0.1" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.0.2" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
     <PackageVersion Include="YamlDotNet" Version="11.2.1" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.7.0.75501" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.4.0" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/SceneGate/Yarhl/src/Directory.Packages.props b/FinModelUtility/SceneGate/Yarhl/src/Directory.Packages.props
@@ -17,6 +17,6 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.7.0.75501" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.4.0" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/UniversalAssetTool Tests.csproj b/FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/UniversalAssetTool Tests.csproj
@@ -13,11 +13,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="19.2.64" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="19.2.69" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj
@@ -46,7 +46,7 @@
   <ItemGroup>
     <PackageReference Include="Crc32.NET" Version="1.2.0" />
     <PackageReference Include="Gameloop.Vdf" Version="0.6.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.6.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="7.1.3" />
     <PackageReference Include="NullFX.CRC" Version="1.1.5" />