Skip to content

Commit 365908a

Browse files
committed
Add netStandard2.1 target framework
Cleanup, update dependencies
1 parent 01bc38c commit 365908a

File tree

5 files changed

+11
-21
lines changed

5 files changed

+11
-21
lines changed

ProjNet4GeoAPI.sln

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29020.237
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.14.36408.4 d17.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNET", "src\ProjNet\ProjNET.csproj", "{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AC62B826-FD1B-43B9-9E20-696588E560E7}"
99
ProjectSection(SolutionItems) = preProject
1010
.editorconfig = .editorconfig
11+
src\Directory.Build.props = src\Directory.Build.props
1112
icon.png = icon.png
1213
EndProjectSection
1314
EndProject

src/Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,4 @@
102102
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
103103
</PropertyGroup>
104104

105-
<ItemGroup>
106-
<!-- SourceLink adds stuff to let debuggers step into our code. -->
107-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
108-
</ItemGroup>
109-
110105
</Project>

src/ProjNet.Benchmark/ProjNet.Benchmark.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<NoWarn>1701;1702;1591</NoWarn>
88

99
<IsPackable>false</IsPackable>

src/ProjNet/ProjNET.csproj

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33

44
<PropertyGroup>
55
<RootNamespace>ProjNet</RootNamespace>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
77
<SignAssembly>true</SignAssembly>
8-
<EnableApiCompat>true</EnableApiCompat>
8+
<EnablePackageValidation>true</EnablePackageValidation>
9+
<PackageValidationBaselineVersion>2.0.0</PackageValidationBaselineVersion>
910
</PropertyGroup>
1011

1112
<PropertyGroup Label="Assembly Info">
@@ -24,16 +25,9 @@ Proj.NET performs point-to-point coordinate conversions between geodetic coordin
2425
<PackageTags>OGC;SFS;Projection</PackageTags>
2526
</PropertyGroup>
2627

27-
<ItemGroup>
28-
<PackageReference Include="System.Memory" Version="4.5.3" />
29-
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
28+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
29+
<PackageReference Include="System.Memory" Version="4.6.0" />
30+
<!--<PackageReference Include="System.Numerics.Vectors" Version="4.6.0" />-->
3031
</ItemGroup>
3132

32-
<ItemGroup Condition=" '$(EnableApiCompat)' == 'true' ">
33-
<PackageReference Include="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21159.11" PrivateAssets="All" />
34-
<PackageDownload Include="ProjNet" Version="[2.0.0]" PrivateAssets="All" />
35-
36-
<ResolvedMatchingContract Include="$(NugetPackageRoot)projnet\2.0.0\lib\netstandard2.0\ProjNET.dll" />
37-
</ItemGroup>
38-
3933
</Project>

test/ProjNet.Tests/ProjNET.Tests.csproj

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

1010
<ItemGroup>
11-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
11+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1212
<PackageReference Include="Npgsql" Version="8.0.3" />
1313
</ItemGroup>
1414

0 commit comments

Comments
 (0)