Skip to content

Commit 5941220

Browse files
committed
Merge branch 'version'
2 parents 7a24ae3 + 42c80d7 commit 5941220

File tree

4 files changed

+5
-83
lines changed

4 files changed

+5
-83
lines changed

Lua.NET.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net7.0-windows;net6.0;net6.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<Nullable>enable</Nullable>
88
<PackageId>Lua.NET</PackageId>
9-
<Version>4.0.0</Version>
9+
<Version>4.0.1</Version>
1010
<Authors>Cody Tilkins</Authors>
1111
<Copyright>Copyright © Cody Tilkins 2023</Copyright>
1212
<Title>Lua.NET</Title>
@@ -30,8 +30,8 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<Content Include="native/win-x64/*.dll" Pack="true" PackagePath="native\win-x64" CopyToOutputDirectory="PreserveNewest" />
34-
<Content Include="native/linux-x64/*.dll" Pack="true" PackagePath="native\linux-x64" CopyToOutputDirectory="PreserveNewest" />
33+
<Content Include="native/win-x64/*" Pack="true" PackagePath="runtimes/win-x64/native/net7.0" CopyToOutputDirectory="PreserveNewest" />
34+
<Content Include="native/linux-x64/*" Pack="true" PackagePath="runtimes/linux-x64/native/net7.0" CopyToOutputDirectory="PreserveNewest" />
3535
</ItemGroup>
3636

3737
</Project>

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ C# .NET Core 7.0
55
Lua.NET contains full bindings to Lua5.1.5, Lua5.2.4, Lua5.3.6, Lua.5.4.6 and LuaJIT
66

77
https://github.com/tilkinsc/Lua.NET
8-
Copyright © Cody Tilkins 2022 MIT License
8+
Copyright © Cody Tilkins 2023 MIT License
99

1010
Supports Lua5.4 Lua5.3 Lua5.2 Lua5.1 and LuaJIT
1111

src/Common.cs

-73
This file was deleted.

src/LuaJIT.cs

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ public static class Lua
1717
private const string DllName = "lua51";
1818
private const CallingConvention Convention = CallingConvention.Cdecl;
1919

20-
static Lua()
21-
{
22-
NativeLibrary.SetDllImportResolver(typeof(Lua).Assembly, Imports.ImportResolver);
23-
}
24-
2520
[StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Ansi)]
2621
public struct lua_Debug {
2722
public int _event;

0 commit comments

Comments
 (0)