Skip to content

Commit b64d4d6

Browse files
authored
Merge pull request #2 from hrmorley34/main
f98f514
2 parents 788e215 + f98f514 commit b64d4d6

13 files changed

+22
-50
lines changed

MapLoader.NUnitTests/MapLoader.NUnitTests.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20+
<PackageReference Include="coverlet.collector" Version="3.1.2">
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
<PrivateAssets>all</PrivateAssets>
23+
</PackageReference>
2024
<PackageReference Include="FastMember" Version="1.5.0" />
2125
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
2226
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.3" />

Maploader/LevelDB.dll

-524 KB
Binary file not shown.

Maploader/Maploader.csproj

-32
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@
1010
<DebugSymbols>true</DebugSymbols>
1111
</PropertyGroup>
1212

13-
<ItemGroup>
14-
<None Remove="LevelDB.dll" />
15-
<None Remove="zlibwapi.dll" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<Content Include="LevelDB.dll">
20-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
21-
</Content>
22-
<Content Include="zlibwapi.dll">
23-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24-
</Content>
25-
</ItemGroup>
26-
2713
<ItemGroup>
2814
<PackageReference Include="CoreFNBT" Version="1.0.9" />
2915
<PackageReference Include="Crc32.NET" Version="1.2.0" />
@@ -44,12 +30,6 @@
4430
</ItemGroup>
4531

4632
<ItemGroup>
47-
<None Update="libleveldb.so">
48-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
49-
</None>
50-
<None Update="libleveldb.so.1.20">
51-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
52-
</None>
5333
<None Update="libwebp.dll">
5434
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5535
</None>
@@ -62,18 +42,6 @@
6242
<None Update="LookupTable\runtimeid_table.json">
6343
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6444
</None>
65-
<None Update="x64\libwebp.dll">
66-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
67-
</None>
68-
<None Update="x64\libwebp.so">
69-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
70-
</None>
71-
<None Update="x64\libwebp.so.6">
72-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
73-
</None>
74-
<None Update="x86\libwebp.dll">
75-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
76-
</None>
7745
</ItemGroup>
7846

7947
</Project>

Maploader/x64/libwebp.dll

-447 KB
Binary file not shown.

Maploader/x64/libwebp.so

-410 KB
Binary file not shown.

Maploader/x64/libwebp.so.6

-410 KB
Binary file not shown.

Maploader/x86/libwebp.dll

-370 KB
Binary file not shown.

Maploader/zlibwapi.dll

-110 KB
Binary file not shown.

PapyrusCs.Tests.Core/PapyrusCs.Tests.Core.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="coverlet.collector" Version="3.1.2">
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
<PrivateAssets>all</PrivateAssets>
13+
</PackageReference>
1014
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.3" />
1115
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
1216
<PackageReference Include="nunit" Version="3.12.0" />
+13-17
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<RootNamespace>leveldb_sharp_std</RootNamespace>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<None Remove="LevelDB.dll" />
11+
<None Remove="libleveldb.so" />
12+
<None Remove="libleveldb.so.1.20" />
13+
<None Remove="leveldb-sharp-std.dll.config" />
1114
<None Remove="license.md" />
1215
<None Remove="zlibwapi.dll" />
1316
</ItemGroup>
@@ -20,25 +23,18 @@
2023
<Content Include="LevelDB.dll">
2124
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2225
</Content>
23-
<Content Include="zlibwapi.dll">
26+
<Content Include="libleveldb.so">
2427
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2528
</Content>
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<PackageReference Include="System.Buffers" Version="4.5.1" />
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<Reference Include="System.Buffers">
34-
<HintPath>..\..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.2.0\ref\netcoreapp2.2\System.Buffers.dll</HintPath>
35-
</Reference>
36-
</ItemGroup>
37-
38-
<ItemGroup>
39-
<None Update="leveldb-sharp-std.dll.config">
29+
<Content Include="libleveldb.so.1.20">
30+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
</Content>
32+
<Content Include="leveldb-sharp-std.dll.config">
4033
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
41-
</None>
34+
</Content>
35+
<Content Include="zlibwapi.dll">
36+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
37+
</Content>
4238
</ItemGroup>
4339

4440
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
3-
<dllmap dll="leveldb" target="libleveldb.so.1" />
3+
<dllmap dll="leveldb" target="libleveldb.so" />
44
</configuration>
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)