Merge branch 'develop'

Directory.Build.props

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <PropertyGroup>
+    <SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)</SolutionDir>
+
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)nts.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+</Project>

NetTopologySuite.IO.Oracle.sln

@@ -1,20 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2008
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29215.179
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B0923F22-AF00-46DA-B5CE-73F4D398DE37}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		NetTopologySuite.Common.props = NetTopologySuite.Common.props
 		NetTopologySuite.IO.Oracle.nuspec = NetTopologySuite.IO.Oracle.nuspec
 		README.md = README.md
-		SharedAssemblyVersion.cs = SharedAssemblyVersion.cs
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetTopologySuite.IO.Oracle", "NetTopologySuite.IO.Oracle\NetTopologySuite.IO.Oracle.csproj", "{8B9632C4-9854-497E-A077-A1B7F358E284}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetTopologySuite.IO.Oracle", "src\NetTopologySuite.IO.Oracle\NetTopologySuite.IO.Oracle.csproj", "{8B9632C4-9854-497E-A077-A1B7F358E284}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetTopologySuite.IO.Oracle.Test", "NetTopologySuite.IO.Oracle.Test\NetTopologySuite.IO.Oracle.Test.csproj", "{58CEBBBB-3E65-4DEC-A344-9D4E32E518DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetTopologySuite.IO.Oracle.Test", "test\NetTopologySuite.IO.Oracle.Test\NetTopologySuite.IO.Oracle.Test.csproj", "{58CEBBBB-3E65-4DEC-A344-9D4E32E518DD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Directory.Build.props

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <Import Project="../Directory.Build.props" />
+
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <!-- Travis-CI -->
+  <PropertyGroup Condition=" '$(TRAVIS)' == 'True' ">
+    <Deterministic>true</Deterministic>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <NtsBuildMetadata Condition=" '$(NtsBuildMetadata)' == '' ">ci.travis.$(TRAVIS_BUILD_NUMBER)</NtsBuildMetadata>
+
+    <NtsOfficialRelease Condition=" '$(TRAVIS_BRANCH)' == 'master' And '$(TRAVIS_PULL_REQUEST)' == 'false' ">true</NtsOfficialRelease>
+  </PropertyGroup>
+
+  <!-- TeamCity -->
+  <PropertyGroup Condition=" '$(TEAMCITY_VERSION)' != '' ">
+    <Deterministic>true</Deterministic>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <NtsBuildMetadata Condition=" '$(NtsBuildMetadata)' == '' ">ci.teamcity.$(BUILD_NUMBER)</NtsBuildMetadata>
+  </PropertyGroup>
+
+  <!-- AppVeyor -->
+  <PropertyGroup Condition=" '$(APPVEYOR)' == 'True' ">
+    <Deterministic>true</Deterministic>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <NtsBuildMetadata Condition=" '$(NtsBuildMetadata)' == '' ">ci.appveyor.$(APPVEYOR_BUILD_NUMBER)</NtsBuildMetadata>
+  </PropertyGroup>
+
+  <!-- Fallback for local builds and CI environments we don't recognize -->
+  <PropertyGroup>
+    <NtsBuildMetadata Condition=" '$(NtsBuildMetadata)' == '' ">local</NtsBuildMetadata>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Version numbers">
+    <!-- MAJOR, MINOR, and PATCH are defined according to SemVer 2.0.0. -->
+    <NtsMajorVersion>2</NtsMajorVersion>
+    <NtsMinorVersion>0</NtsMinorVersion>
+    <NtsPatchVersion>0</NtsPatchVersion>
+
+    <NtsBuildTimestamp>$([System.DateTime]::UtcNow.Ticks)</NtsBuildTimestamp>
+    <NtsDaysSinceEpoch>$([System.DateTime]::op_Subtraction($([System.DateTime]::new($(NtsBuildTimestamp)).Date),$([System.DateTime]::new(621355968000000000))).TotalDays.ToString("00000"))</NtsDaysSinceEpoch>
+
+    <!--
+        Note that, since this causes our version number to tick over every
+        minute, we see a (far less severe) variant of dotnet/project-system#1457
+        where VS decides to restore packages at seemingly random times.
+    -->
+    <NtsMinutesSinceStartOfUtcDay>$([System.DateTime]::new($(NtsBuildTimestamp)).TimeOfDay.TotalMinutes.ToString("0000"))</NtsMinutesSinceStartOfUtcDay>
+
+    <VersionPrefix>$(NtsMajorVersion).$(NtsMinorVersion).$(NtsPatchVersion)</VersionPrefix>
+    <VersionSuffix Condition=" '$(VersionSuffix)' == '' And '$(NtsOfficialRelease)' != 'true' ">pre.$(NtsDaysSinceEpoch)$(NtsMinutesSinceStartOfUtcDay)+$(NtsBuildMetadata)</VersionSuffix>
+
+    <!--
+        A sample of what this could have been on 2019-05-13 at 11:00:00 PM UTC:
+        NtsBuildTimestamp            = 636933024000000000
+
+        NtsMajorVersion              = 2
+        NtsMinorVersion              = 0
+        NtsPatchVersion              = 0
+        VersionPrefix                = 2.0.0
+
+        NtsDaysSinceEpoch            = 18029
+        NtsMinutesSinceStartOfUtcDay = 1380
+        NtsBuildMetadata             = local
+        VersionSuffix                = pre.180291380+local
+
+        (ultimate) package version   = 2.0.0-pre.180291380+local
+    -->
+  </PropertyGroup>
+
+  <PropertyGroup Label="Assembly Info">
+    <!-- See https://docs.microsoft.com/en-us/dotnet/standard/library-guidance/versioning -->
+    <AssemblyVersion>$(NtsMajorVersion).0.0.0</AssemblyVersion>
+    <AssemblyFileVersion>$(NtsMajorVersion).$(NtsMinorVersion).$(NtsPatchVersion).$(NtsBuildNumber)</AssemblyFileVersion>
+
+    <Company>NetTopologySuite - Team</Company>
+
+    <CopyrightPeople>$(Company)</CopyrightPeople>
+    <Copyright>Copyright © $([System.DateTime]::UtcNow.Year) $(CopyrightPeople)</Copyright>
+  </PropertyGroup>
+
+  <PropertyGroup Label="SourceLink Info">
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- SourceLink adds stuff to let debuggers step into our code. -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>

src/NetTopologySuite.IO.Oracle/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: ComVisible(false)]
+[assembly: Guid("c3604703-c0c2-44a9-9df4-19820def19a5")]