Port to .Net 4.8

Berrysoft · Berrysoft · commit 6cabccaa4ce3 · 2019-04-07T21:01:58.000+08:00
diff --git a/Document.sln b/Document.sln
diff --git a/doc/Berrysoft.Documents/Berrysoft.Documents.shfbproj b/doc/Berrysoft.Documents/Berrysoft.Documents.shfbproj
diff --git a/doc/Berrysoft.Documents/ContentLayout.content b/doc/Berrysoft.Documents/ContentLayout.content
diff --git a/doc/Berrysoft.Documents/icons/Help.png b/doc/Berrysoft.Documents/icons/Help.png
diff --git a/samples/Berrysoft.Data.MapSample/Berrysoft.Data.MapSample.vbproj b/samples/Berrysoft.Data.MapSample/Berrysoft.Data.MapSample.vbproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>Berrysoft.Data.MapSample</RootNamespace>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Berrysoft.Data.TreeSample/Berrysoft.Data.TreeSample.csproj b/samples/Berrysoft.Data.TreeSample/Berrysoft.Data.TreeSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/samples/Berrysoft.Html.Sample/Berrysoft.Html.Sample.vbproj b/samples/Berrysoft.Html.Sample/Berrysoft.Html.Sample.vbproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>Berrysoft.Html.Sample</RootNamespace>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Berrysoft.Unsafe.Sample/Berrysoft.Unsafe.Sample.vbproj b/samples/Berrysoft.Unsafe.Sample/Berrysoft.Unsafe.Sample.vbproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>Berrysoft.Unsafe.Sample</RootNamespace>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/TsinghuaNet/TsinghuaNet.vbproj b/samples/TsinghuaNet/TsinghuaNet.vbproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>TsinghuaNet</RootNamespace>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Berrysoft.Console/CommandLine.cs b/src/Berrysoft.Console/CommandLine.cs
@@ -136,7 +136,7 @@ private Dictionary<string, string> InitArgs(string[] args)
                 {
                     throw ExceptionHelper.ArgInvalid(argKey);
                 }
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
                 if (!result.TryAdd(argKey, argValue))
                 {
                     throw ExceptionHelper.ArgInvalid(argKey);
diff --git a/src/Berrysoft.Console/XmlSettings.cs b/src/Berrysoft.Console/XmlSettings.cs
@@ -22,7 +22,7 @@ public abstract class XmlSettings : SettingsBase
     {
         private readonly XName rootName;
         private HashSet<string> multipleNames = new HashSet<string>();
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
         private readonly object syncLock = new object();
 #endif
         /// <summary>
@@ -89,7 +89,7 @@ public override void Open(string fileName)
                 this[name] = propValue;
             }
         }
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
         /// <summary>
         /// Open an xml file and parse it asynchronously.
         /// </summary>
@@ -163,7 +163,7 @@ public override void Save(string fileName)
             }
             document.Save(fileName);
         }
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
         /// <summary>
         /// Save the settings to an xml file.
         /// </summary>
diff --git a/src/Berrysoft.Data/Graph.cs b/src/Berrysoft.Data/Graph.cs
@@ -164,7 +164,7 @@ public static bool IsInLoop<T>(this IGraph<T> graph, T vertex)
                 }
                 last = current;
             }
-            ret:
+        ret:
             return false;
         }
         /// <summary>
@@ -473,7 +473,7 @@ public static ITree<T> ToDFSTree<T>(this IGraph<T> graph, T root)
                     }
                 }
             }
-            ret:
+        ret:
             return result;
         }
         /// <summary>
@@ -530,7 +530,7 @@ public static ITree<T> ToBFSTree<T>(this IGraph<T> graph, T root)
                     }
                 }
             }
-            ret:
+        ret:
             return result;
         }
     }
@@ -547,27 +547,15 @@ public class Graph<T> : IGraph<T>
         /// Initialize an instance of <see cref="Graph{T}"/>.
         /// </summary>
         public Graph()
-#if NETCOREAPP || NET472
             : this(0, 0, null)
-#else
-            : this((IEqualityComparer<T>)null)
-#endif
         { }
         /// <summary>
         /// Initialize an instance of <see cref="Graph{T}"/>.
         /// </summary>
         /// <param name="comparer">An instance of <see cref="IEqualityComparer{T}"/>; default when <see langword="null"/>.</param>
         public Graph(IEqualityComparer<T> comparer)
-#if NETCOREAPP || NET472
             : this(0, 0, comparer)
         { }
-#else
-        {
-            _vertexes = new HashSet<T>(comparer);
-            _arcs = new MultiMap<T, T>(comparer, comparer);
-        }
-#endif
-#if NETCOREAPP || NET472
         /// <summary>
         /// Initialize an instance of <see cref="Graph{T}"/>.
         /// </summary>
@@ -579,7 +567,6 @@ public Graph(int vertexCapacity, int arcCapacity, IEqualityComparer<T> comparer)
             _vertexes = new HashSet<T>(vertexCapacity, comparer);
             _arcs = new MultiMap<T, T>(arcCapacity, comparer, comparer);
         }
-#endif
         /// <summary>
         /// Initialize an instance of <see cref="Graph{T}"/>.
         /// </summary>
diff --git a/src/Berrysoft.Html/HtmlAttribute.cs b/src/Berrysoft.Html/HtmlAttribute.cs
@@ -38,7 +38,7 @@ public HtmlAttribute(string name, string attrvalue)
         /// <returns>A string.</returns>
         public override string ToString()
         {
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
             if (attrvalue.Contains('\"'))
 #else
             if (attrvalue.Contains("\""))
diff --git a/src/Berrysoft.Html/HtmlDocument.cs b/src/Berrysoft.Html/HtmlDocument.cs
@@ -71,7 +71,7 @@ private void WriteToStream(StreamWriter writer, HtmlObject obj)
             switch (obj)
             {
                 case HtmlNode node:
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
                     writer.Write("<{0} {1}>", node.Name, string.Join(' ', node.Attributes()));
 #else
                     writer.Write("<{0} {1}>", node.Name, string.Join(" ", node.Attributes()));
@@ -109,7 +109,7 @@ private async Task WriteToStreamAsync(StreamWriter writer, HtmlObject obj)
             switch (obj)
             {
                 case HtmlNode node:
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
                     await writer.WriteAsync($"<{node.Name} {string.Join(' ', node.Attributes())}>");
 #else
                     await writer.WriteAsync($"<{node.Name} {string.Join(" ", node.Attributes())}>");
diff --git a/src/Berrysoft.Html/HtmlNode.cs b/src/Berrysoft.Html/HtmlNode.cs
@@ -137,15 +137,15 @@ public override string ToString()
         {
             if (objs.Count > 0)
             {
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
                 return $"<{Name} {string.Join(' ', Attributes())}>{string.Concat(Elements())}</{Name}>";
 #else
                 return $"<{Name} {string.Join(" ", Attributes().Select(attr => attr.ToString()))}>{string.Concat(Elements())}</{Name}>";
 #endif
             }
             else
             {
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
                 return $"<{Name} {string.Join(' ', Attributes())} />";
 #else
                 return $"<{Name} {string.Join(" ", Attributes().Select(attr => attr.ToString()))} />";
diff --git a/src/Berrysoft.Html/Markdown/MdElement.cs b/src/Berrysoft.Html/Markdown/MdElement.cs
@@ -39,7 +39,7 @@ public static IEnumerable<MdElement> GetElements(string[] lines)
                 {
                     yield return new MdCodeElement(lines, ref i);
                 }
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
                 else if (TableRegex.IsMatch(line) && line.Contains('|'))
 #else
                 else if (TableRegex.IsMatch(line) && line.Contains("|"))
diff --git a/src/Berrysoft.Html/Markdown/MdTableElement.cs b/src/Berrysoft.Html/Markdown/MdTableElement.cs
@@ -86,7 +86,7 @@ public override HtmlNode ToHtmlNode()
             HtmlNode table = new HtmlNode("table");
             HtmlNode tr = new HtmlNode("tr");
             table.AddElement(new HtmlNode("thead", tr));
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
             string[] heads = head.Split('|', StringSplitOptions.RemoveEmptyEntries);
 #else
             string[] heads = head.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
@@ -109,7 +109,7 @@ public override HtmlNode ToHtmlNode()
             table.AddElement(tbody);
             foreach (string line in elements)
             {
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
                 string[] es = line.Split('|', StringSplitOptions.RemoveEmptyEntries);
 #else
                 string[] es = line.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
diff --git a/src/Berrysoft.Html/Markdown/MdTextAnalyzer.cs b/src/Berrysoft.Html/Markdown/MdTextAnalyzer.cs
@@ -32,7 +32,7 @@ public static IEnumerable<MdToken> GetTextTokens(string text, int offset)
             result.AddRange(StrongAnalyzer.GetTokens(text, offset));
             result.AddRange(HyperlinkAnalyzer.GetTokens(text, offset));
             result.AddRange(ImageAnalyzer.GetTokens(text, offset));
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD
             if (!(text.EndsWith('*') || text.EndsWith('`') || text.EndsWith(')')))
 #else
             if (!(text.EndsWith("*") || text.EndsWith("`") || text.EndsWith(")")))
diff --git a/src/Berrysoft.Tsinghua.Net/Berrysoft.Tsinghua.Net.csproj b/src/Berrysoft.Tsinghua.Net/Berrysoft.Tsinghua.Net.csproj
diff --git a/src/Berrysoft.Unsafe/UnsafeMethods.cs b/src/Berrysoft.Unsafe/UnsafeMethods.cs
diff --git a/target.props b/target.props

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private Dictionary<string, string> InitArgs(string[] args)`
`136`	`136`	`{`
`137`	`137`	`throw ExceptionHelper.ArgInvalid(argKey);`
`138`	`138`	`}`
`139`		`-#if NETCOREAPP`
	`139`	`+#if NETCOREAPP \|\| NETSTANDARD`
`140`	`140`	`if (!result.TryAdd(argKey, argValue))`
`141`	`141`	`{`
`142`	`142`	`throw ExceptionHelper.ArgInvalid(argKey);`