From 06e7c33bda2c0c230e4c9f1249f948901c6be991 Mon Sep 17 00:00:00 2001 From: Jurgen De Leon Date: Thu, 12 May 2022 14:31:41 -0500 Subject: [PATCH 1/2] Add TargetFrameworks net5.0 and net6.0 --- Demo/Demo.AvaloniaUi/Demo.AvaloniaUi.csproj | 2 +- Demo/Demo.WindowsForms/Demo.WindowsForms.csproj | 2 +- Demo/Demo.WindowsForms/Forms/MainForm.cs | 2 +- Demo/Demo.WindowsForms/Source/DemoStuff.cs | 2 +- Demo/Demo.WindowsPresentation/Demo.WindowsPresentation.csproj | 2 +- Demo/Demo.WindowsPresentation/Windows/MainWindow.xaml.cs | 4 ++-- Directory.Build.props | 2 +- GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj | 2 +- GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj | 2 +- GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj | 2 +- .../GMap.NET.WindowsPresentation.csproj | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Demo/Demo.AvaloniaUi/Demo.AvaloniaUi.csproj b/Demo/Demo.AvaloniaUi/Demo.AvaloniaUi.csproj index c7d7ce1..e32af6e 100644 --- a/Demo/Demo.AvaloniaUi/Demo.AvaloniaUi.csproj +++ b/Demo/Demo.AvaloniaUi/Demo.AvaloniaUi.csproj @@ -1,7 +1,7 @@ WinExe - net5.0 + net5.0-windows enable diff --git a/Demo/Demo.WindowsForms/Demo.WindowsForms.csproj b/Demo/Demo.WindowsForms/Demo.WindowsForms.csproj index 1b94625..b70ae0f 100644 --- a/Demo/Demo.WindowsForms/Demo.WindowsForms.csproj +++ b/Demo/Demo.WindowsForms/Demo.WindowsForms.csproj @@ -4,7 +4,7 @@ Demo.WindowsForms Demo for GMap.NET.WindowsForms Demo.WindowsForms - net48;net5.0-windows + net48;net5.0-windows;net5.0-windows true WinExe True diff --git a/Demo/Demo.WindowsForms/Forms/MainForm.cs b/Demo/Demo.WindowsForms/Forms/MainForm.cs index edde141..5d6b0a1 100644 --- a/Demo/Demo.WindowsForms/Forms/MainForm.cs +++ b/Demo/Demo.WindowsForms/Forms/MainForm.cs @@ -64,7 +64,7 @@ public MainForm() // // set cache mode only if no internet available - if (!Stuff.PingNetwork("pingtest.com")) + if (!Stuff.PingNetwork("google.com")) { MainMap.Manager.Mode = AccessMode.CacheOnly; MessageBox.Show("No internet connection available, going to CacheOnly mode.", "GMap.NET - Demo.WindowsForms", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/Demo/Demo.WindowsForms/Source/DemoStuff.cs b/Demo/Demo.WindowsForms/Source/DemoStuff.cs index 9c4c22c..c68bd96 100644 --- a/Demo/Demo.WindowsForms/Source/DemoStuff.cs +++ b/Demo/Demo.WindowsForms/Source/DemoStuff.cs @@ -66,7 +66,7 @@ public static bool PingNetwork(string hostNameOrAddress) using (var p = new Ping()) { var buffer = Encoding.ASCII.GetBytes("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); - int timeout = 4444; // 4s + int timeout = 5000; // 5sg try { diff --git a/Demo/Demo.WindowsPresentation/Demo.WindowsPresentation.csproj b/Demo/Demo.WindowsPresentation/Demo.WindowsPresentation.csproj index 37b1c34..4732e52 100644 --- a/Demo/Demo.WindowsPresentation/Demo.WindowsPresentation.csproj +++ b/Demo/Demo.WindowsPresentation/Demo.WindowsPresentation.csproj @@ -4,7 +4,7 @@ Demo.WindowsPresentation Demo for GMap.NET.WindowsPresentation Demo.WindowsPresentation - net48;net5.0-windows + net48;net5.0-windows;net6.0-windows true WinExe True diff --git a/Demo/Demo.WindowsPresentation/Windows/MainWindow.xaml.cs b/Demo/Demo.WindowsPresentation/Windows/MainWindow.xaml.cs index 32889e7..74ad20d 100644 --- a/Demo/Demo.WindowsPresentation/Windows/MainWindow.xaml.cs +++ b/Demo/Demo.WindowsPresentation/Windows/MainWindow.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; @@ -49,7 +49,7 @@ public MainWindow() // // set cache mode only if no internet avaible - if (!Stuff.PingNetwork("pingtest.com")) + if (!Stuff.PingNetwork("google.com")) { MainMap.Manager.Mode = AccessMode.CacheOnly; MessageBox.Show("No internet connection available, going to CacheOnly mode.", diff --git a/Directory.Build.props b/Directory.Build.props index 08853c2..940918b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ MainSoft Technology - 2.0.3 + 2.1.0 $(PackageVersion).0 $(PackageVersion).0 $(PackageVersion).0 diff --git a/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj b/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj index 148e042..f70443c 100644 --- a/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj +++ b/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj @@ -6,7 +6,7 @@ GMap.NET.Core GMap.NET - net48;netstandard2.0 + net48;net5.0;net6.0;netstandard2.0 MONO_disabled;SQLite;MySQL_disabled;PostgreSQL_disabled;$(DefineConstants) diff --git a/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj b/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj index a400ddb..54fe351 100644 --- a/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj +++ b/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj @@ -7,7 +7,7 @@ GMap.NET.Windows false - net48 + net48;net5.0-windows;net6.0-windows Library migrated to .Net Core and published in new individual packages diff --git a/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj b/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj index 445a62f..52639d4 100644 --- a/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj +++ b/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj @@ -5,7 +5,7 @@ GMap.NET.WindowsForms GMap.NET.WindowsForms - net48;net5.0-windows + net48;net5.0-windows;net6.0-windows true ContinuesMapNo;$(DefineConstants) diff --git a/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj b/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj index a6a3b57..fbbb972 100644 --- a/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj +++ b/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj @@ -5,7 +5,7 @@ GMap.NET.WindowsPresentation GMap.NET.WindowsPresentation - net48;net5.0-windows + net48;net5.0-windows;net6.0-windows true From 758ac0b5ea8f2d5d1e5ee7d152547435c90dfc6d Mon Sep 17 00:00:00 2001 From: Jurgen De Leon Date: Thu, 12 May 2022 17:07:02 -0500 Subject: [PATCH 2/2] Version 2.1.0 --- .../GMap.NET.Avalonia.csproj | 22 ++++-- GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj | 5 +- .../GMap.NET.Windows/GMap.NET.Windows.csproj | 1 + .../GMap.NET.WindowsForms.csproj | 5 +- .../GMap.NET.WindowsPresentation.csproj | 5 +- README.md | 73 +++++++++++++++++++ 6 files changed, 100 insertions(+), 11 deletions(-) diff --git a/GMap.NET/GMap.NET.Avalonia/GMap.NET.Avalonia.csproj b/GMap.NET/GMap.NET.Avalonia/GMap.NET.Avalonia.csproj index 4dcf254..360d52f 100644 --- a/GMap.NET/GMap.NET.Avalonia/GMap.NET.Avalonia.csproj +++ b/GMap.NET/GMap.NET.Avalonia/GMap.NET.Avalonia.csproj @@ -1,9 +1,21 @@  - - Library - net5.0 - enable - + + GMap.NET.Avalonia + GMap.NET.Avalonia + GMap.NET.Avalonia + GMap.NET + enable + net5.0 + MONO_disabled;SQLite;MySQL_disabled;PostgreSQL_disabled;$(DefineConstants) + + +- .Net 6.0 support added +- New GMap.NET.Avalonia library + +History Release Notes +https://github.com/judero01col/GMap.NET/blob/master/README.md#release-notes + + diff --git a/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj b/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj index f70443c..1e21e2c 100644 --- a/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj +++ b/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj @@ -10,11 +10,12 @@ MONO_disabled;SQLite;MySQL_disabled;PostgreSQL_disabled;$(DefineConstants) -- Fixes, improvements and optimization +- .Net 6.0 support added +- New GMap.NET.Avalonia library History Release Notes https://github.com/judero01col/GMap.NET/blob/master/README.md#release-notes - + diff --git a/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj b/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj index 54fe351..3922a7b 100644 --- a/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj +++ b/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj @@ -15,6 +15,7 @@ Library migrated to .Net Core and published in new individual packages - GMap.NET.Core - GMap.NET.WinForms - GMap.NET.WinPresentation +- GMap.NET.Avalonia History Release Notes https://github.com/judero01col/GMap.NET/blob/master/README.md#release-notes diff --git a/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj b/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj index 52639d4..e0dfdb7 100644 --- a/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj +++ b/GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj @@ -10,11 +10,12 @@ ContinuesMapNo;$(DefineConstants) -- Fixes, improvements and optimization +- .Net 6.0 support added +- New GMap.NET.Avalonia library History Release Notes https://github.com/judero01col/GMap.NET/blob/master/README.md#release-notes - + diff --git a/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj b/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj index fbbb972..6d4fa69 100644 --- a/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj +++ b/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj @@ -9,11 +9,12 @@ true -- Fixes, improvements and optimization +- .Net 6.0 support added +- New GMap.NET.Avalonia library History Release Notes https://github.com/judero01col/GMap.NET/blob/master/README.md#release-notes - + diff --git a/README.md b/README.md index 20b998a..91c3bcc 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,9 @@ PM> Install-Package GMap.NET.WinForms ``` PM> Install-Package GMap.NET.WinPresentation ``` +``` +PM> Install-Package GMap.NET.Avalonia +``` If you wish to use the cutting-edge version of gmaps-api-net, then you can clone the repository (or download the zip) and build the class library yourself. This should require minimal set-up, and also allows you to develop extra features for your own use (or to push upstream using a pull request for everyone else to use!). @@ -33,6 +36,76 @@ https://github.com/judero01col/GMap.NET/wiki # Release Notes +## Version 2.0.4 + +#### GMap.NET.Core +- .Net 6.0 support added +- New GMap.NET.Avalonia library + +#### GMap.NET.WinForms +- .Net 6.0 support added +- New GMap.NET.Avalonia library + +#### GMap.NET.WinPresentation +- .Net 6.0 support added +- New GMap.NET.Avalonia library + +## Version 2.0.3 + +#### GMap.NET.Core +- .Net 5.0 support added + +#### GMap.NET.WinForms +- .Net 5.0 support added + +#### GMap.NET.WinPresentation +- .Net 5.0 support added + +## Version 2.0.2 + +#### GMap.NET.Core +- .Net Core 3.0 support added + +#### GMap.NET.WinForms +- Fixes, improvements and optimization + +#### GMap.NET.WinPresentation +- Fixes, improvements and optimization + +## Version 2.0.2 + +#### GMap.NET.Core +- Fixes, improvements and optimization + +#### GMap.NET.WinForms +- Fixes, improvements and optimization + +#### GMap.NET.WinPresentation +- Fixes, improvements and optimization + +## Version 2.0.1 + +#### GMap.NET.Core +- New Lantmateriet Map Provider (SwedenMapAlternative) : Pseudo Mercator (EPSG:3857) instead of SWEREF99 (EPSG:3006) (Contributed by @jokubokla) +- Support sending X-Yours-Client header via OSMProvider (Contributed by @shrayasr) + +#### GMap.NET.WinForms +- None + +#### GMap.NET.WinPresentation +- None + +## Version 2.0.0 + +#### GMap.NET.Core +- Pocket PC support removed (Contributed by @zgabi) + +#### GMap.NET.WinForms +- Pocket PC support removed (Contributed by @zgabi) + +#### GMap.NET.WinPresentation +- Pocket PC support removed (Contributed by @zgabi) + ## Version 1.9.9.5 #### GMap.NET.Core