Refactor towards netStandard 1.3 and 2.0

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+ <PropertyGroup>
+  <!--<BaseIntermediateOutputPath>$(SolutionDir)$(ProjectName)\obj\$(ProjectName)</BaseIntermediateOutputPath>-->
+ </PropertyGroup>
+</Project>

SbnSharp.sln

@@ -1,57 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spec", "Spec", "{B0E9CDB7-0722-40CB-A2C5-3544EB1B2863}"
-	ProjectSection(SolutionItems) = preProject
-		Spec\sbn_format.pdf = Spec\sbn_format.pdf
-		Spec\sbx_format.pdf = Spec\sbx_format.pdf
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{BDE9A125-7B3D-42E1-B519-0637568A1423}"
-	ProjectSection(SolutionItems) = preProject
-		SharpSbn.GeoAPI.nuspec = SharpSbn.GeoAPI.nuspec
-		SharpSbn.GeoAPI.targets = SharpSbn.GeoAPI.targets
-		SharpSbn.nuspec = SharpSbn.nuspec
-		SharpSbn.targets = SharpSbn.targets
-	EndProjectSection
-EndProject
-Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "hasbeen", "hasbeen.pyproj", "{86B250BB-F515-45E8-93BD-15810BC4CF49}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSbn", "SharpSbn\SharpSbn.csproj", "{E28F8461-D075-4DA6-8FBB-4DDE75D1E396}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSbn.Test", "test\SharpSbn.Test.csproj", "{C05CE679-851D-4542-98B9-051A7F46F2BF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		ReleaseGeoAPI|Any CPU = ReleaseGeoAPI|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{86B250BB-F515-45E8-93BD-15810BC4CF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86B250BB-F515-45E8-93BD-15810BC4CF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86B250BB-F515-45E8-93BD-15810BC4CF49}.ReleaseGeoAPI|Any CPU.ActiveCfg = Release|Any CPU
-		{E28F8461-D075-4DA6-8FBB-4DDE75D1E396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E28F8461-D075-4DA6-8FBB-4DDE75D1E396}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E28F8461-D075-4DA6-8FBB-4DDE75D1E396}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E28F8461-D075-4DA6-8FBB-4DDE75D1E396}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E28F8461-D075-4DA6-8FBB-4DDE75D1E396}.ReleaseGeoAPI|Any CPU.ActiveCfg = ReleaseGeoAPI|Any CPU
-		{E28F8461-D075-4DA6-8FBB-4DDE75D1E396}.ReleaseGeoAPI|Any CPU.Build.0 = ReleaseGeoAPI|Any CPU
-		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C05CE679-851D-4542-98B9-051A7F46F2BF}.ReleaseGeoAPI|Any CPU.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5B679E3C-8F5E-4577-BA97-18925AB34CBC}
-	EndGlobalSection
-	GlobalSection(NDepend) = preSolution
-		Project = ""
-	EndGlobalSection
-EndGlobal

SharpSbn.Common.props

@@ -0,0 +1,24 @@
+<Project>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' ">
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>$(SolutionDir)$(Configuration)\$(Platform)</OutputPath>
+    <Version>1.2.0</Version>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Copyright>Copyright (c) Felix Obermaier 2013-2018</Copyright>
+    <Authors>Felix Obermaier</Authors>
+    <Company></Company>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/fobermaier/SbnSharp.git</RepositoryUrl>
+    <PackageIconUrl></PackageIconUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/FObermaier/SbnSharp/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/fobermaier/SbnSharp</PackageProjectUrl>
+    <RootNamespace>SharpSbn</RootNamespace>
+  </PropertyGroup>
+
+</Project>

SharpSbn.GeoAPI/SharpSbn.GeoAPI.csproj

@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="$(SolutionDir)SharpSbn.Common.props" />
+  <!--<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/>-->
+
+  <PropertyGroup>
+    <TargetFrameworks>net40-client;netstandard1.3</TargetFrameworks>
+    <PackageId>SharpSbn.GeoAPI</PackageId>
+    <Product>SharpSbn.GeoAPI</Product>
+    <AssemblyName>SharpSbn.GeoAPI</AssemblyName>
+    <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>TRACE;UseGeoAPI</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SharpSbn\BinaryIOExtensions.cs" Link="BinaryIOExtensions.cs" />
+    <Compile Include="..\SharpSbn\ClampUtility.cs" Link="ClampUtility.cs" />
+    <Compile Include="..\SharpSbn\GeometryMetricExtensions.cs" Link="GeometryMetricExtensions.cs" />
+    <Compile Include="..\SharpSbn\NumPySlicing.cs" Link="NumPySlicing.cs" />
+    <Compile Include="..\SharpSbn\Properties\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\SharpSbn\SbnBin.cs" Link="SbnBin.cs" />
+    <Compile Include="..\SharpSbn\SbnException.cs" Link="SbnException.cs" />
+    <Compile Include="..\SharpSbn\SbnFeature.cs" Link="SbnFeature.cs" />
+    <Compile Include="..\SharpSbn\SbnHeader.cs" Link="SbnHeader.cs" />
+    <Compile Include="..\SharpSbn\SbnNode.cs" Link="SbnNode.cs" />
+    <Compile Include="..\SharpSbn\SbnQueryOnlyTree.cs" Link="SbnQueryOnlyTree.cs" />
+    <Compile Include="..\SharpSbn\SbnTree.cs" Link="SbnTree.cs" />
+    <Compile Include="..\SharpSbn\SbnTreeRebuildRequiredEventArgs.cs" Link="SbnTreeRebuildRequiredEventArgs.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="GeoAPI.Core" Version="1.7.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+
+
+</Project>

SharpSbn.sln

@@ -0,0 +1,52 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2016
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{7B7C8ABC-15AF-45AE-A589-84EE4D5ECFE6}"
+	ProjectSection(SolutionItems) = preProject
+		SharpSbn.Common.props = SharpSbn.Common.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spec", "Spec", "{ABB16554-3F14-4E7E-A1A7-FC72FF3DF9D8}"
+	ProjectSection(SolutionItems) = preProject
+		Spec\sbn_format.pdf = Spec\sbn_format.pdf
+		Spec\sbx_format.pdf = Spec\sbx_format.pdf
+	EndProjectSection
+EndProject
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "hasbeen", "hasbeen.pyproj", "{86B250BB-F515-45E8-93BD-15810BC4CF49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpSbn", "SharpSbn\SharpSbn.csproj", "{E3304F5C-2C53-497D-B621-847F9D007D67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSbn.Test", "test\SharpSbn.Test.csproj", "{C05CE679-851D-4542-98B9-051A7F46F2BF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpSbn.GeoAPI", "SharpSbn.GeoAPI\SharpSbn.GeoAPI.csproj", "{33887FA2-09CE-4920-BC95-0DAEB00CCD20}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{86B250BB-F515-45E8-93BD-15810BC4CF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86B250BB-F515-45E8-93BD-15810BC4CF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3304F5C-2C53-497D-B621-847F9D007D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3304F5C-2C53-497D-B621-847F9D007D67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3304F5C-2C53-497D-B621-847F9D007D67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3304F5C-2C53-497D-B621-847F9D007D67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C05CE679-851D-4542-98B9-051A7F46F2BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33887FA2-09CE-4920-BC95-0DAEB00CCD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33887FA2-09CE-4920-BC95-0DAEB00CCD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33887FA2-09CE-4920-BC95-0DAEB00CCD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33887FA2-09CE-4920-BC95-0DAEB00CCD20}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5E479A7C-2A17-43FA-83B7-55BB991EC3EE}
+	EndGlobalSection
+EndGlobal

SharpSbn/Properties/AssemblyInfo.cs

@@ -1,42 +1 @@
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden 
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("SharpSbn")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpSbn")]
-[assembly: AssemblyCopyright("Copyright © Felix Obermaier 2013-2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-#if !PCL
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von 
-// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
-[assembly: ComVisible(false)]
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("82daf214-e442-4608-8d60-cfb7d0f15a95")]
-#endif
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
-[assembly: InternalsVisibleTo("SharpSbn.Test")]
-#if !PCL
-[assembly: CLSCompliant(true)]
-#endif
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("SharpSbn.Test")]