diff --git a/.gitignore b/.gitignore
index 7fb72dd..4cd6858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,4 +65,5 @@ UCosmic.Www.Mvc.Publish.xml
/Private/
.vs
-.vscode
\ No newline at end of file
+.vscode
+_Releases_
\ No newline at end of file
diff --git a/NGeo2.NET40/NGeo2.NET40.csproj b/NGeo2.NET40/NGeo2.NET40.csproj
index d0fc3c3..a7ac918 100644
--- a/NGeo2.NET40/NGeo2.NET40.csproj
+++ b/NGeo2.NET40/NGeo2.NET40.csproj
@@ -97,14 +97,16 @@
-
-
-
+
+
+ Properties\AssemblyInfo.cs
+
+
diff --git a/NGeo2.nuspec b/NGeo2.nuspec
index 54b203f..e0ad331 100644
--- a/NGeo2.nuspec
+++ b/NGeo2.nuspec
@@ -2,11 +2,11 @@
NGeo2
- 2.0.0
+ 3.0.0
NGeo2
Axel Eckenberger
Axel Eckenberger
- http://opensource.org/licenses/MS-PL
+ MS-PL
https://github.com/Obalix/NGeo
false
@@ -15,40 +15,63 @@
GeoNames service from .NET code.
- NGeo is a client library that makes it easier to invoke the
- GeoNames services from .NET code.
+ NGeo is a client library that makes it easier to invoke the
+ GeoNames services from .NET code.
- It is based on the work of Dan Ludwig and John Meyer from The UCosmic Consortium.
+ It is based on the work of Dan Ludwig and John Meyer from The UCosmic Consortium.
- 2.0.0
- - Complete rewrite of the data types and the service based on the HttpClient class.
- - Libraries for: PCL (Profile7), Standard1.1 and NET 4.0
- - Currently supported GeoNames endpoints:
- * extendedFindNearby
- * findNearbyPlaceName
- * findNearby
- * hierarchy
-
+ 3.0.0
+ - Incorporated free text search thanks to sigmarsson (https://github.com/sigmarsson)
+ - Dropped support for portable-net45+win8 and netstandard1.1
+ - Addes support for net47, net5.0, netcoreapp3.1, and net4.7
+ - restructured library code into one project with multiple targets
+ - restructured test code into one project, dropped net40 test
+ 2.0.0
+ - Complete rewrite of the data types and the service based on the HttpClient class.
+ - Libraries for: PCL (Profile7), Standard1.1 and NET 4.0
+ - Currently supported GeoNames endpoints:
+ * extendedFindNearby
+ * findNearbyPlaceName
+ * findNearby
+ * hierarchy
+
Copyright © Axel Eckenberger 2016
GeoNames
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -60,8 +83,10 @@
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/NGeo2.NET40/Properties/AssemblyInfo.cs b/NGeo2/Properties/AssemblyInfo.cs
similarity index 59%
rename from NGeo2.NET40/Properties/AssemblyInfo.cs
rename to NGeo2/Properties/AssemblyInfo.cs
index 306bbeb..2d6d8ef 100644
--- a/NGeo2.NET40/Properties/AssemblyInfo.cs
+++ b/NGeo2/Properties/AssemblyInfo.cs
@@ -1,17 +1,17 @@
-using System.Resources;
-using System.Reflection;
+using System.Reflection;
+using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("NGeo.NET40")]
+[assembly: AssemblyTitle("NGeo")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NGeo.NET40")]
-[assembly: AssemblyCopyright("Copyright © Axel Eckenberger 2016")]
+[assembly: AssemblyProduct("NGeo")]
+[assembly: AssemblyCopyright("Copyright © Axel Eckenberger 2016-2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
@@ -20,22 +20,11 @@
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-[assembly: InternalsVisibleTo("NGeo2.Tests.NET40")]
+[assembly: InternalsVisibleTo("NGeo2.Tests")]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f503720a-bf27-461f-8b73-79bce83a6d87")]
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-//[assembly: AssemblyVersion("1.0.0.0")]
-//[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyVersion("2.0.0.*")]
+[assembly: AssemblyVersion("3.0.0")]
+[assembly: AssemblyFileVersion("3.0.0")]