Skip to content

Commit 42dce7b

Browse files
aaronaxvigaaronaxvig
committed
Update Nuget packages and make compatability fixes
1 parent 76c37a0 commit 42dce7b

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎Imazen.WebP-std/Imazen.WebP-std.csproj

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

99
<ItemGroup>
10-
<PackageReference Include="System.Drawing.Common" Version="4.6.0-preview5.19224.8" />
10+
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎MapLoader.NUnitTests/MapLoader.NUnitTests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="FastMember" Version="1.5.0" />
21-
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.0.20171219.105559" />
22-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview6.19304.6" />
21+
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
22+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.3" />
2323
<PackageReference Include="nunit" Version="3.12.0" />
24-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
24+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1"/>
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

‎Maploader/Maploader.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<PackageReference Include="CoreFNBT" Version="1.0.9" />
2929
<PackageReference Include="Crc32.NET" Version="1.2.0" />
3030
<PackageReference Include="FastMember" Version="1.5.0" />
31-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview5.19227.9" />
32-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
33-
<PackageReference Include="Pfim" Version="0.8.0" />
34-
<PackageReference Include="SkiaSharp" Version="1.68.1-rc.147" />
35-
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1-rc.147" />
36-
<PackageReference Include="System.Drawing.Common" Version="4.6.0-preview5.19224.8" />
31+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.3" />
32+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
33+
<PackageReference Include="Pfim" Version="0.9.1" />
34+
<PackageReference Include="SkiaSharp" Version="1.68.1.1" />
35+
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1.1" />
36+
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
3737
<PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
3838
</ItemGroup>
3939

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-preview5.19227.1" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview5.19227.1" />
12-
<PackageReference Include="nunit" Version="3.11.0" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.3" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
12+
<PackageReference Include="nunit" Version="3.12.0" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1"/>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎PapyrusCs/Database/DbContextExtensions.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,7 @@ public static (DbParameter[], int, int) GetInsertParametersAndBatchSize(DbContex
237237
/// <returns>name of the table in the database</returns>
238238
public static string GetTableName(DbContext dbContext, Type t)
239239
{
240-
var mapping = dbContext.Model.FindEntityType(t).Relational();
241-
var schema = mapping.Schema;
242-
return mapping.TableName;
240+
return dbContext.Model.FindEntityType(t).GetTableName();
243241
}
244242

245243
public struct PropertyDbName
@@ -263,11 +261,11 @@ public static (IEnumerable<PropertyDbName>, IEnumerable<PropertyDbName>) GetColu
263261
{
264262
if (c.IsKey())
265263
{
266-
keyRet.Add(new PropertyDbName(c.Name, c.Relational().ColumnName));
264+
keyRet.Add(new PropertyDbName(c.Name, c.GetColumnName()));
267265
}
268266
else
269267
{
270-
propRet.Add(new PropertyDbName(c.Name, c.Relational().ColumnName));
268+
propRet.Add(new PropertyDbName(c.Name, c.GetColumnName()));
271269
}
272270

273271
}

‎PapyrusCs/PapyrusCs.csproj

+11-9
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,27 @@
88
</PropertyGroup>
99

1010
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
11-
<PlatformTarget>x64</PlatformTarget>
11+
<PlatformTarget>AnyCPU</PlatformTarget>
1212
<DebugType>full</DebugType>
1313
<DebugSymbols>true</DebugSymbols>
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="CommandLineParser" Version="2.5.0" />
17+
<PackageReference Include="CommandLineParser" Version="2.7.82" />
1818
<PackageReference Include="Crc32.NET" Version="1.2.0" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview5.19227.1" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="3.0.0-preview5.19227.1" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview5.19227.1">
19+
<PackageReference Include="DeepCloner" Version="0.10.2" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.3" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="3.1.3" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.3">
2224
<PrivateAssets>all</PrivateAssets>
2325
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2426
</PackageReference>
25-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview5.19227.9" />
26-
<PackageReference Include="morelinq" Version="3.1.1" />
27+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.3" />
28+
<PackageReference Include="morelinq" Version="3.3.2" />
2729
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" />
28-
<PackageReference Include="System.Drawing.Common" Version="4.6.0-preview5.19224.8" />
29-
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0-preview5.19224.8" />
30+
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
31+
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.0" />
3032
</ItemGroup>
3133

3234
<ItemGroup>

‎leveldb-sharp-std/leveldb-sharp-std.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="System.Buffers" Version="4.5.0" />
29+
<PackageReference Include="System.Buffers" Version="4.5.1" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

0 commit comments

Comments
 (0)