Fix nuget package not installing natives

tilkinsc · tilkinsc · commit 42c80d7715f7 · 2023-06-30T21:47:58.000-04:00
diff --git a/Lua.NET.csproj b/Lua.NET.csproj
@@ -30,14 +30,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <Content Include="native/win-x64/*.dll" Pack="true" PackagePath="runtimes/net6.0/native/win-x64" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="native/linux-x64/*.dll" Pack="true" PackagePath="runtimes/net6.0/native/linux-x64" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="native/win-x64/*.dll" Pack="true" PackagePath="runtimes/net6.0-windows/native/win-x64" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="native/linux-x64/*.dll" Pack="true" PackagePath="runtimes/net6.0-windows/native/linux-x64" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="native/win-x64/*.dll" Pack="true" PackagePath="runtimes/net7.0/native/win-x64" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="native/linux-x64/*.dll" Pack="true" PackagePath="runtimes/net7.0/native/linux-x64" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="native/win-x64/*.dll" Pack="true" PackagePath="runtimes/net7.0-windows/native/win-x64" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="native/linux-x64/*.dll" Pack="true" PackagePath="runtimes/net7.0-windows/native/linux-x64" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="native/win-x64/*" Pack="true" PackagePath="runtimes/win-x64/native/net7.0" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="native/linux-x64/*" Pack="true" PackagePath="runtimes/linux-x64/native/net7.0" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   
 </Project>
diff --git a/src/LuaJIT.cs b/src/LuaJIT.cs
@@ -14,7 +14,7 @@ public struct lua_State
 
 public static class Lua
 {
-	private const string DllName = "C:/code/Lua.NET.Test/bin/Debug/net7.0/runtimes/net7.0/native/win-x64/lua51.dll";
+	private const string DllName = "lua51";
 	private const CallingConvention Convention = CallingConvention.Cdecl;
 	
 	[StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Ansi)]

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public struct lua_State`
`14`	`14`
`15`	`15`	`public static class Lua`
`16`	`16`	`{`
`17`		`- private const string DllName = "C:/code/Lua.NET.Test/bin/Debug/net7.0/runtimes/net7.0/native/win-x64/lua51.dll";`
	`17`	`+ private const string DllName = "lua51";`
`18`	`18`	`private const CallingConvention Convention = CallingConvention.Cdecl;`
`19`	`19`
`20`	`20`	`[StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Ansi)]`