Merge pull request #156 from judero01col/dev-20220512

judero01col · web-flow · commit ada0d5bb8d55 · 2022-05-12T17:06:35.000-05:00
Dev 20220512
diff --git a/Demo/Demo.AvaloniaUi/Demo.AvaloniaUi.csproj b/Demo/Demo.AvaloniaUi/Demo.AvaloniaUi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Demo/Demo.WindowsForms/Demo.WindowsForms.csproj b/Demo/Demo.WindowsForms/Demo.WindowsForms.csproj
@@ -4,7 +4,7 @@
         <AssemblyTitle>Demo.WindowsForms</AssemblyTitle>
         <Description>Demo for GMap.NET.WindowsForms</Description>
         <Product>Demo.WindowsForms</Product>
-        <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net5.0-windows;net5.0-windows</TargetFrameworks>
         <UseWindowsForms>true</UseWindowsForms>
         <OutputType>WinExe</OutputType>
         <SignAssembly>True</SignAssembly>
diff --git 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
@@ -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
@@ -4,7 +4,7 @@
     <AssemblyTitle>Demo.WindowsPresentation</AssemblyTitle>
     <Description>Demo for GMap.NET.WindowsPresentation</Description>
     <Product>Demo.WindowsPresentation</Product>
-    <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net5.0-windows;net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <OutputType>WinExe</OutputType>
     <SignAssembly>True</SignAssembly>
diff --git 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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Company>MainSoft Technology</Company>
-    <PackageVersion>2.0.3</PackageVersion>
+    <PackageVersion>2.1.0</PackageVersion>
     <ApplicationVersion>$(PackageVersion).0</ApplicationVersion>
     <Version>$(PackageVersion).0</Version>
     <FileVersion>$(PackageVersion).0</FileVersion>
diff --git a/GMap.NET/GMap.NET.Avalonia/GMap.NET.Avalonia.csproj b/GMap.NET/GMap.NET.Avalonia/GMap.NET.Avalonia.csproj
@@ -1,9 +1,21 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <PackageId>GMap.NET.Avalonia</PackageId>
+        <Product>GMap.NET.Avalonia</Product>
+        <AssemblyTitle>GMap.NET.Avalonia</AssemblyTitle>
+        <RootNamespace>GMap.NET</RootNamespace>
+        <Nullable>enable</Nullable>
+        <TargetFrameworks>net5.0</TargetFrameworks>
+        <DefineConstants>MONO_disabled;SQLite;MySQL_disabled;PostgreSQL_disabled;$(DefineConstants)</DefineConstants>
+
+        <PackageReleaseNotes>
+- .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
+        </PackageReleaseNotes>
+    </PropertyGroup>
   
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.10.6" />
diff --git a/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj b/GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj
@@ -6,15 +6,16 @@
     <AssemblyTitle>GMap.NET.Core</AssemblyTitle>
     <RootNamespace>GMap.NET</RootNamespace>
 
-    <TargetFrameworks>net48;netstandard2.0</TargetFrameworks>    
+    <TargetFrameworks>net48;net5.0;net6.0;netstandard2.0</TargetFrameworks>    
     <DefineConstants>MONO_disabled;SQLite;MySQL_disabled;PostgreSQL_disabled;$(DefineConstants)</DefineConstants>
     
     <PackageReleaseNotes>
-- 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
-</PackageReleaseNotes>    
+    </PackageReleaseNotes>    
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj b/GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj
@@ -7,14 +7,15 @@
     <AssemblyTitle>GMap.NET.Windows</AssemblyTitle>
 
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>net48;net5.0-windows;net6.0-windows</TargetFrameworks>
 
     <PackageReleaseNotes>
 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
@@ -5,16 +5,17 @@
     <Product>GMap.NET.WindowsForms</Product>
     <AssemblyTitle>GMap.NET.WindowsForms</AssemblyTitle>
     
-    <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net5.0-windows;net6.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <DefineConstants>ContinuesMapNo;$(DefineConstants)</DefineConstants>
     
     <PackageReleaseNotes>
-- 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
-</PackageReleaseNotes>
+    </PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj b/GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj
@@ -5,15 +5,16 @@
     <Product>GMap.NET.WindowsPresentation</Product>
     <AssemblyTitle>GMap.NET.WindowsPresentation</AssemblyTitle>
     
-    <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net5.0-windows;net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     
     <PackageReleaseNotes>
-- 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
-</PackageReleaseNotes>
+    </PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public MainForm()`
`64`	`64`	`//`
`65`	`65`
`66`	`66`	`// set cache mode only if no internet available`
`67`		`- if (!Stuff.PingNetwork("pingtest.com"))`
	`67`	`+ if (!Stuff.PingNetwork("google.com"))`
`68`	`68`	`{`
`69`	`69`	`MainMap.Manager.Mode = AccessMode.CacheOnly;`
`70`	`70`	`MessageBox.Show("No internet connection available, going to CacheOnly mode.", "GMap.NET - Demo.WindowsForms", MessageBoxButtons.OK, MessageBoxIcon.Warning);`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static bool PingNetwork(string hostNameOrAddress)`
`66`	`66`	`using (var p = new Ping())`
`67`	`67`	`{`
`68`	`68`	`var buffer = Encoding.ASCII.GetBytes("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");`
`69`		`- int timeout = 4444; // 4s`
	`69`	`+ int timeout = 5000; // 5sg`
`70`	`70`
`71`	`71`	`try`
`72`	`72`	`{`