Merge pull request #1240 from OpenKH/lib-fix

shananas · web-flow · commit 765df718efa9 · 2025-12-23T12:26:15.000-05:00
Lib fix
diff --git a/IteEditor/OpenKh.Tools.IteViewer.csproj b/IteEditor/OpenKh.Tools.IteViewer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
diff --git a/OpenKh.Command.Bdxio/OpenKh.Command.Bdxio.csproj b/OpenKh.Command.Bdxio/OpenKh.Command.Bdxio.csproj
@@ -10,7 +10,7 @@
     <ItemGroup>
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
         <PackageReference Include="NLog" Version="5.3.2" />
-        <PackageReference Include="YamlDotNet" Version="15.3.0" />
+        <PackageReference Include="YamlDotNet" Version="16.3.0" />
         <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
         <PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
 
diff --git a/OpenKh.Command.ImgTool/OpenKh.Command.ImgTool.csproj b/OpenKh.Command.ImgTool/OpenKh.Command.ImgTool.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.4" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenKh.Command.Layout/OpenKh.Command.Layout.csproj b/OpenKh.Command.Layout/OpenKh.Command.Layout.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenKh.Command.MapGen/OpenKh.Command.MapGen.csproj b/OpenKh.Command.MapGen/OpenKh.Command.MapGen.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="NLog" Version="5.3.2" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="AssimpNet" Version="5.0.0-beta1" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenKh.Command.MapGenUtils/OpenKh.Command.MapGenUtils.csproj b/OpenKh.Command.MapGenUtils/OpenKh.Command.MapGenUtils.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-        <PackageReference Include="YamlDotNet" Version="15.3.0" />
+        <PackageReference Include="YamlDotNet" Version="16.3.0" />
         <PackageReference Include="NJsonSchema" Version="11.0.1" />
     </ItemGroup>
 
diff --git a/OpenKh.Command.TexFooter/OpenKh.Command.TexFooter.csproj b/OpenKh.Command.TexFooter/OpenKh.Command.TexFooter.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.4" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenKh.Command.TexFooter/TypeConverters/UseJsonStyleArray.cs b/OpenKh.Command.TexFooter/TypeConverters/UseJsonStyleArray.cs
@@ -13,12 +13,12 @@ public bool Accepts(Type type)
             return type.HasElementType && type.GetElementType() == typeof(T);
         }
 
-        public object ReadYaml(IParser parser, Type type)
+        public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
         {
             throw new NotImplementedException();
         }
 
-        public void WriteYaml(IEmitter emitter, object value, Type type)
+        public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)
         {
             if (value == null)
             {
diff --git a/OpenKh.Common/OpenKh.Common.csproj b/OpenKh.Common/OpenKh.Common.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenKh.Game/OpenKh.Game.csproj b/OpenKh.Game/OpenKh.Game.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" />
     <PackageReference Include="MonoGame.Framework.DesktopGL.Core" Version="3.7.0.7" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
 	<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
   </ItemGroup>
 
diff --git a/OpenKh.Kh1/OpenKh.Kh1.csproj b/OpenKh.Kh1/OpenKh.Kh1.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -22,10 +22,10 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
+  <!--<ItemGroup>
       <Reference Include="PresentationCore" />
       <Reference Include="PresentationFramework" />
       <Reference Include="WindowsBase" />
-  </ItemGroup>
+  </ItemGroup>-->
 
 </Project>
diff --git a/OpenKh.Patcher/OpenKh.Patcher.csproj b/OpenKh.Patcher/OpenKh.Patcher.csproj
@@ -5,7 +5,7 @@
   <AssemblyVersion>25.02.10.0</AssemblyVersion><FileVersion>25.02.10.0</FileVersion><Version>25.02.10.0-local</Version><InformationalVersion>25.02.10.0-local</InformationalVersion><Authors>OpenKH contributors</Authors><Company>OpenKH</Company><Copyright>Copyright (C) OpenKH </Copyright><Description>https://github.com/OpenKH/OpenKh</Description></PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenKh.Tools.BarEditor/OpenKh.Tools.BarEditor.csproj b/OpenKh.Tools.BarEditor/OpenKh.Tools.BarEditor.csproj
@@ -17,8 +17,8 @@
     <ProjectReference Include="..\XeEngine.Tools.Public\Xe.Tools\Xe.Tools.csproj" />
   </ItemGroup>
   
-  <ItemGroup>
+  <!--<ItemGroup>
     <Reference Include="System.ComponentModel.DataAnnotations" />
-  </ItemGroup>
+  </ItemGroup>-->
   
 </Project>
diff --git a/OpenKh.Tools.BepEditor/OpenKh.Tools.BepEditor.csproj b/OpenKh.Tools.BepEditor/OpenKh.Tools.BepEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
diff --git a/OpenKh.Tools.EpdEditor/OpenKh.Tools.EpdEditor.csproj b/OpenKh.Tools.EpdEditor/OpenKh.Tools.EpdEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
diff --git a/OpenKh.Tools.ItbEditor/OpenKh.Tools.ItbEditor.csproj b/OpenKh.Tools.ItbEditor/OpenKh.Tools.ItbEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
diff --git a/OpenKh.Tools.ItcEditor/OpenKh.Tools.ItcEditor.csproj b/OpenKh.Tools.ItcEditor/OpenKh.Tools.ItcEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
diff --git a/OpenKh.Tools.Kh2MsetMotionEditor/OpenKh.Tools.Kh2MsetMotionEditor.csproj b/OpenKh.Tools.Kh2MsetMotionEditor/OpenKh.Tools.Kh2MsetMotionEditor.csproj
@@ -29,7 +29,7 @@
         <PackageReference Include="MonoGame.Framework.DesktopGL.Core" Version="3.7.0.7" />
         <PackageReference Include="AssimpNet" Version="5.0.0-beta1" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
         <PackageReference Include="NPOI" Version="2.7.0" />
     </ItemGroup>
 
diff --git a/OpenKh.Tools.Kh2SystemEditor/OpenKh.Tools.Kh2SystemEditor.csproj b/OpenKh.Tools.Kh2SystemEditor/OpenKh.Tools.Kh2SystemEditor.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
     <PackageReference Include="NPOI" Version="2.7.0" />
   </ItemGroup>
 
diff --git a/OpenKh.Tools.Kh2TextEditor/OpenKh.Tools.Kh2TextEditor.csproj b/OpenKh.Tools.Kh2TextEditor/OpenKh.Tools.Kh2TextEditor.csproj
@@ -20,7 +20,7 @@
     
   <ItemGroup>
     <PackageReference Include="ColorPickerWPF" Version="1.0.9" />
-    <PackageReference Include="YamlDotNet" Version="15.3.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
       
 </Project>
diff --git a/OpenKh.Tools.MissionEditor/OpenKh.Tools.MissionEditor.csproj b/OpenKh.Tools.MissionEditor/OpenKh.Tools.MissionEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
diff --git a/OpenKh.Tools.ModsManager/OpenKh.Tools.ModsManager.csproj b/OpenKh.Tools.ModsManager/OpenKh.Tools.ModsManager.csproj
@@ -10,11 +10,11 @@
 
   <ItemGroup>
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" />
-    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
+    <PackageReference Include="LibGit2Sharp" Version="0.31.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
     <PackageReference Include="System.Reactive" Version="6.1.0" />
-    <PackageReference Include="Octokit" Version="13.0.1" />
+    <PackageReference Include="Octokit" Version="14.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenKh.Tools.OloEditor/OpenKh.Tools.OloEditor.csproj b/OpenKh.Tools.OloEditor/OpenKh.Tools.OloEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
diff --git a/OpenKh.Tools.PAtkEditor/OpenKh.Tools.PAtkEditor.csproj b/OpenKh.Tools.PAtkEditor/OpenKh.Tools.PAtkEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<OutputType>WinExe</OutputType>`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ public bool Accepts(Type type)`
`13`	`13`	`return type.HasElementType && type.GetElementType() == typeof(T);`
`14`	`14`	`}`
`15`	`15`
`16`		`- public object ReadYaml(IParser parser, Type type)`
	`16`	`+ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)`
`17`	`17`	`{`
`18`	`18`	`throw new NotImplementedException();`
`19`	`19`	`}`
`20`	`20`
`21`		`- public void WriteYaml(IEmitter emitter, object value, Type type)`
	`21`	`+ public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)`
`22`	`22`	`{`
`23`	`23`	`if (value == null)`
`24`	`24`	`{`