From 62feeae6aa07aa28eeded046152a3925153af161 Mon Sep 17 00:00:00 2001
From: Vitalii Mikhailov <vitalii.mikhailov@amdaris.com>
Date: Mon, 30 Jan 2023 14:55:39 +0200
Subject: [PATCH] Fix

---
 .../FetchBannerlordVersion.Native.csproj      |  2 +-
 src/FetchBannerlordVersion.Native/Logger.cs   | 20 +++++++++----------
 .../FetchBannerlordVersion.Tool.csproj        |  1 -
 .../FetchBannerlordVersion.csproj             |  2 +-
 ...FetchBannerlordVersion.Native.Tests.csproj |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/FetchBannerlordVersion.Native/FetchBannerlordVersion.Native.csproj b/src/FetchBannerlordVersion.Native/FetchBannerlordVersion.Native.csproj
index adebe71..638899a 100644
--- a/src/FetchBannerlordVersion.Native/FetchBannerlordVersion.Native.csproj
+++ b/src/FetchBannerlordVersion.Native/FetchBannerlordVersion.Native.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BUTR.NativeAOT.Shared.Source" Version="1.0.16" GeneratePathProperty="true" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="BUTR.NativeAOT.Shared.Source" Version="1.0.24" GeneratePathProperty="true" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
 
   <Target Name="CopyHeaders" AfterTargets="AfterBuild">
diff --git a/src/FetchBannerlordVersion.Native/Logger.cs b/src/FetchBannerlordVersion.Native/Logger.cs
index bb81dd2..9211f70 100644
--- a/src/FetchBannerlordVersion.Native/Logger.cs
+++ b/src/FetchBannerlordVersion.Native/Logger.cs
@@ -22,31 +22,31 @@ public static void LogInput(nuint param1, [CallerMemberName] string? caller = nu
         }
         [Conditional("LOGGING")]
         public static unsafe void LogInput<T1>(T1* param1, [CallerMemberName] string? caller = null)
-            where T1 : unmanaged, IParameter<T1>
+            where T1 : unmanaged, IParameterWithSpan<T1>
         {
             Log($"Received call to {caller}! {T1.ToSpan(param1)}");
         }
         [Conditional("LOGGING")]
         public static unsafe void LogInput<T1, T2>(T1* param1, T2* param2, [CallerMemberName] string? caller = null)
-            where T1 : unmanaged, IParameter<T1>
-            where T2 : unmanaged, IParameter<T2>
+            where T1 : unmanaged, IParameterWithSpan<T1>
+            where T2 : unmanaged, IParameterWithSpan<T2>
         {
             Log($"Received call to {caller}! {T1.ToSpan(param1)}; {T2.ToSpan(param2)}");
         }
         [Conditional("LOGGING")]
         public static unsafe void LogInput<T1, T2, T3>(T1* param1, T2* param2, T3* param3, [CallerMemberName] string? caller = null)
-            where T1 : unmanaged, IParameter<T1>
-            where T2 : unmanaged, IParameter<T2>
-            where T3 : unmanaged, IParameter<T3>
+            where T1 : unmanaged, IParameterWithSpan<T1>
+            where T2 : unmanaged, IParameterWithSpan<T2>
+            where T3 : unmanaged, IParameterWithSpan<T3>
         {
             Log($"Received call to {caller}! {T1.ToSpan(param1)}; {T2.ToSpan(param2)}; {T3.ToSpan(param3)}");
         }
         [Conditional("LOGGING")]
         public static unsafe void LogInput<T1, T2, T3, T4>(T1* param1, T2* param2, T3* param3, T4* param4, [CallerMemberName] string? caller = null)
-            where T1 : unmanaged, IParameter<T1>
-            where T2 : unmanaged, IParameter<T2>
-            where T3 : unmanaged, IParameter<T3>
-            where T4 : unmanaged, IParameter<T4>
+            where T1 : unmanaged, IParameterWithSpan<T1>
+            where T2 : unmanaged, IParameterWithSpan<T2>
+            where T3 : unmanaged, IParameterWithSpan<T3>
+            where T4 : unmanaged, IParameterWithSpan<T4>
         {
             Log($"Received call to {caller}! {T1.ToSpan(param1)}; {T2.ToSpan(param2)}; {T3.ToSpan(param3)}; {T4.ToSpan(param4)}");
         }
diff --git a/src/FetchBannerlordVersion.Tool/FetchBannerlordVersion.Tool.csproj b/src/FetchBannerlordVersion.Tool/FetchBannerlordVersion.Tool.csproj
index f787ff2..f41c5e5 100644
--- a/src/FetchBannerlordVersion.Tool/FetchBannerlordVersion.Tool.csproj
+++ b/src/FetchBannerlordVersion.Tool/FetchBannerlordVersion.Tool.csproj
@@ -33,7 +33,6 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="System.Reflection.Metadata" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/FetchBannerlordVersion/FetchBannerlordVersion.csproj b/src/FetchBannerlordVersion/FetchBannerlordVersion.csproj
index 033848e..7ae286e 100644
--- a/src/FetchBannerlordVersion/FetchBannerlordVersion.csproj
+++ b/src/FetchBannerlordVersion/FetchBannerlordVersion.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reflection.Metadata" Version="6.0.1" />
+    <PackageReference Include="System.Reflection.Metadata" Version="7.0.0" />
   </ItemGroup>
 
   <Target Name="SetReflectionFree">
diff --git a/test/FetchBannerlordVersion.Native.Tests/FetchBannerlordVersion.Native.Tests.csproj b/test/FetchBannerlordVersion.Native.Tests/FetchBannerlordVersion.Native.Tests.csproj
index a536e31..83f3deb 100644
--- a/test/FetchBannerlordVersion.Native.Tests/FetchBannerlordVersion.Native.Tests.csproj
+++ b/test/FetchBannerlordVersion.Native.Tests/FetchBannerlordVersion.Native.Tests.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BUTR.NativeAOT.Shared.Source" Version="1.0.18" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="BUTR.NativeAOT.Shared.Source" Version="1.0.25" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />