升级到了.NET6，并更新了最新的NuGet包

Author: f-shake

AfterBuild/MapBoard.AfterBuild.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>AfterBuild</AssemblyName>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

EGIS.ShapeFileLib/EGIS.ShapeFileLib.csproj

@@ -48,7 +48,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EGIS.Projections\EGIS.Projections.csproj" />

MapBoard.Core/MapBoard.Core.csproj

@@ -17,9 +17,9 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
-    <PackageReference Include="CsvHelper" Version="27.1.0" />
-    <PackageReference Include="DotNetZip" Version="1.15.0" />
-    <PackageReference Include="Esri.ArcGISRuntime" Version="100.11.0" />
+    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="DotNetZip" Version="1.16.0" />
+    <PackageReference Include="Esri.ArcGISRuntime" Version="100.13.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

MapBoard.Extension.AMap/MapBoard.Extension.AMap.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Extension.AMap</AssemblyName>
   </PropertyGroup>
 

MapBoard.Extension/MapBoard.Extension.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Extension</AssemblyName>
   </PropertyGroup>
 

MapBoard.Model/MapBoard.Model.csproj

@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

MapBoard.UI/MapBoard.UI.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>MapBoard</AssemblyName>
     <SatelliteResourceLanguages>zh-cn</SatelliteResourceLanguages>
@@ -90,14 +90,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CsvHelper">
-      <Version>27.1.0</Version>
+      <Version>27.2.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetZip">
-      <Version>1.15.0</Version>
+      <Version>1.16.0</Version>
     </PackageReference>
-    <PackageReference Include="Esri.ArcGISRuntime.WPF" Version="100.11.0" />
-    <PackageReference Include="gong-wpf-dragdrop" Version="2.3.2" />
-    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="Esri.ArcGISRuntime.WPF" Version="100.13.0" />
+    <PackageReference Include="gong-wpf-dragdrop" Version="3.0.0" />
+    <PackageReference Include="log4net" Version="2.0.14" />
     <PackageReference Include="Microsoft-WindowsAPICodePack-Shell">
       <Version>1.1.4</Version>
     </PackageReference>
@@ -108,7 +108,7 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="UI\Component\colorChart.PNG" />

MapBoard.UI/Util/ExtensionUtility.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -246,16 +247,13 @@ await Task.Run(() =>
         private static async Task<string> HttpGetAsync(string url)
         {
             // 设置参数
-            HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
-            request.Timeout = Config.Instance.Tile_RequestTimeOut;
-            request.ReadWriteTimeout = Config.Instance.Tile_ReadTimeOut;
-            request.UserAgent = Config.Instance.Tile_UserAgent;
+            var client = new HttpClient();
+            client.Timeout = TimeSpan.FromMilliseconds(Config.Instance.Tile_RequestTimeOut);
+            client.DefaultRequestHeaders.Add("User-Agent", Config.Instance.Tile_UserAgent);
 
-            using HttpWebResponse response = await request.GetResponseAsync() as HttpWebResponse;
-            using var responseStream = response.GetResponseStream();
-            using StreamReader reader = new StreamReader(responseStream);
-            string text = reader.ReadToEnd();
-            return text;
+            using var response = await client.GetAsync(url);
+            using var content = response.Content;
+            return await content.ReadAsStringAsync();
         }
 
         public static MapPoint ToMapPoint(this Location location)

日志.md

@@ -1658,4 +1658,8 @@ Url DataGrid修改为ListBox+文本框，方便修改
 
 ## 20220108
 
-修复了窗口较小时点击按钮打开分组面板，窗口变大后无法显示分组面板的BUG
+修复了窗口较小时点击按钮打开分组面板，窗口变大后无法显示分组面板的BUG
+
+## 20220109
+
+升级到了.NET6，并更新了最新的NuGet包