浏览代码

包管理

懒得勤快 5 年之前
父节点
当前提交
6f020bb7be

+ 8 - 7
Masuit.Tools.Abstractions.xml

@@ -1058,6 +1058,13 @@
             <param name="updateValueFactory">更新时的操作</param>
             <returns></returns>
         </member>
+        <member name="M:Masuit.Tools.IDictionaryExtensions.ForEach``2(System.Collections.Generic.IDictionary{``0,``1},System.Action{``0,``1})">
+            <summary>
+            遍历IEnumerable
+            </summary>
+            <param name="dic"></param>
+            <param name="action">回调方法</param>
+        </member>
         <member name="M:Masuit.Tools.IEnumerableExtensions.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
             <summary>
             遍历IEnumerable
@@ -1074,7 +1081,7 @@
             <param name="action">回调方法</param>
             <typeparam name="T"></typeparam>
         </member>
-        <member name="M:Masuit.Tools.IEnumerableExtensions.IEnumerableBaseTo``3(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Func{System.Collections.Generic.IEnumerable{``1},``2},System.Func{``2})">
+        <member name="M:Masuit.Tools.IEnumerableExtensions.EnumerableBaseTo``3(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Func{System.Collections.Generic.IEnumerable{``1},``2},System.Func{``2})">
             <summary>
             【内部方法】集合接口转具体实现
             </summary>
@@ -6225,9 +6232,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>

+ 16 - 14
Masuit.Tools.Abstractions/Extensions/BaseType/IDictionaryExtensions.cs

@@ -14,10 +14,7 @@ namespace Masuit.Tools
         /// <param name="key">键</param>
         /// <param name="value">值</param>
         /// <returns></returns>
-        public static TValue AddOrUpdate<TKey, TValue>(
-            this IDictionary<TKey, TValue> @this,
-            TKey key,
-            TValue value)
+        public static TValue AddOrUpdate<TKey, TValue>(this IDictionary<TKey, TValue> @this, TKey key, TValue value)
         {
             if ([email protected](key))
             {
@@ -41,11 +38,7 @@ namespace Masuit.Tools
         /// <param name="addValue">添加时的值</param>
         /// <param name="updateValueFactory">更新时的操作</param>
         /// <returns></returns>
-        public static TValue AddOrUpdate<TKey, TValue>(
-            this IDictionary<TKey, TValue> @this,
-            TKey key,
-            TValue addValue,
-            Func<TKey, TValue, TValue> updateValueFactory)
+        public static TValue AddOrUpdate<TKey, TValue>(this IDictionary<TKey, TValue> @this, TKey key, TValue addValue, Func<TKey, TValue, TValue> updateValueFactory)
         {
             if ([email protected](key))
             {
@@ -69,11 +62,7 @@ namespace Masuit.Tools
         /// <param name="addValueFactory">添加时的操作</param>
         /// <param name="updateValueFactory">更新时的操作</param>
         /// <returns></returns>
-        public static TValue AddOrUpdate<TKey, TValue>(
-            this IDictionary<TKey, TValue> @this,
-            TKey key,
-            Func<TKey, TValue> addValueFactory,
-            Func<TKey, TValue, TValue> updateValueFactory)
+        public static TValue AddOrUpdate<TKey, TValue>(this IDictionary<TKey, TValue> @this, TKey key, Func<TKey, TValue> addValueFactory, Func<TKey, TValue, TValue> updateValueFactory)
         {
             if ([email protected](key))
             {
@@ -86,5 +75,18 @@ namespace Masuit.Tools
 
             return @this[key];
         }
+
+        /// <summary>
+        /// 遍历IEnumerable
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <param name="action">回调方法</param>
+        public static void ForEach<TKey, TValue>(this IDictionary<TKey, TValue> dic, Action<TKey, TValue> action)
+        {
+            foreach (var item in dic)
+            {
+                action(item.Key, item.Value);
+            }
+        }
     }
 }

+ 12 - 27
Masuit.Tools.Abstractions/Extensions/BaseType/IEnumerableExtensions.cs

@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -35,10 +36,7 @@ namespace Masuit.Tools
         /// <typeparam name="T"></typeparam>
         public static async void ForEachAsync<T>(this IEnumerable<T> objs, Action<T> action)
         {
-            await Task.Run(() =>
-            {
-                Parallel.ForEach(objs, action);
-            });
+            await Task.Run(() => Parallel.ForEach(objs, action));
         }
 
         #endregion AsyncForEach
@@ -56,11 +54,7 @@ namespace Masuit.Tools
         /// <param name="converter"></param>
         /// <param name="defaultValueFunc">当<paramref name="source"/>为<see cref="null"/>时,会调用此委托生成默认值</param>
         /// <returns></returns>
-        private static TArray IEnumerableBaseTo<TSource, TResult, TArray>(
-          IEnumerable<TSource> source,
-          Func<TSource, TResult> selector,
-          Func<IEnumerable<TResult>, TArray> converter,
-          Func<TArray> defaultValueFunc)
+        private static TArray EnumerableBaseTo<TSource, TResult, TArray>(IEnumerable<TSource> source, Func<TSource, TResult> selector, Func<IEnumerable<TResult>, TArray> converter, Func<TArray> defaultValueFunc)
         {
             selector.CheckNullWithException(nameof(selector));
 
@@ -76,12 +70,9 @@ namespace Masuit.Tools
         /// <param name="selector"></param>
         /// <param name="defaultValue">当<paramref name="source"/>为<see cref="null"/>时,返回的值.默认值为:0长度的<see cref="List{T}"/></param>
         /// <returns></returns>
-        public static List<TResult> ToList<TSource, TResult>(
-            this IEnumerable<TSource> source,
-            Func<TSource, TResult> selector,
-            List<TResult>? defaultValue = null)
+        public static List<TResult> ToList<TSource, TResult>(this IEnumerable<TSource> source, Func<TSource, TResult> selector, List<TResult>? defaultValue = null)
         {
-            return IEnumerableBaseTo(source, selector, Enumerable.ToList, () => defaultValue ?? new List<TResult>());
+            return EnumerableBaseTo(source, selector, Enumerable.ToList, () => defaultValue ?? new List<TResult>());
         }
 
         /// <summary>
@@ -93,10 +84,7 @@ namespace Masuit.Tools
         /// <param name="selector"></param>
         /// <param name="defaultValue">当<paramref name="source"/>为<see cref="null"/>时,返回的值.默认值为:0长度的<see cref="List{T}"/></param>
         /// <returns></returns>
-        public static Task<List<TResult>> ToListAsync<TSource, TResult>(
-            this IEnumerable<TSource> source,
-            Func<TSource, TResult> selector,
-            List<TResult>? defaultValue = null)
+        public static Task<List<TResult>> ToListAsync<TSource, TResult>(this IEnumerable<TSource> source, Func<TSource, TResult> selector, List<TResult>? defaultValue = null)
         {
             return Task.Run(() => ToList(source, selector, defaultValue));
         }
@@ -138,10 +126,7 @@ namespace Masuit.Tools
         /// <param name="this"></param>
         /// <param name="predicate"></param>
         /// <param name="values"></param>
-        public static void AddRangeIf<T>(
-            this ICollection<T> @this,
-            Func<T, bool> predicate,
-            params T[] values)
+        public static void AddRangeIf<T>(this ICollection<T> @this, Func<T, bool> predicate, params T[] values)
         {
             foreach (var obj in values)
             {
@@ -192,15 +177,15 @@ namespace Masuit.Tools
         /// <param name="value">值</param>
         public static void InsertAfter<T>(this IList<T> list, Func<T, bool> condition, T value)
         {
-            foreach (var item in list.Select((o, i) => new { Value = o, Index = i }).Where(p => condition(p.Value)).OrderByDescending(p => p.Index))
+            foreach (var item in list.Select((item, index) => new { item, index }).Where(p => condition(p.item)).OrderByDescending(p => p.index))
             {
-                if (item.Index + 1 == list.Count)
+                if (item.index + 1 == list.Count)
                 {
                     list.Add(value);
                 }
                 else
                 {
-                    list.Insert(item.Index + 1, value);
+                    list.Insert(item.index + 1, value);
                 }
             }
         }
@@ -214,7 +199,7 @@ namespace Masuit.Tools
         /// <param name="value">值</param>
         public static void InsertAfter<T>(this IList<T> list, int index, T value)
         {
-            foreach (var item in list.Select((o, i) => new { Value = o, Index = i }).Where(p => p.Index == index).OrderByDescending(p => p.Index))
+            foreach (var item in list.Select((v, i) => new { Value = v, Index = i }).Where(p => p.Index == index).OrderByDescending(p => p.Index))
             {
                 if (item.Index + 1 == list.Count)
                 {

+ 9 - 7
Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -7,7 +7,7 @@
     <LangVersion>8.0</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet />
-    <Version>2.2.9.7</Version>
+    <Version>2.3.0</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.7</FileVersion>
+    <FileVersion>2.3.0.0</FileVersion>
     <Company>masuit.com</Company>
-    <AssemblyVersion>2.2.9.7</AssemblyVersion>
+    <AssemblyVersion>2.3.0.0</AssemblyVersion>
     <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
   </PropertyGroup>
 
@@ -31,8 +31,6 @@
     <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" />
@@ -43,13 +41,17 @@
   </ItemGroup>
 
   <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" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
   </ItemGroup>
 

+ 3 - 3
Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -21,10 +21,10 @@
     <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
     <RepositoryType>Github</RepositoryType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.2.9.6</Version>
-    <FileVersion>2.2.9.6</FileVersion>
+    <Version>2.3.0</Version>
+    <FileVersion>2.3.0.0</FileVersion>
     <Company>masuit.com</Company>
-    <AssemblyVersion>2.2.9.6</AssemblyVersion>
+    <AssemblyVersion>2.3.0.0</AssemblyVersion>
     <Authors>懒得勤快X</Authors>
     <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
   </PropertyGroup>

+ 44 - 42
Masuit.Tools/Masuit.Tools.csproj

@@ -47,9 +47,41 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DnsClient, Version=1.3.2.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
-      <HintPath>..\packages\DnsClient.1.3.2\lib\net45\DnsClient.dll</HintPath>
-    </Reference>
+    <Compile Include="Files\SevenZipCompressor.cs" />
+    <Compile Include="Files\ExtensionAttach.cs" />
+    <Compile Include="Mvc\ActionResults\ResumeActionResultBase.cs" />
+    <Compile Include="Mvc\ActionResults\ResumeFileContentResult.cs" />
+    <Compile Include="Mvc\ActionResults\ResumeFilePathResult.cs" />
+    <Compile Include="Mvc\ActionResults\ResumeFileStreamResult.cs" />
+    <Compile Include="Mvc\ActionResults\ResumeRequest.cs" />
+    <Compile Include="Mvc\ControllerExtension.cs" />
+    <Compile Include="Mvc\HttpHeaders.cs" />
+    <Compile Include="Mvc\Internal\ByteRange.cs" />
+    <Compile Include="Mvc\Mime\ContentType.cs" />
+    <Compile Include="Mvc\ActionResults\ResumeFileResult.cs" />
+    <Compile Include="Mvc\Mime\DefaultMimeItems.cs" />
+    <Compile Include="Mvc\Mime\IMimeMapper.cs" />
+    <Compile Include="Mvc\Mime\MimeMapper.cs" />
+    <Compile Include="Mvc\Mime\MimeMappingItem.cs" />
+    <Compile Include="Net\CacheHelper.cs" />
+    <Compile Include="Net\CookieHelper.cs" />
+    <Compile Include="Net\WebExtension.cs" />
+    <Compile Include="NoSQL\RedisConnectionManager.cs" />
+    <Compile Include="NoSQL\RedisHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Reflection\ClassHelper.cs" />
+    <Compile Include="Reflection\ReflectHelper.cs" />
+    <Compile Include="Reflection\ReflectionUtil.cs" />
+    <Compile Include="Systems\Lock.cs" />
+    <Compile Include="Systems\RedisLock.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="package.nuspec" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
@@ -60,22 +92,26 @@
       <HintPath>..\packages\SharpCompress.0.26.0\lib\net46\SharpCompress.dll</HintPath>
     </Reference>
     <Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
+      <HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net46\StackExchange.Redis.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -96,40 +132,6 @@
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Files\SevenZipCompressor.cs" />
-    <Compile Include="Files\ExtensionAttach.cs" />
-    <Compile Include="Mvc\ActionResults\ResumeActionResultBase.cs" />
-    <Compile Include="Mvc\ActionResults\ResumeFileContentResult.cs" />
-    <Compile Include="Mvc\ActionResults\ResumeFilePathResult.cs" />
-    <Compile Include="Mvc\ActionResults\ResumeFileStreamResult.cs" />
-    <Compile Include="Mvc\ActionResults\ResumeRequest.cs" />
-    <Compile Include="Mvc\ControllerExtension.cs" />
-    <Compile Include="Mvc\HttpHeaders.cs" />
-    <Compile Include="Mvc\Internal\ByteRange.cs" />
-    <Compile Include="Mvc\Mime\ContentType.cs" />
-    <Compile Include="Mvc\ActionResults\ResumeFileResult.cs" />
-    <Compile Include="Mvc\Mime\DefaultMimeItems.cs" />
-    <Compile Include="Mvc\Mime\IMimeMapper.cs" />
-    <Compile Include="Mvc\Mime\MimeMapper.cs" />
-    <Compile Include="Mvc\Mime\MimeMappingItem.cs" />
-    <Compile Include="Net\CacheHelper.cs" />
-    <Compile Include="Net\CookieHelper.cs" />
-    <Compile Include="Net\WebExtension.cs" />
-    <Compile Include="NoSQL\RedisConnectionManager.cs" />
-    <Compile Include="NoSQL\RedisHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Reflection\ClassHelper.cs" />
-    <Compile Include="Reflection\ReflectHelper.cs" />
-    <Compile Include="Reflection\ReflectionUtil.cs" />
-    <Compile Include="Systems\Lock.cs" />
-    <Compile Include="Systems\RedisLock.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="package.nuspec" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Masuit.Tools.Abstractions\Masuit.Tools.Abstractions.csproj">

二进制
Masuit.Tools/Properties/AssemblyInfo.cs


+ 12 - 0
Masuit.Tools/app.config

@@ -17,6 +17,18 @@
                 <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
             </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 </configuration>

+ 12 - 16
Masuit.Tools/package.nuspec

@@ -2,33 +2,29 @@
 <package>
   <metadata>
     <!--*-->
-    <id>Masuit.Tools.Net</id>
+    <id>Masuit.Tools</id>
     <!--*-->
-    <version>2.2.9.6</version>
+    <version>2.3.0</version>
     <title>Masuit.Tools</title>
     <!--*-->
     <authors>masuit.com</authors>
     <owners>masuit.com</owners>
-    <!--
-    <licenseUrl></licenseUrl>
-    <projectUrl></projectUrl>
-    <iconUrl></iconUrl>
--->
+    <licenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/ldqk/Masuit.Tools</projectUrl>
+    <!--<iconUrl></iconUrl>-->
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <!--*-->
-    <description>一系列的常用的操作类扩展,大都是静态类,加密解密,反射操作,动态编译,硬件信息,字符串扩展方法,日期时间扩展操作,大文件拷贝,图像裁剪,验证码,断点续传,实体映射等常用封装。</description>
+    <description>包含一些常用的操作类,大都是静态类,加密解密,反射操作,硬件信息,字符串扩展方法,日期时间扩展操作,大文件拷贝,图像裁剪,html处理,验证码、NoSql等常用封装。
+      官网教程:https://masuit.com/55
+      github:https://github.com/ldqk/Masuit.Tools</description>
     <!--*-->
-    <releaseNotes>如有问题请联系QQ:3444764617,或者到项目的github反馈问题,详细的API文档在github上:https://github.com/ldqk/Masuit.Tools</releaseNotes>
+    <releaseNotes>如有问题请联系作者QQ:3444764617,或者到项目的github反馈问题,详细的API文档在github上:https://github.com/ldqk/Masuit.Tools</releaseNotes>
     <copyright>Copyright ©  懒得勤快</copyright>
     <tags>Tools</tags>
     <dependencies>
-      <group targetFramework="net45">
-        <dependency id="AngleSharp" version="0.9.9" />
-        <dependency id="HtmlSanitizer" version="4.0.181" />
-        <dependency id="Newtonsoft.Json" version="9.0.1" />
-        <dependency id="SharpZipLib" version="0.86.0" />
-        <dependency id="StackExchange.Redis" version="1.2.0" />
-      </group>
+      <!--
+      <dependency id="SampleDependency" version="1.0" />
+-->
     </dependencies>
   </metadata>
 </package>

+ 14 - 0
Masuit.Tools/packages.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net461" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+  <package id="SharpCompress" version="0.26.0" targetFramework="net461" />
+  <package id="StackExchange.Redis" version="1.2.6" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
+</packages>

+ 8 - 0
Test/Masuit.Tools.Test/app.config

@@ -14,6 +14,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>