Update dependency on GeoAPI.CoordinateSystems

(> 1.7.5-pre018)
Update version to 1.4

Author: FObermaier

ProjNET.nuspec

@@ -15,7 +15,7 @@ Proj.NET performs point-to-point coordinate conversions between geodetic coordin
 		<copyright>Copyright 2006-2015</copyright>
 		<tags>OGC SFS Projection</tags>
 		<dependencies>
-			<dependency id="GeoAPI" version="[1.7.5-pre009, )" />
+			<dependency id="GeoAPI.CoordinateSystems" version="[1.7.5-pre018, )" />
 		</dependencies>
 	</metadata>
 	<files>

ProjNet.Common.props

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <OutputPath>$(SolutionDir)$(Configuration)\$(Platform)</OutputPath>
+    <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GeoAPIPackageReferenceVersion>1.7.5-pre018</GeoAPIPackageReferenceVersion>
+  </PropertyGroup>
+</Project>

ProjNet.Tests/CoordinateTransformTests.cs

@@ -897,7 +897,13 @@ private sealed class CoordinateArraySequence : ICoordinateSequence
             public Coordinate GetCoordinateCopy(int i) => new Coordinate(this.coordinates[i]);
             public Coordinate GetCoordinate(int i) => this.coordinates[i];
             object ICloneable.Clone() => this.Clone();
-            public CoordinateArraySequence Clone() => new CoordinateArraySequence(Array.ConvertAll(this.coordinates, c => new Coordinate(c)));
+            public CoordinateArraySequence Clone() => (CoordinateArraySequence) Copy();
+
+            public ICoordinateSequence Copy()
+            {
+                return new CoordinateArraySequence(Array.ConvertAll(this.coordinates, c => new Coordinate(c)));
+            }
+
             public Coordinate[] ToCoordinateArray() => this.coordinates;
 
             public ICoordinateSequence Reversed()

ProjNet.Tests/ProjNET.Tests.csproj

@@ -4,19 +4,19 @@
     <SolutionDir Condition=" '$(SolutionDir)' == '' ">$(ProjectDir)..\</SolutionDir>
     <TargetFramework>net45</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GeoAPIPackageReferenceVersion>1.7.5-pre4</GeoAPIPackageReferenceVersion>
-
     <!-- The NUnit 2 test adapter doesn't support portable PDBs. -->
     <DebugType>full</DebugType>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)ProjNet.Common.props" />
+
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
 
-    <PackageReference Include="GeoAPI" Version="$(GeoAPIPackageReferenceVersion)" />
+    <PackageReference Include="GeoAPI.CoordinateSystems" Version="$(GeoAPIPackageReferenceVersion)" />
     <PackageReference Include="NUnit" Version="2.6.4" />
     <PackageReference Include="Npgsql" Version="2.2.7" />
 

ProjNet/ProjNET.csproj

@@ -5,14 +5,12 @@
     <SolutionDir Condition=" '$(SolutionDir)' == '' ">$(ProjectDir)..\</SolutionDir>
     <RootNamespace>ProjNet</RootNamespace>
     <TargetFrameworks>net35-client;net40-client;net403-client;net45;netstandard1.0;netstandard2.0</TargetFrameworks>
-    <OutputPath>$(SolutionDir)$(Configuration)\$(Platform)</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GeoAPIPackageReferenceVersion>1.7.5-pre009</GeoAPIPackageReferenceVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)scskey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)ProjNet.Common.props" />
+
   <!-- Client Profile frameworks don't have built-in shortcuts, so we need to specify these. -->
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net35-client' ">
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
@@ -68,7 +66,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GeoAPI" Version="$(GeoAPIPackageReferenceVersion)" />
+    <PackageReference Include="GeoAPI.CoordinateSystems" Version="$(GeoAPIPackageReferenceVersion)" />
   </ItemGroup>
 
   <ItemGroup>

ProjNet/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 #endif
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Proj.NET")]
-[assembly: AssemblyCopyright("Copyright © 2009 - 2015 Morten Nielsen, NetTopologySuite - Team")]
+[assembly: AssemblyCopyright("Copyright © 2009 - 2018 Morten Nielsen, NetTopologySuite - Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: System.CLSCompliant(true)]
@@ -20,5 +20,5 @@
 #if HAS_SYSTEM_RUNTIME_INTEROPSERVICES_GUIDATTRIBUTE
 [assembly: Guid("e16f3ac5-214b-4ef3-9809-740a13cf0ec7")]
 #endif
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]

ProjNet4GeoAPI.sln

@@ -1,18 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjNET", "ProjNet\ProjNET.csproj", "{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}"
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2036
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNET", "ProjNet\ProjNET.csproj", "{E028BDD2-55E1-4E5F-BE31-35FAEC8D6428}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AC62B826-FD1B-43B9-9E20-696588E560E7}"
 	ProjectSection(SolutionItems) = preProject
+		ProjNet.Common.props = ProjNet.Common.props
 		ProjNET.nuspec = ProjNET.nuspec
 		TeamCity.targets = TeamCity.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjNET.Tests", "ProjNet.Tests\ProjNET.Tests.csproj", "{67E8C952-1F48-4DFB-9507-BD44DB6784FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjNET.Tests", "ProjNet.Tests\ProjNET.Tests.csproj", "{67E8C952-1F48-4DFB-9507-BD44DB6784FD}"
 EndProject
 Global
-
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -30,4 +32,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8E72A6F0-7BCE-400D-A437-BE88560B578E}
+	EndGlobalSection
 EndGlobal