diff --git a/Apewer .NET.sln b/Apewer .NET.sln index cb16a2f..9a72449 100644 --- a/Apewer .NET.sln +++ b/Apewer .NET.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.35325.158 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35825.156 d17.13 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apewer", "Apewer\Apewer.csproj", "{7C47A362-78F9-4EC2-86F1-B442658D2466}" EndProject @@ -11,6 +11,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apewer.Web", "Apewer.Web\Ap EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apewer.Windows", "Apewer.Windows\Apewer.Windows.csproj", "{5FB935E5-01E8-4CA7-9157-DC58BD731408}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{9FA3D6BD-1EC1-3BA5-80CB-CE02773A58D5}" + ProjectSection(SolutionItems) = preProject + ChangeLog.md = ChangeLog.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/Apewer.Source/Apewer.Source.csproj b/Apewer.Source/Apewer.Source.csproj index c93fd43..cf11668 100644 --- a/Apewer.Source/Apewer.Source.csproj +++ b/Apewer.Source/Apewer.Source.csproj @@ -6,6 +6,7 @@ SOURCE;$(DefineConstants); MYSQL_6_10;$(DefineConstants); MYSQL_6_9;$(DefineConstants); + NU1902 netstandard2.0;net40;net20 diff --git a/Apewer/Apewer.props b/Apewer/Apewer.props index 5fe1b39..425fab9 100644 --- a/Apewer/Apewer.props +++ b/Apewer/Apewer.props @@ -9,7 +9,7 @@ Apewer Apewer Libraries - 6.8.2 + 6.8.3 diff --git a/Apewer/Web/ApiApplication.cs b/Apewer/Web/ApiApplication.cs index 605eb4e..6d5b348 100644 --- a/Apewer/Web/ApiApplication.cs +++ b/Apewer/Web/ApiApplication.cs @@ -16,7 +16,6 @@ namespace Apewer.Web // ApiAttribute string _name = null; - string _lower = null; string _caption = null; string _description = null; diff --git a/Apewer/Web/MiniStreamAsyncResult.cs b/Apewer/Web/MiniStreamAsyncResult.cs index be9c692..fff0700 100644 --- a/Apewer/Web/MiniStreamAsyncResult.cs +++ b/Apewer/Web/MiniStreamAsyncResult.cs @@ -13,13 +13,13 @@ namespace Apewer.Web ManualResetEvent handle; bool completed; - internal byte[] Buffer; - internal int Offset; - internal int Count; - internal AsyncCallback Callback; - internal object State; - internal int SynchRead; - internal Exception Error; + internal byte[] Buffer = null; + internal int Offset = 0; + internal int Count = 0; + internal AsyncCallback Callback = null; + internal object State = null; + internal int SynchRead = 0; + internal Exception Error = null; public void Complete(Exception e) { diff --git a/Build.cmd b/Build.cmd new file mode 100644 index 0000000..183a091 --- /dev/null +++ b/Build.cmd @@ -0,0 +1,17 @@ +@echo off + +echo cleaning +dotnet clean %~dp0Apewer\Apewer.csproj -c release +dotnet clean %~dp0Apewer.Source\Apewer.Source.csproj -c release +dotnet clean %~dp0Apewer.Web\Apewer.Web.csproj -c release +dotnet clean %~dp0Apewer.Windows\Apewer.Windows.csproj -c release + +echo building +dotnet build %~dp0Apewer\Apewer.csproj -c release +dotnet build %~dp0Apewer.Source\Apewer.Source.csproj -c release +dotnet build %~dp0Apewer.Web\Apewer.Web.csproj -c release +dotnet build %~dp0Apewer.Windows\Apewer.Windows.csproj -c release + +echo. +echo finished +ping 127.0.0.1 > nul diff --git a/ChangeLog.md b/ChangeLog.md index 85b5d87..3e9e64b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,24 @@  -### 最新提交 +### 6.8.3 +- 新特性 + - 增加了 JumpStatement 枚举,用于返回后续行为; + - Access 类中提供了空的 .mdb 文件和 .accdb 文件,用于创建新数据库; + - InBackground 方法增加重载,提供 delay 参数,用于指定延迟时间,用法将类似于 JavaScript 中的 setTimeout 方法; + - IDbAdo 的扩展方法 Column、Cell 和 Query 增加重载,支持使用匿名参数作为 SQL 参数; + - ClockUtility.Parse 增加重载,使用 failed 参数返回失后的默认值; + - CollectionUtility 中增加了 Join 方法,支持将 IEnumerable[] 连接为单个 T[] 对象; + - BytesUtility 中增加了 AesEncrypt 和 AesDecrypt 方法,用于支持 AES 128/192/256 的加密和解密; + - Logger 支持指定 Name,用于区分不同的日志文件; + - Class 增加了 IDisposable,支持在 using 语句中调用 Value 的 Dispose 方法; + - TextUtility 增加 Lock 方法,用于锁定文本内容(不锁定 string 对象); + - 增加 Enumerator,作为通用的枚举器。 +- 问题修正 + - 修正 RuntimeUtility.ApplicationPath 末尾包含斜杠的问题,现已删除斜杠; + - 修正 Access.TableNames 方法获取不到表名的问题; + - 修正 StaticController 获取默认根目录的方法; + - 修正 MiniServer 关闭时会抛出异常的问题; + - 修正 MiniServer.GetPort 方法获取不到端口的问题; + - 修正 HttpClient 实例中缺少 CookieContainer 导致 NULL 引用的异常。 ### 6.8.2 - 问题修正