Skip to content

Commit 770ffc0

Browse files
author
Peet Whittaker
committed
Update NuGet packages
1 parent 3deb504 commit 770ffc0

File tree

15 files changed

+30
-35
lines changed

15 files changed

+30
-35
lines changed

‎NHibernate.Spatial.MsSql/NHibernate.Spatial.MsSql.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
22+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0" />
2323
<PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="2.1.0" />
2424
</ItemGroup>
2525

‎NHibernate.Spatial.MySQL/NHibernate.Spatial.MySQL.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MySql.Data" Version="8.0.22" />
17+
<PackageReference Include="MySql.Data" Version="8.0.30" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎NHibernate.Spatial.PostGis/NHibernate.Spatial.PostGis.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="NetTopologySuite.IO.PostGis" Version="2.0.0" />
31+
<PackageReference Include="NetTopologySuite.IO.PostGis" Version="2.1.0" />
3232
<PackageReference Include="Npgsql" Version="[3.2.7, 4.0)" />
3333
</ItemGroup>
3434

‎NHibernate.Spatial/NHibernate.Spatial.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="NetTopologySuite" Version="[2.1.0, 3.0)" />
17-
<PackageReference Include="NHibernate" Version="[5.3.3, 6.0)" />
16+
<PackageReference Include="NetTopologySuite" Version="2.5.0" />
17+
<PackageReference Include="NHibernate" Version="5.3.12" />
1818
</ItemGroup>
1919

2020
</Project>

‎NetTopologySuite.TestRunner/Functions/BufferFunctions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ public static Geometry BufferOffsetCurveWithParams(Geometry g, Double? distance,
5252
private static Geometry BuildCurveSet(Geometry g, double dist, BufferParameters bufParams)
5353
{
5454
// --- now construct curve
55-
var ocb = new OffsetCurveBuilder(g.Factory.PrecisionModel, bufParams);
56-
var ocsb = new OffsetCurveSetBuilder(g, dist, ocb);
55+
var ocsb = new BufferCurveSetBuilder(g, dist, g.Factory.PrecisionModel, bufParams);
5756
var curves = ocsb.GetCurves();
5857

5958
var lines = new List<Geometry>();

‎NetTopologySuite.TestRunner/NetTopologySuite.TestRunner.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="NetTopologySuite" Version="2.1.0" />
9+
<PackageReference Include="NetTopologySuite" Version="2.5.0" />
1010
</ItemGroup>
1111

1212
</Project>

‎NetTopologySuite.TestRunner/Utility/WKTOrWKBReader.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using NetTopologySuite.Geometries;
1+
using System;
2+
using NetTopologySuite;
3+
using NetTopologySuite.Geometries;
24
using NetTopologySuite.IO;
3-
using System;
45

56
namespace Open.Topology.TestRunner.Utility
67
{
@@ -30,19 +31,13 @@ private static Boolean IsHexDigit(char ch)
3031

3132
private const int MaxCharsToCheck = 6;
3233

33-
//private GeometryFactory _geomFactory;
3434
private readonly WKTReader _wktReader;
3535

3636
private readonly WKBReader _wkbReader;
3737

38-
public WKTOrWKBReader()
39-
: this(new GeometryFactory())
38+
public WKTOrWKBReader(NtsGeometryServices ntsGeometryServices)
4039
{
41-
}
42-
43-
public WKTOrWKBReader(GeometryFactory geomFactory)
44-
{
45-
_wktReader = new WKTReader(geomFactory);
40+
_wktReader = new WKTReader(ntsGeometryServices);
4641
#pragma warning disable 612
4742
_wkbReader = new WKBReader();
4843
#pragma warning restore 612

‎NetTopologySuite.TestRunner/XmlTestFactory.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
using System;
2+
using System.Globalization;
3+
using NetTopologySuite;
14
using NetTopologySuite.Geometries;
25
using Open.Topology.TestRunner.Operations;
36
using Open.Topology.TestRunner.Result;
47
using Open.Topology.TestRunner.Utility;
5-
using System;
6-
using System.Globalization;
78

89
namespace Open.Topology.TestRunner
910
{
@@ -37,10 +38,10 @@ protected enum Target
3738

3839
public XmlTestFactory(PrecisionModel pm, IGeometryOperation geometryOperation, IResultMatcher resultMatcher)
3940
{
40-
ObjGeometryFactory = new GeometryFactory(pm);
41+
var geometryServices = new NtsGeometryServices(pm);
4142
_geometryOperation = geometryOperation;
4243
_resultMatcher = resultMatcher;
43-
_objReader = new WKTOrWKBReader(ObjGeometryFactory);
44+
_objReader = new WKTOrWKBReader(geometryServices);
4445
}
4546

4647
public XmlTest Create(XmlTestInfo testInfo, double tolerance)

‎Tests.NHibernate.Spatial.MsSql2008/Tests.NHibernate.Spatial.MsSql2008.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="nunit" Version="3.12.0" />
12+
<PackageReference Include="nunit" Version="3.13.3" />
1313
<PackageReference Include="NUnit3TestAdapter" Version="[3.15.1, 3.16.0)" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[15.9.2, 16.0)" />
1515
</ItemGroup>

‎Tests.NHibernate.Spatial.MsSql2012/Tests.NHibernate.Spatial.MsSql2012.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="nunit" Version="3.12.0" />
12+
<PackageReference Include="nunit" Version="3.13.3" />
1313
<PackageReference Include="NUnit3TestAdapter" Version="[3.15.1, 3.16.0)" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[15.9.2, 16.0)" />
1515
</ItemGroup>

0 commit comments

Comments
 (0)