Skip to content

Commit f6d10e3

Browse files
airbreatherairbreather
committed
Update to how I've been doing this elsewhere
And update versions.
1 parent 27ba6e6 commit f6d10e3

File tree

7 files changed

+44
-45
lines changed

7 files changed

+44
-45
lines changed

‎Directory.Build.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<PropertyGroup>
5+
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)</SolutionDir>
6+
7+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)scskey.snk</AssemblyOriginatorKeyFile>
8+
</PropertyGroup>
9+
10+
</Project>

‎ProjNet4GeoAPI.sln‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29020.237
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNET", "ProjNet\ProjNET.csproj", "{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}"
6+
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
1111
icon.png = icon.png
12-
ProjNet.Common.props = ProjNet.Common.props
1312
EndProjectSection
1413
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNET.Tests", "ProjNet.Tests\ProjNET.Tests.csproj", "{67E8C952-1F48-4DFB-9507-BD44DB6784FD}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNET.Tests", "test\ProjNet.Tests\ProjNET.Tests.csproj", "{67E8C952-1F48-4DFB-9507-BD44DB6784FD}"
1615
EndProject
17-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNet.Benchmark", "ProjNet.Benchmark\ProjNet.Benchmark.csproj", "{1E5D1CC5-8CFE-4C9D-9553-900469C57D6C}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNet.Benchmark", "src\ProjNet.Benchmark\ProjNet.Benchmark.csproj", "{1E5D1CC5-8CFE-4C9D-9553-900469C57D6C}"
1817
EndProject
1918
Global
2019
GlobalSection(SolutionConfigurationPlatforms) = preSolution

ProjNet.Common.props renamed to src/Directory.Build.props

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33

4-
<PropertyGroup>
5-
<MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
6-
<OutputPath>$(MSBuildThisFileDirectory)$(Configuration)\$(Platform)</OutputPath>
7-
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
8-
9-
<LangVersion>7.3</LangVersion>
10-
11-
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);https://www.myget.org/F/nettopologysuite/api/v3/index.json</RestoreAdditionalProjectSources>
4+
<Import Project="../Directory.Build.props" />
125

13-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)scskey.snk</AssemblyOriginatorKeyFile>
14-
15-
<Deterministic>true</Deterministic>
16-
<NtsOfficialRelease>false</NtsOfficialRelease>
6+
<PropertyGroup>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
178
</PropertyGroup>
189

1910
<!-- Travis-CI -->
2011
<PropertyGroup Condition=" '$(TRAVIS)' == 'True' ">
12+
<Deterministic>true</Deterministic>
2113
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
2214
<NtsBuildMetadata Condition=" '$(NtsBuildMetadata)' == '' ">ci.travis.$(TRAVIS_BUILD_NUMBER)</NtsBuildMetadata>
2315

@@ -26,12 +18,14 @@
2618

2719
<!-- TeamCity -->
2820
<PropertyGroup Condition=" '$(TEAMCITY_VERSION)' != '' ">
21+
<Deterministic>true</Deterministic>
2922
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3023
<NtsBuildMetadata Condition=" '$(NtsBuildMetadata)' == '' ">ci.teamcity.$(BUILD_NUMBER)</NtsBuildMetadata>
3124
</PropertyGroup>
3225

3326
<!-- AppVeyor -->
3427
<PropertyGroup Condition=" '$(APPVEYOR)' == 'True' ">
28+
<Deterministic>true</Deterministic>
3529
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3630
<NtsBuildMetadata Condition=" '$(NtsBuildMetadata)' == '' ">ci.appveyor.$(APPVEYOR_BUILD_NUMBER)</NtsBuildMetadata>
3731
</PropertyGroup>
@@ -82,13 +76,12 @@
8276
<!-- See https://docs.microsoft.com/en-us/dotnet/standard/library-guidance/versioning -->
8377
<AssemblyVersion>$(NtsMajorVersion).0.0.0</AssemblyVersion>
8478
<AssemblyFileVersion>$(NtsMajorVersion).$(NtsMinorVersion).$(NtsPatchVersion).$(NtsBuildNumber)</AssemblyFileVersion>
79+
<InformationalVersion>$(NtsMajorVersion).$(NtsMinorVersion).$(NtsPatchVersion)</InformationalVersion>
8580

86-
<Company>NetTopologySuite Team</Company>
81+
<Company>NetTopologySuite - Team</Company>
8782

8883
<CopyrightPeople>$(Company)</CopyrightPeople>
89-
<CopyrightPeople>$(CopyrightPeople), Morten Nielsen</CopyrightPeople>
90-
<!--<CopyrightPeople>$(CopyrightPeople), Additional Person</CopyrightPeople>-->
91-
<Copyright>Copyright © 2006 - $([System.DateTime]::UtcNow.Year) $(CopyrightPeople)</Copyright>
84+
<Copyright>Copyright © $([System.DateTime]::UtcNow.Year) $(CopyrightPeople)</Copyright>
9285
</PropertyGroup>
9386

9487
<PropertyGroup Label="SourceLink Info">
@@ -100,7 +93,7 @@
10093

10194
<ItemGroup>
10295
<!-- SourceLink adds stuff to let debuggers step into our code. -->
103-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19351-01" PrivateAssets="All" />
96+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
10497
</ItemGroup>
10598

10699
</Project>

‎src/ProjNet.Benchmark/ProjNet.Benchmark.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,19 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
5-
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(ProjectDir)..\</SolutionDir>
65
<OutputType>Exe</OutputType>
76
<TargetFramework>netcoreapp2.2</TargetFramework>
87
<NoWarn>1701;1702;1591</NoWarn>
98

109
<IsPackable>false</IsPackable>
1110
</PropertyGroup>
1211

13-
<Import Project="$(SolutionDir)ProjNet.Common.props" />
14-
1512
<ItemGroup>
16-
<PackageReference Include="BenchmarkDotNet" Version="0.11.4" />
13+
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
1714
</ItemGroup>
1815

1916
<ItemGroup>
20-
<ProjectReference Include="$(SolutionDir)ProjNet\ProjNET.csproj" />
17+
<ProjectReference Include="$(SolutionDir)src\ProjNet\ProjNET.csproj" />
2118
</ItemGroup>
2219

2320
<ItemGroup>

‎src/ProjNet/ProjNET.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
5-
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(ProjectDir)..\</SolutionDir>
65
<RootNamespace>ProjNet</RootNamespace>
76
<TargetFramework>netstandard2.0</TargetFramework>
87
<SignAssembly>true</SignAssembly>
98
</PropertyGroup>
109

11-
<Import Project="$(SolutionDir)ProjNet.Common.props" />
12-
1310
<PropertyGroup Label="Assembly Info">
1411
<AssemblyTitle>Proj.NET</AssemblyTitle>
1512
<Description>Proj.NET performs point-to-point coordinate conversions between geodetic coordinate systems for use in .Net, Geographic Information Systems (GIS) or GPS applications. The spatial reference model used adheres to the Simple Features specification.</Description>
@@ -27,10 +24,6 @@ Proj.NET performs point-to-point coordinate conversions between geodetic coordin
2724
<PackageTags>OGC;SFS;Projection</PackageTags>
2825
</PropertyGroup>
2926

30-
<ItemGroup>
31-
<None Include="$(SolutionDir)scskey.snk" />
32-
</ItemGroup>
33-
3427
<ItemGroup>
3528
<PackageReference Include="System.Memory" Version="4.5.3" />
3629
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />

‎test/Directory.Build.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<Import Project="../Directory.Build.props" />
5+
6+
<PropertyGroup>
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="nunit" Version="3.12.0" />
12+
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
14+
</ItemGroup>
15+
16+
</Project>

‎test/ProjNet.Tests/ProjNET.Tests.csproj‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,18 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
5-
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(ProjectDir)..\</SolutionDir>
65
<TargetFramework>netcoreapp2.2</TargetFramework>
76
<SignAssembly>true</SignAssembly>
87
<NoWarn>1701;1702;1591</NoWarn>
9-
10-
<IsPackable>false</IsPackable>
118
</PropertyGroup>
129

13-
<Import Project="$(SolutionDir)ProjNet.Common.props" />
14-
1510
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
17-
18-
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
19-
<PackageReference Include="NUnit" Version="3.10.1" />
20-
<PackageReference Include="Npgsql" Version="4.0.5" />
21-
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
11+
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
12+
<PackageReference Include="Npgsql" Version="4.0.9" />
2213
</ItemGroup>
2314

2415
<ItemGroup>
25-
<ProjectReference Include="$(SolutionDir)ProjNet\ProjNET.csproj" />
16+
<ProjectReference Include="$(SolutionDir)src\ProjNet\ProjNET.csproj" />
2617
</ItemGroup>
2718

2819
<ItemGroup>

0 commit comments

Comments
 (0)