包组织

Masuit.Tools.Abstractions.xml

@@ -6225,9 +6225,3 @@
         </member>
     </members>
 </doc>
-iagnostics.Process.Id" /> 属性的 <see cref="P:System.Diagnostics.Process.Handle" />。- 或 -没有与此 <see cref="T:System.Diagnostics.Process" /> 对象关联的进程。- 或 -您正尝试为远程计算机上运行的进程调用 <see cref="M:System.Diagnostics.Process.WaitForExit(System.Int32)" />。此方法仅对本地计算机上运行的进程可用。</exception>
-            <exception cref="T:System.ComponentModel.Win32Exception">未能访问该等待设置。</exception>
-            <exception cref="T:System.Exception">命令参数无效，必须传入一个控制台能被cmd.exe可执行程序; 如：ping 127.0.0.1</exception>
-        </member>
-    </members>
-</doc>

Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -7,7 +7,7 @@
     <LangVersion>8.0</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet />
-    <Version>2.2.9.6</Version>
+    <Version>2.2.9.7</Version>
     <Authors>懒得勤快</Authors>
     <Description>Masuit.Tools基础公共库</Description>
     <Copyright>懒得勤快，长空X</Copyright>
@@ -20,9 +20,9 @@
     <RepositoryType>Github</RepositoryType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <FileVersion>2.2.9.6</FileVersion>
+    <FileVersion>2.2.9.7</FileVersion>
     <Company>masuit.com</Company>
-    <AssemblyVersion>2.2.9.6</AssemblyVersion>
+    <AssemblyVersion>2.2.9.7</AssemblyVersion>
     <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
   </PropertyGroup>
 
@@ -31,6 +31,8 @@
     <PackageReference Include="DnsClient" Version="1.3.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
     <PackageReference Include="HtmlSanitizer" Version="5.0.343" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
@@ -40,12 +42,17 @@
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System.Web" />
     <PackageReference Include="System.Buffers" version="4.5.1" targetFramework="net461" />

Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -89,11 +89,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>

Masuit.Tools.Core/Validator/IsEmailAttribute.cs

@@ -1,100 +0,0 @@
-//using System;
-//using System.ComponentModel.DataAnnotations;
-//using System.Linq;
-//using Masuit.Tools.Core.Config;
-//using Microsoft.Extensions.Configuration;
-//using Microsoft.Extensions.DependencyInjection;
-
-//namespace Masuit.Tools.Core.Validator
-//{
-//    /// <summary>
-//    /// 邮箱校验
-//    /// </summary>
-//    public class IsEmailAttribute : ValidationAttribute
-//    {
-//        private readonly bool _valid;
-//        public static string EmailAllowKeywordsList;
-
-//        /// <summary>
-//        /// 域白名单
-//        /// </summary>
-//        private string DomainWhiteList { get; }
-
-//        /// <summary>
-//        /// 可在appsetting.json中添加EmailDomainWhiteList配置邮箱域名白名单，逗号分隔
-//        /// </summary>
-//        /// <param name="valid">是否检查邮箱的有效性</param>
-//        public IsEmailAttribute(bool valid = true)
-//        {
-//            this.DomainWhiteList = CoreConfig.Configuration["EmailDomainWhiteList"] ?? "";
-//            this._valid = valid;
-//        }
-
-//        /// <summary>
-//        /// 邮箱校验
-//        /// </summary>
-//        /// <param name="value"></param>
-//        /// <returns></returns>
-//        public override bool IsValid(object value)
-//        {
-//            if (value == null)
-//            {
-//                this.ErrorMessage = "邮箱不能为空！";
-//                return false;
-//            }
-
-//            string email = value as string;
-//            if (email.Length <= 10)
-//            {
-//                this.ErrorMessage = "您输入的邮箱格式不正确！";
-//                return false;
-//            }
-
-//            if (email.Length > 256)
-//            {
-//                this.ErrorMessage = "邮箱长度最大允许255个字符！";
-//                return false;
-//            }
-
-//            if (this.DomainWhiteList.Split(',', StringSplitOptions.RemoveEmptyEntries).Any(item => email.EndsWith("@" + item)))
-//            {
-//                return true;
-//            }
-
-//            if (email.MatchEmail(this._valid).isMatch)
-//            {
-//                return true;
-//            }
-
-//            this.ErrorMessage = "您输入的邮箱格式不正确！";
-//            return false;
-//        }
-//    }
-
-//    public static class TestEE
-//    {
-//        public static IServiceCollection ConfigMasuitTools(IServiceCollection services, Action<MasuitToolOption> option)
-//        {
-//            MasuitToolOption opt = new MasuitToolOption();
-//            option?.Invoke(opt);
-//            IsEmailAttribute.EmailAllowKeywordsList = opt.EmailAllowKeywordsList;
-
-//            return services;
-//        }
-
-//        public static IServiceCollection ConfigMasuitTools(IServiceCollection services, IConfiguration configuration)
-//        {
-//            IsEmailAttribute.EmailAllowKeywordsList = configuration["EmailAllowKeywordsList"] ?? "";
-
-//            return services;
-//        }
-//    }
-
-//    public class MasuitToolOption
-//    {
-//        /// <summary>
-//        /// 邮件地址关键字白名单
-//        /// </summary>
-//        public string EmailAllowKeywordsList { get; set; }
-//    }
-//}

Test/Masuit.Tools.Abstractions.Test/Masuit.Tools.Abstractions.Test.csproj

@@ -7,10 +7,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

Test/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
   </ItemGroup>
 

Test/Masuit.Tools.Core.Test/Masuit.Tools.Core.Test.csproj

@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.7" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">